===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp.1,v
retrieving revision 1.33.2.3
retrieving revision 1.34
diff -u -r1.33.2.3 -r1.34
--- src/usr.bin/ssh/sftp.1	2003/04/03 22:35:17	1.33.2.3
+++ src/usr.bin/ssh/sftp.1	2002/06/19 00:27:55	1.34
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.33.2.3 2003/04/03 22:35:17 miod Exp $
+.\" $OpenBSD: sftp.1,v 1.34 2002/06/19 00:27:55 deraadt Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -30,7 +30,6 @@
 .Nd Secure file transfer program
 .Sh SYNOPSIS
 .Nm sftp
-.Bk -words
 .Op Fl vC1
 .Op Fl b Ar batchfile
 .Op Fl o Ar ssh_option
@@ -41,15 +40,10 @@
 .Op Fl R Ar num_requests
 .Op Fl S Ar program
 .Ar host
-.Ek
 .Nm sftp
-.Oo Oo Ar user Ns No @ Oc Ns
-.Ar host Ns Oo : Ns Ar file Oo
-.Ar file Oc Oc Oc
+.Op [\fIuser\fR@]\fIhost\fR[:\fIfile\fR [\fIfile\fR]]
 .Nm sftp
-.Oo Oo Ar user Ns No @ Oc Ns
-.Ar host Ns Oo : Ns Ar dir Ns
-.Oo Ar / Oc Oc Oc
+.Op [\fIuser\fR@]\fIhost\fR[:\fIdir\fR[\fI/\fR]]
 .Sh DESCRIPTION
 .Nm
 is an interactive file transfer program, similar to
@@ -83,37 +77,30 @@
 will abort if any of the following
 commands fail:
 .Ic get , put , rename , ln ,
-.Ic rm , mkdir , chdir , ls ,
-.Ic lchdir , chmod , chown , chgrp , lpwd
+.Ic rm , mkdir , chdir , lchdir
 and
 .Ic lmkdir .
-Termination on error can be suppressed on a command by command basis by
-prefixing the command with a
-.Ic '-'
-character (For example,
-.Ic -rm /tmp/blah*
-).
 .It Fl o Ar ssh_option
 Can be used to pass options to
 .Nm ssh
-in the format used in
-.Xr ssh_config 5 .
-This is useful for specifying options
+in the format used in the
+.Xr ssh 1
+configuration file. This is useful for specifying options
 for which there is no separate
 .Nm sftp
-command-line flag. For example, to specify an alternate
+command-line flag.  For example, to specify an alternate
 port use:
 .Ic sftp -oPort=24 .
 .It Fl s Ar subsystem | sftp_server
 Specifies the SSH2 subsystem or the path for an sftp server
-on the remote host. A path is useful for using sftp over
+on the remote host.  A path is useful for using sftp over
 protocol version 1, or when the remote
 .Nm sshd
 does not have an sftp subsystem configured.
 .It Fl v
 Raise logging level. This option is also passed to ssh.
 .It Fl B Ar buffer_size
-Specify the size of the buffer that
+Specify  the size of the buffer that
 .Nm
 uses when transferring files. Larger buffers require fewer round trips at
 the cost of higher memory consumption. The default is 32768 bytes.
@@ -216,30 +203,22 @@
 .Ar newpath .
 .It Ic lpwd
 Print local working directory.
-.It Xo Ic ls
-.Op Ar flags
-.Op Ar path
-.Xc
+.It Ic ls Op Ar path
 Display remote directory listing of either
 .Ar path
 or current directory if
 .Ar path
-is not specified. If the
-.Fl l
-flag is specified, then display additional details including permissions
-and ownership information.
+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 progress
-Toggle display of progress meter.
 .It Xo Ic put
 .Op Ar flags
 .Ar local-path
-.Op Ar remote-path
+.Op Ar local-path
 .Xc
 Upload
 .Ar local-path
@@ -268,10 +247,6 @@
 .Ar oldpath
 to
 .Ar newpath .
-.It Ic version
-Display the
-.Nm
-protocol version.
 .It Ic ! Ar command
 Execute
 .Ar command
@@ -288,7 +263,6 @@
 .Xr ssh 1 ,
 .Xr ssh-add 1 ,
 .Xr ssh-keygen 1 ,
-.Xr ssh_config 5 ,
 .Xr sftp-server 8 ,
 .Xr sshd 8
 .Rs