Fix up documentation/usage messages for r6572.

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

diff --git a/doc/plink.but b/doc/plink.but
index 9b7b511..850ac44 100644 (file)
--- a/doc/plink.but
+++ b/doc/plink.but
@@ -43,7 +43,7 @@ use Plink:
 
 \c Z:\sysosd>plink
 \c PuTTY Link: command-line connection utility
-\c Release 0.58
+\c Release 0.XX
 \c Usage: plink [options] [user@]host [command]
 \c        ("host" can also be a PuTTY saved session name)
 \c Options:
@@ -71,6 +71,8 @@ use Plink:
 \c   -4 -6     force use of IPv4 or IPv6
 \c   -C        enable compression
 \c   -i key    private key file for authentication
+\c   -noagent  disable use of Pageant
+\c   -agent    enable use of Pageant
 \c   -m file   read remote command(s) from file
 \c   -s        remote command is an SSH subsystem (SSH-2 only)
 \c   -N        don't start a shell/command (SSH-2 only)

diff --git a/doc/pscp.but b/doc/pscp.but
index 6f24140..c62ed4d 100644 (file)
--- a/doc/pscp.but
+++ b/doc/pscp.but
@@ -41,7 +41,7 @@ use PSCP:
 
 \c Z:\owendadmin>pscp
 \c PuTTY Secure Copy client
-\c Release 0.58
+\c Release 0.XX
 \c Usage: pscp [options] [user@]host:source target
 \c        pscp [options] source [source...] [user@]host:target
 \c        pscp [options] -ls [user@]host:filespec
@@ -60,6 +60,8 @@ use PSCP:
 \c   -4 -6     force use of IPv4 or IPv6
 \c   -C        enable compression
 \c   -i key    private key file for authentication
+\c   -noagent  disable use of Pageant
+\c   -agent    enable use of Pageant
 \c   -batch    disable all interactive prompts
 \c   -unsafe   allow server-side wildcards (DANGEROUS)
 \c   -sftp     force use of SFTP protocol

diff --git a/doc/using.but b/doc/using.but
index 1aa2211..bd9e939 100644 (file)
--- a/doc/using.but
+++ b/doc/using.but
@@ -692,15 +692,12 @@ The \c{-agent} option turns on SSH authentication using Pageant, and
 \c{-noagent} turns it off. These options are only meaningful if you
 are using SSH.
 
-See \k{pageant} for general information on \i{Pageant}
+See \k{pageant} for general information on \i{Pageant}.
 
 These options are equivalent to the agent authentication checkbox in
 the Auth panel of the PuTTY configuration box (see
 \k{config-ssh-tryagent}).
 
-These options are not available in the file transfer tools PSCP and
-PSFTP.
-
 \S2{using-cmdline-agent} \I{-A-upper}\c{-A} and \i\c{-a}: control \i{agent
 forwarding}
 

diff --git a/pscp.c b/pscp.c
index b67782e..9df1963 100644 (file)
--- a/pscp.c
+++ b/pscp.c
@@ -2159,6 +2159,8 @@ static void usage(void)
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
     printf("  -i key    private key file for authentication\n");
+    printf("  -noagent  disable use of Pageant\n");
+    printf("  -agent    enable use of Pageant\n");
     printf("  -batch    disable all interactive prompts\n");
     printf("  -unsafe   allow server-side wildcards (DANGEROUS)\n");
     printf("  -sftp     force use of SFTP protocol\n");

diff --git a/psftp.c b/psftp.c
index 2705d45..6a4ba56 100644 (file)
--- a/psftp.c
+++ b/psftp.c
@@ -2595,6 +2595,8 @@ static void usage(void)
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
     printf("  -i key    private key file for authentication\n");
+    printf("  -noagent  disable use of Pageant\n");
+    printf("  -agent    enable use of Pageant\n");
     printf("  -batch    disable all interactive prompts\n");
     cleanup_exit(1);
 }

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 0e27366..735d297 100644 (file)
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -527,6 +527,8 @@ static void usage(void)
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
     printf("  -i key    private key file for authentication\n");
+    printf("  -noagent  disable use of Pageant\n");
+    printf("  -agent    enable use of Pageant\n");
     printf("  -m file   read remote command(s) from file\n");
     printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");
     printf("  -N        don't start a shell/command (SSH-2 only)\n");

diff --git a/windows/winplink.c b/windows/winplink.c
index f6596ee..6e520c7 100644 (file)
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -255,6 +255,8 @@ static void usage(void)
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
     printf("  -i key    private key file for authentication\n");
+    printf("  -noagent  disable use of Pageant\n");
+    printf("  -agent    enable use of Pageant\n");
     printf("  -m file   read remote command(s) from file\n");
     printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");
     printf("  -N        don't start a shell/command (SSH-2 only)\n");