more man page cleanup and sync of help text with man page; ok markus@

2 files changed, 44 insertions, 39 deletions

diff --git a/usr.bin/ssh/sftp-int.c b/usr.bin/ssh/sftp-int.c
index 786c5141037..e77a9adc146 100644
--- a/usr.bin/ssh/sftp-int.c
+++ b/usr.bin/ssh/sftp-int.c
@@ -28,7 +28,7 @@
 /* XXX: recursive operations */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-int.c,v 1.12 2001/02/07 13:12:29 djm Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.13 2001/02/07 18:10:39 stevesk Exp $");
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -103,28 +103,29 @@ void
 help(void)
 {
 	printf("Available commands:\n");
-	printf("CD path                       Change remote directory to 'path'\n");
-	printf("LCD path                      Change local directory to 'path'\n");
-	printf("CHGRP grp path                Change group of file 'path' to 'grp'\n");
-	printf("CHMOD mode path               Change permissions of file 'path' to 'mode'\n");
-	printf("CHOWN own path                Change owner of file 'path' to 'own'\n");
-	printf("HELP                          Display this help text\n");
-	printf("GET remote-path [local-path]  Download file\n");
-	printf("LLS [ls options] [path]       Display local directory listing\n");
-	printf("LMKDIR path                   Create local directory\n");
-	printf("LPWD                          Print local working directory\n");
-	printf("LS [path]                     Display remote directory listing\n");
-	printf("LUMASK umask                  Set local umask to 'umask'\n");
-	printf("MKDIR path                    Create remote directory\n");
-	printf("PUT local-path [remote-path]  Upload file\n");
-	printf("PWD                           Display remote working directory\n");
-	printf("EXIT                          Quit sftp\n");
-	printf("QUIT                          Quit sftp\n");
-	printf("RENAME oldpath newpath        Rename remote file\n");
-	printf("RMDIR path                    Remove remote directory\n");
-	printf("RM path                       Delete remote file\n");
+	printf("cd path                       Change remote directory to 'path'\n");
+	printf("lcd path                      Change local directory to 'path'\n");
+	printf("chgrp grp path                Change group of file 'path' to 'grp'\n");
+	printf("chmod mode path               Change permissions of file 'path' to 'mode'\n");
+	printf("chown own path                Change owner of file 'path' to 'own'\n");
+	printf("help                          Display this help text\n");
+	printf("get remote-path [local-path]  Download file\n");
+	printf("lls [ls-options [path]]       Display local directory listing\n");
+	printf("lmkdir path                   Create local directory\n");
+	printf("lpwd                          Print local working directory\n");
+	printf("ls [path]                     Display remote directory listing\n");
+	printf("lumask umask                  Set local umask to 'umask'\n");
+	printf("mkdir path                    Create remote directory\n");
+	printf("put local-path [remote-path]  Upload file\n");
+	printf("pwd                           Display remote working directory\n");
+	printf("exit                          Quit sftp\n");
+	printf("quit                          Quit sftp\n");
+	printf("rename oldpath newpath        Rename remote file\n");
+	printf("rmdir path                    Remove remote directory\n");
+	printf("rm path                       Delete remote file\n");
 	printf("!command                      Execute 'command' in local shell\n");
 	printf("!                             Escape to local shell\n");
+	printf("?                             Synonym for help\n");
 }
 
 void
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index 14d008032ea..84edc4d67e0 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.4 2001/02/07 13:49:42 itojun Exp $
+.\" $OpenBSD: sftp.1,v 1.5 2001/02/07 18:10:39 stevesk Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller. All rights reserved.
 .\"
@@ -44,17 +44,17 @@ It may also use many features of ssh, such as public key authentication and
 compression.
 .Nm
 connects and logs into the specified
-.Ar hostname
+.Ar hostname ,
 then enters an interactive command mode.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl v
+Raise logging level. This option is also passed to ssh.
 .It Fl C
 Enables compression (via ssh's 
 .Fl C
 flag)
-.It Fl v
-Raise logging level. This option is also passed to ssh.
 .It Fl o Ar ssh_option
 Specify an option to be directly passed to
 .Xr ssh 1 .
@@ -74,35 +74,38 @@ Change local directory to
 .Ar path .
 .It Ic chgrp Ar grp Ar path
 Change group of file 
-.Ar path to 
+.Ar path
+to
 .Ar grp .
 .Ar grp
-must be numeric.
+must be a numeric GID.
 .It Ic chmod Ar mode Ar path
 Change permissions of file 
-.Ar path to 
+.Ar path
+to
 .Ar mode .
 .It Ic chown Ar own Ar path
 Change owner of file 
-.Ar path to 
+.Ar path
+to
 .Ar own .
 .Ar own
 must be a numeric UID.
 .It Ic help
 Display help text.
-.It Ic get Ar remote-file Op Ar local-file
+.It Ic get Ar remote-path Op Ar local-path
 Retrieve the
-.Ar remote-file
+.Ar remote-path
 and store it on the local machine.
 If the local
-file name is not specified, it is given the same name it has on the 
+path name is not specified, it is given the same name it has on the 
 remote machine.
 .It Ic lls Op Ar ls-options Op Ar path
 Display local directory listing of either 
 .Ar path
 or current directory if
 .Ar path
-was not specified.
+is not specified.
 .It Ic lmkdir Ar path
 Create local directory specified by
 .Ar path .
@@ -111,18 +114,19 @@ Print local working directory.
 .It Ic ls Op Ar path
 Display remote directory listing of either
 .Ar path
-or current directory, is
-.Ar path not specified.
+or current directory if
+.Ar path
+is not specified.
 .It Ic lumask Ar umask
 Set local umask to 
 .Ar umask .
 .It Ic mkdir Ar path
 Create remote directory specified by
 .Ar path .
-.It Ic put Ar local-file Op Ar remote-file
+.It Ic put Ar local-path Op Ar remote-path
 Upload
-.Ar local-file
-and store it on the remote machine. If the local file name is not specified, 
+.Ar local-path
+and store it on the remote machine. If the remote path name is not specified, 
 it is given the same name it has on the local machine.
 .It Ic pwd
 Display remote working directory.
@@ -148,7 +152,7 @@ in local shell.
 .It Ic !
 Escape to local shell.
 .It Ic ?
-A synonym for help.
+Synonym for help.
 .El
 .Sh AUTHORS
 Damien Miller <djm@mindrot.org>