Consistently use a single notation to refer to SSH protocol versions, as

[u/mdw/putty] / doc / man-pg.but

diff --git a/doc/man-pg.but b/doc/man-pg.but
index 4dbc022..92a9aa8 100644 (file)
--- a/doc/man-pg.but
+++ b/doc/man-pg.but
@@ -42,15 +42,15 @@ The options to control this are:
 \dt \e{keyfile}
 
 \dd Specify a private key file to be loaded. This private key file can
-be in the (de facto standard) SSH1 key format, or in PuTTY's SSH2
-key format, or in either of the SSH2 private key formats used by
+be in the (de facto standard) SSH-1 key format, or in PuTTY's SSH-2
+key format, or in either of the SSH-2 private key formats used by
 OpenSSH and ssh.com's implementation.
 
 \dt \cw{\-t} \e{keytype}
 
 \dd Specify a type of key to generate. The acceptable values here are
-\c{rsa} and \c{dsa} (to generate SSH2 keys), and \c{rsa1} (to
-generate SSH1 keys).
+\c{rsa} and \c{dsa} (to generate SSH-2 keys), and \c{rsa1} (to
+generate SSH-1 keys).
 
 \dt \cw{\-b} \e{bits}
 
@@ -85,21 +85,21 @@ Acceptable options are:
 \dt \cw{private}
 
 \dd Save the private key in a format usable by PuTTY. This will either
-be the standard SSH1 key format, or PuTTY's own SSH2 key format.
+be the standard SSH-1 key format, or PuTTY's own SSH-2 key format.
 
 \dt \cw{public}
 
-\dd Save the public key only. For SSH1 keys, the standard public key
-format will be used (\q{\cw{1024 37 5698745}...}). For SSH2 keys, the
+\dd Save the public key only. For SSH-1 keys, the standard public key
+format will be used (\q{\cw{1024 37 5698745}...}). For SSH-2 keys, the
 public key will be output in the format specified in the IETF
 drafts, which is a multi-line text file beginning with the line
 \q{\cw{---- BEGIN SSH2 PUBLIC KEY ----}}.
 
 \dt \cw{public-openssh}
 
-\dd Save the public key only, in a format usable by OpenSSH. For SSH1
+\dd Save the public key only, in a format usable by OpenSSH. For SSH-1
 keys, this output format behaves identically to \c{public}. For
-SSH2 keys, the public key will be output in the OpenSSH format,
+SSH-2 keys, the public key will be output in the OpenSSH format,
 which is a single line (\q{\cw{ssh-rsa AAAAB3NzaC1yc2}...}).
 
 \dt \cw{fingerprint}
@@ -109,13 +109,13 @@ algorithms are believed compatible with OpenSSH.
 
 \dt \cw{private-openssh}
 
-\dd Save an SSH2 private key in OpenSSH's format. This option is not
-permitted for SSH1 keys.
+\dd Save an SSH-2 private key in OpenSSH's format. This option is not
+permitted for SSH-1 keys.
 
 \dt \cw{private-sshcom}
 
-\dd Save an SSH2 private key in ssh.com's format. This option is not
-permitted for SSH1 keys.
+\dd Save an SSH-2 private key in ssh.com's format. This option is not
+permitted for SSH-1 keys.
 
 If no output type is specified, the default is \c{private}.
 
@@ -144,7 +144,7 @@ fingerprint. Otherwise, the \c{\-o} option is required.
 
 \S{puttygen-manpage-examples} EXAMPLES
 
-To generate an SSH2 RSA key pair and save it in PuTTY's own format
+To generate an SSH-2 RSA key pair and save it in PuTTY's own format
 (you will be prompted for the passphrase):
 
 \c puttygen -t rsa -C "my home key" -o mykey.ppk