X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/155f8b88ce0d732fa70beeb0f6957785e1292cf0..8154b6022bd42b4aba03fc9adcbabd4f588b6575:/doc/using.but

diff --git a/doc/using.but b/doc/using.but
index 59109b6f..9a6ec868 100644
--- a/doc/using.but
+++ b/doc/using.but
@@ -185,8 +185,8 @@ Should have no effect.
 
 \lcont{
 Only available in SSH-2. Forces a repeat key exchange immediately (and
-resets associated timers and counters). \#{For more information about
-repeat key exchanges, see \k{FIXME}.}
+resets associated timers and counters). For more information about
+repeat key exchanges, see \k{config-ssh-kex-rekey}.
 }
 
 \b \I{Break, SSH special command}Break
@@ -318,7 +318,7 @@ up on your local machine without sending any X network traffic in
 the clear.
 
 In order to use this feature, you will need an X display server for
-your Windows machine, such as X-Win32 or Exceed. This will probably
+your Windows machine, such as Cygwin/X, X-Win32, or Exceed. This will probably
 install itself as display number 0 on your local machine; if it
 doesn't, the manual for the \i{X server} should tell you what it
 does do.
@@ -516,11 +516,17 @@ use the \c{-load} option (described in \k{using-cmdline-load}).
 
 \S{using-cleanup} \i\c{-cleanup}
 
+\cfg{winhelp-topic}{options.cleanup}
+
 If invoked with the \c{-cleanup} option, rather than running as
 normal, PuTTY will remove its \I{removing registry entries}registry
-entries and \I{random seed file} from the local machine (after
+entries and \i{random seed file} from the local machine (after
 confirming with the user).
 
+Note that on \i{multi-user systems}, \c{-cleanup} only removes
+registry entries and files associated with the currently logged-in
+user.
+
 \S{using-general-opts} Standard command-line options
 
 PuTTY and its associated tools support a range of command-line
@@ -754,6 +760,16 @@ These options are equivalent to selecting your preferred SSH
 protocol version as \q{1 only} or \q{2 only} in the SSH panel of the
 PuTTY configuration box (see \k{config-ssh-prot}).
 
+\S2{using-cmdline-ipversion} \i\c{-4} and \i\c{-6}: specify an
+\i{Internet protocol version}
+
+The \c{-4} and \c{-6} options force PuTTY to use the older Internet
+protocol \i{IPv4} or the newer \i{IPv6}.
+
+These options are equivalent to selecting your preferred Internet
+protocol version as \q{IPv4} or \q{IPv6} in the Connection panel of
+the PuTTY configuration box (see \k{config-address-family}).
+
 \S2{using-cmdline-identity} \i\c{-i}: specify an SSH \i{private key}
 
 The \c{-i} option allows you to specify the name of a private key