Merge minor usage message tweaks (but not version number changes) from

branch-0-55.

git-svn-id: svn://svn.tartarus.org/sgt/putty@4385 cda61777-01e9-0310-a592-d414129be87e

diff --git a/doc/plink.but b/doc/plink.but
index 76f2c96..54ac653 100644 (file)
--- a/doc/plink.but
+++ b/doc/plink.but
@@ -1,4 +1,4 @@
-\versionid $Id: plink.but,v 1.23 2004/05/22 11:09:31 simon Exp $
+\versionid $Id: plink.but,v 1.24 2004/08/03 13:23:48 jacob Exp $
 
 \C{plink} Using the command-line connection tool Plink
 
@@ -47,7 +47,7 @@ use Plink:
 \c Usage: plink [options] [user@]host [command]
 \c        ("host" can also be a PuTTY saved session name)
 \c Options:
-\c   -V        show version information
+\c   -V        print version information
 \c   -v        show verbose messages
 \c   -load sessname  Load settings from saved session
 \c   -ssh -telnet -rlogin -raw

diff --git a/doc/pscp.but b/doc/pscp.but
index 7c913ca..9154fbd 100644 (file)
--- a/doc/pscp.but
+++ b/doc/pscp.but
@@ -1,4 +1,4 @@
-\versionid $Id: pscp.but,v 1.28 2004/05/22 11:09:31 simon Exp $
+\versionid $Id: pscp.but,v 1.29 2004/08/03 13:23:48 jacob Exp $
 
 \#FIXME: Need examples
 
@@ -60,8 +60,8 @@ use PSCP:
 \c   -batch    disable all interactive prompts
 \c   -unsafe   allow server-side wildcards (DANGEROUS)
 \c   -V        print version information
-\c   -scp      force use of SCP protocol
 \c   -sftp     force use of SFTP protocol
+\c   -scp      force use of SCP protocol
 
 (PSCP's interface is much like the Unix \c{scp} command, if you're
 familiar with that.)