Reinstate a piece of code accidentally removed in r9214, where Windows

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

diff --git a/doc/man-pg.but b/doc/man-pg.but
index 92a9aa8..86136de 100644 (file)
--- a/doc/man-pg.but
+++ b/doc/man-pg.but
@@ -10,8 +10,8 @@
 
 \c puttygen ( keyfile | -t keytype [ -b bits ] )
 \e bbbbbbbb   iiiiiii   bb iiiiiii   bb iiii
-\c          [ -C new-comment ] [ -P ]
-\e            bb iiiiiiiiiii     bb
+\c          [ -C new-comment ] [ -P ] [ -q ]
+\e            bb iiiiiiiiiii     bb     bb
 \c          [ -O output-type | -l | -L | -p ]
 \e            bb iiiiiiiiiii   bb   bb   bb
 \c          [ -o output-file ]
@@ -37,7 +37,11 @@ the following section.
 \S{puttygen-manpage-options} OPTIONS
 
 In the first phase, \c{puttygen} either loads or generates a key.
-The options to control this are:
+Note that generating a key requires random data (from
+\c{/dev/random}), which can cause \c{puttygen} to pause, possibly for
+some time if your system does not have much randomness available.
+
+The options to control this phase are:
 
 \dt \e{keyfile}
 
@@ -56,6 +60,10 @@ generate SSH-1 keys).
 
 \dd Specify the size of the key to generate, in bits. Default is 1024.
 
+\dt \cw{\-q}
+
+\dd Suppress the progress display when generating a new key.
+
 In the second phase, \c{puttygen} optionally alters properties of
 the key it has loaded or generated. The options to control this are:
 
@@ -91,8 +99,8 @@ be the standard SSH-1 key format, or PuTTY's own SSH-2 key format.
 
 \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
+public key will be output in the format specified by RFC 4716,
+which is a multi-line text file beginning with the line
 \q{\cw{---- BEGIN SSH2 PUBLIC KEY ----}}.
 
 \dt \cw{public-openssh}
@@ -142,6 +150,22 @@ fingerprint. Otherwise, the \c{\-o} option is required.
 
 \dd Synonym for \q{\cw{-O public}}.
 
+The following options do not run PuTTYgen as normal, but print
+informational messages and then quit:
+
+\dt \cw{\-h}, \cw{\-\-help}
+
+\dd Display a message summarizing the available options.
+
+\dt \cw{\-V}, \cw{\-\-version}
+
+\dd Display the version of PuTTYgen.
+
+\dt \cw{\-\-pgpfp}
+
+\dd Display the fingerprints of the PuTTY PGP Master Keys, to aid
+in verifying new files released by the PuTTY team.
+
 \S{puttygen-manpage-examples} EXAMPLES
 
 To generate an SSH-2 RSA key pair and save it in PuTTY's own format