diff options
| author | Damien Miller <djm@mindrot.org> | 2009-01-21 20:29:20 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2009-01-21 20:29:20 +1100 |
| commit | 0266677f0feb72b092f87480a4c8695c71db9684 (patch) | |
| tree | a8f52f5b2896d85942c7685a764ea3b986c6de7b /contrib/ssh-copy-id.1 | |
| parent | 819dbb633af6e1970c6b3275882c85d458441500 (diff) | |
- (djm) [contrib/ssh-copy-id.1 contrib/ssh-copy-id] bz#1492: Make
ssh-copy-id copy id_rsa.pub by default (instead of the legacy "identity"
key). Patch from cjwatson AT debian.org
Diffstat (limited to 'contrib/ssh-copy-id.1')
| -rw-r--r-- | contrib/ssh-copy-id.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1 index b331fa149..f25ed01f2 100644 --- a/contrib/ssh-copy-id.1 +++ b/contrib/ssh-copy-id.1 | |||
| @@ -18,7 +18,7 @@ the original English. | |||
| 18 | .. | 18 | .. |
| 19 | .TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH" | 19 | .TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH" |
| 20 | .SH NAME | 20 | .SH NAME |
| 21 | ssh-copy-id \- install your identity.pub in a remote machine's authorized_keys | 21 | ssh-copy-id \- install your public key in a remote machine's authorized_keys |
| 22 | .SH SYNOPSIS | 22 | .SH SYNOPSIS |
| 23 | .B ssh-copy-id [-i [identity_file]] | 23 | .B ssh-copy-id [-i [identity_file]] |
| 24 | .I "[user@]machine" | 24 | .I "[user@]machine" |
| @@ -42,7 +42,7 @@ set in its configuration). | |||
| 42 | If the | 42 | If the |
| 43 | .B -i | 43 | .B -i |
| 44 | option is given then the identity file (defaults to | 44 | option is given then the identity file (defaults to |
| 45 | .BR ~/.ssh/identity.pub ) | 45 | .BR ~/.ssh/id_rsa.pub ) |
| 46 | is used, regardless of whether there are any keys in your | 46 | is used, regardless of whether there are any keys in your |
| 47 | .BR ssh-agent . | 47 | .BR ssh-agent . |
| 48 | Otherwise, if this: | 48 | Otherwise, if this: |