Make it clearer that `-m' is only usable with SSH.

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

diff --git a/doc/plink.but b/doc/plink.but
index 7e27800..744f66c 100644 (file)
--- a/doc/plink.but
+++ b/doc/plink.but
@@ -54,7 +54,6 @@ use Plink:
 \c             force use of a particular protocol
 \c   -P port   connect to specified port
 \c   -l user   connect with specified username
-\c   -m file   read remote command(s) from file
 \c   -batch    disable all interactive prompts
 \c The following options only apply to SSH connections:
 \c   -pw passw login with specified password
@@ -71,6 +70,7 @@ use Plink:
 \c   -4 -6     force use of IPv4 or IPv6
 \c   -C        enable compression
 \c   -i key    private key file for authentication
+\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/unix/uxplink.c b/unix/uxplink.c
index 42d6966..8d1aac7 100644 (file)
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -217,7 +217,6 @@ static void usage(void)
     printf("            force use of a particular protocol\n");
     printf("  -P port   connect to specified port\n");
     printf("  -l user   connect with specified username\n");
-    printf("  -m file   read remote command(s) from file\n");
     printf("  -batch    disable all interactive prompts\n");
     printf("The following options only apply to SSH connections:\n");
     printf("  -pw passw login with specified password\n");
@@ -234,6 +233,7 @@ 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("  -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");
     exit(1);

diff --git a/windows/winplink.c b/windows/winplink.c
index 1fb3ee0..9fca63c 100644 (file)
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -217,7 +217,6 @@ static void usage(void)
     printf("            force use of a particular protocol\n");
     printf("  -P port   connect to specified port\n");
     printf("  -l user   connect with specified username\n");
-    printf("  -m file   read remote command(s) from file\n");
     printf("  -batch    disable all interactive prompts\n");
     printf("The following options only apply to SSH connections:\n");
     printf("  -pw passw login with specified password\n");
@@ -234,6 +233,7 @@ 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("  -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");
     exit(1);