1 files changed, 23 insertions, 22 deletions

diff --git a/sftp.0 b/sftp.0
index 479751215..b72ea4700 100644
--- a/sftp.0
+++ b/sftp.0
@@ -1,7 +1,7 @@
 SFTP(1)                   BSD General Commands Manual                  SFTP(1)
 
 NAME
-     sftp - Secure file transfer program
+     sftp - secure file transfer program
 
 SYNOPSIS
      sftp [-vC1] [-b batchfile] [-o ssh_option] [-s subsystem | sftp_server]
@@ -9,6 +9,7 @@ SYNOPSIS
           [-R num_requests] [-S program] host
      sftp [[user@]host[:file [file]]]
      sftp [[user@]host[:dir[/]]]
+     sftp -b batchfile [user@]host
 
 DESCRIPTION
      sftp is an interactive file transfer program, similar to ftp(1), which
@@ -21,10 +22,13 @@ DESCRIPTION
      active authentication method is used; otherwise it will do so after suc-
      cessful interactive authentication.
 
-     The last usage format allows the sftp client to start in a remote direc-
+     The third usage format allows the sftp client to start in a remote direc-
      tory.
 
-     The options are as follows:
+     The final usage format allows for automated sessions using the -b option.
+     In such cases, it is usually necessary to configure public key authenti-
+     cation to obviate the need to enter a password at connection time (see
+     sshd(8) and ssh-keygen(1) for details).  The options are as follows:
 
      -b batchfile
              Batch mode reads a series of commands from an input batchfile
@@ -33,42 +37,42 @@ DESCRIPTION
              will abort if any of the following commands fail: get, put,
              rename, ln, rm, mkdir, chdir, ls, lchdir, chmod, chown, chgrp,
              lpwd and lmkdir.  Termination on error can be suppressed on a
-             command by command basis by prefixing the command with a M-bM-^@M-^M-bM-^@M-^Y-M-bM-^@M-^M-bM-^@M-^Y
-             character (For example, -rm /tmp/blah* ).
+             command by command basis by prefixing the command with a M-bM-^@M-^X-M-bM-^@M-^Y
+             character (for example, -rm /tmp/blah*).
 
      -o ssh_option
              Can be used to pass options to ssh in the format used in
              ssh_config(5).  This is useful for specifying options for which
-             there is no separate sftp command-line flag. For example, to
+             there is no separate sftp command-line flag.  For example, to
              specify an alternate port use: sftp -oPort=24.
 
      -s 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 protocol
-             version 1, or when the remote sshd does not have an sftp subsys-
-             tem configured.
+             the remote host.  A path is useful for using sftp over protocol
+             version 1, or when the remote sshd(8) does not have an sftp sub-
+             system configured.
 
-     -v      Raise logging level. This option is also passed to ssh.
+     -v      Raise logging level.  This option is also passed to ssh.
 
      -B buffer_size
              Specify the size of the buffer that sftp uses when transferring
-             files. Larger buffers require fewer round trips at the cost of
-             higher memory consumption. The default is 32768 bytes.
+             files.  Larger buffers require fewer round trips at the cost of
+             higher memory consumption.  The default is 32768 bytes.
 
      -C      Enables compression (via sshM-bM-^@M-^Ys -C flag).
 
      -F ssh_config
-             Specifies an alternative per-user configuration file for ssh.
+             Specifies an alternative per-user configuration file for ssh(1).
              This option is directly passed to ssh(1).
 
      -P sftp_server path
-             Connect directly to a local sftp-server (rather than via ssh)
+             Connect directly to a local sftp server (rather than via ssh(1))
              This option may be useful in debugging the client and server.
 
      -R num_requests
              Specify how many requests may be outstanding at any one time.
              Increasing this may slightly improve file transfer speed but will
-             increase memory usage. The default is 16 outstanding requests.
+             increase memory usage.  The default is 16 outstanding requests.
 
      -S program
              Name of the program to use for the encrypted connection.  The
@@ -103,7 +107,7 @@ INTERACTIVE COMMANDS
      get [flags] remote-path [local-path]
              Retrieve the remote-path and store it on the local machine.  If
              the local path name is not specified, it is given the same name
-             it has on the remote machine. If the -P flag is specified, then
+             it has on the remote machine.  If the -P flag is specified, then
              the fileM-bM-^@M-^Ys full permission and access time are copied too.
 
      help    Display help text.
@@ -122,7 +126,7 @@ INTERACTIVE COMMANDS
 
      ls [flags] [path]
              Display remote directory listing of either path or current direc-
-             tory if path is not specified. If the -l flag is specified, then
+             tory if path is not specified.  If the -l flag is specified, then
              display additional details including permissions and ownership
              information.
 
@@ -136,9 +140,9 @@ INTERACTIVE COMMANDS
              Toggle display of progress meter.
 
      put [flags] local-path [remote-path]
-             Upload local-path and store it on the remote machine. If the
+             Upload 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. If the -P flag is specified, then the
+             has on the local machine.  If the -P flag is specified, then the
              fileM-bM-^@M-^Ys full permission and access time are copied too.
 
      pwd     Display remote working directory.
@@ -167,9 +171,6 @@ INTERACTIVE COMMANDS
 
      ?       Synonym for help.
 
-AUTHORS
-     Damien Miller <djm@mindrot.org>
-
 SEE ALSO
      scp(1), ssh(1), ssh-add(1), ssh-keygen(1), ssh_config(5), sftp-server(8),
      sshd(8)