Fix a null-dereference introduced by another mis-fix in r9919.

[sgt/putty] / doc / man-putt.but

diff --git a/doc/man-putt.but b/doc/man-putt.but
index fb60067..4c68012 100644 (file)
--- a/doc/man-putt.but
+++ b/doc/man-putt.but
@@ -37,7 +37,7 @@ Sorry.)
 If the \cw{BoldAsColour} resource is set to 1 (the default), bold
 text will be displayed in different colours instead of a different
 font, so this option will be ignored. If \cw{BoldAsColour} is set to
 If the \cw{BoldAsColour} resource is set to 1 (the default), bold
 text will be displayed in different colours instead of a different
 font, so this option will be ignored. If \cw{BoldAsColour} is set to

-0 and you do not specify a bold font, \cw{putty} will overprint the
+0 or 2 and you do not specify a bold font, \cw{putty} will overprint the

 normal font to make it look bolder.
 
 \dt \cw{\-fw} \e{font-name}
 normal font to make it look bolder.
 
 \dt \cw{\-fw} \e{font-name}


@@ -49,7 +49,7 @@ Chinese, Japanese and Korean text) displayed in the terminal.
 
 \dd Specify the font to use for bold double-width characters
 (typically Chinese, Japanese and Korean text). Like \cw{-fb}, this
 
 \dd Specify the font to use for bold double-width characters
 (typically Chinese, Japanese and Korean text). Like \cw{-fb}, this

-will be ignored unless the \cw{BoldAsColour} resource is set to 0.
+will be ignored unless the \cw{BoldAsColour} resource is set to 0 or 2.

 
 \dt \cw{\-geometry} \e{geometry}
 
 
 \dt \cw{\-geometry} \e{geometry}
 


@@ -73,12 +73,12 @@ terminal.
 \dt \cw{\-bfg} \e{colour}
 
 \dd Specify the foreground colour to use for bold text, if the
 \dt \cw{\-bfg} \e{colour}
 
 \dd Specify the foreground colour to use for bold text, if the

-\cw{BoldAsColour} resource is set to 1 (the default).
+\cw{BoldAsColour} resource is set to 1 (the default) or 2.

 
 \dt \cw{\-bbg} \e{colour}
 
 \dd Specify the foreground colour to use for bold reverse-video
 
 \dt \cw{\-bbg} \e{colour}
 
 \dd Specify the foreground colour to use for bold reverse-video

-text, if the \cw{BoldAsColour} resource is set to 1 (the default).
+text, if the \cw{BoldAsColour} resource is set to 1 (the default) or 2.

 (This colour is best thought of as the bold version of the
 background colour; so it only appears when text is displayed \e{in}
 the background colour.)
 (This colour is best thought of as the bold version of the
 background colour; so it only appears when text is displayed \e{in}
 the background colour.)


@@ -149,13 +149,18 @@ keys.
 
 \dd Display a message summarizing the available options.
 
 
 \dd Display a message summarizing the available options.
 

+\dt \cw{\-pgpfp}
+
+\dd Display the fingerprints of the PuTTY PGP Master Keys, to aid
+in verifying new files released by the PuTTY team.
+

 \dt \cw{\-load} \e{session}
 
 \dd Load a saved session by name. This allows you to run a saved session
 straight from the command line without having to go through the
 configuration box first.
 
 \dt \cw{\-load} \e{session}
 
 \dd Load a saved session by name. This allows you to run a saved session
 straight from the command line without having to go through the
 configuration box first.
 

-\dt \cw{\-ssh}, \cw{\-telnet}, \cw{\-rlogin}, \cw{\-raw}
+\dt \cw{\-ssh}, \cw{\-telnet}, \cw{\-rlogin}, \cw{\-raw}, \cw{\-serial}

 
 \dd Select the protocol \cw{putty} will use to make the connection.
 
 
 \dd Select the protocol \cw{putty} will use to make the connection.
 


@@ -218,6 +223,29 @@ pseudo-terminal at the server end.
 keys, this key file must be in PuTTY's format, not OpenSSH's or
 anyone else's.
 
 keys, this key file must be in PuTTY's format, not OpenSSH's or
 anyone else's.
 

+\dt \cw{\-sercfg} \e{configuration-string}
+
+\dd Specify the configuration parameters for the serial port, in
+\cw{-serial} mode. \e{configuration-string} should be a
+comma-separated list of configuration parameters as follows:
+
+\lcont{
+
+\b Any single digit from 5 to 9 sets the number of data bits.
+
+\b \cq{1}, \cq{1.5} or \cq{2} sets the number of stop bits.
+
+\b Any other numeric string is interpreted as a baud rate.
+
+\b A single lower-case letter specifies the parity: \cq{n} for none,
+\cq{o} for odd, \cq{e} for even, \cq{m} for mark and \cq{s} for space.
+
+\b A single upper-case letter specifies the flow control: \cq{N} for
+none, \cq{X} for XON/XOFF, \cq{R} for RTS/CTS and \cq{D} for
+DSR/DTR.
+
+}
+

 \S{putty-manpage-saved-sessions} SAVED SESSIONS
 
 Saved sessions are stored in a \cw{.putty/sessions} subdirectory in
 \S{putty-manpage-saved-sessions} SAVED SESSIONS
 
 Saved sessions are stored in a \cw{.putty/sessions} subdirectory in