From d6ead282dbf346f9037f6f8aa370c7ebbfbb5c62 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 14 May 2003 19:30:38 +1000
Subject: [PATCH]    - jmc@cvs.openbsd.org 2003/05/14 08:25:39      [sftp.1]   
   - better formatting in SYNOPSIS      - whitespace at EOL      ok djm@

---
 ChangeLog |  7 ++++++-
 sftp.1    | 18 +++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 67bf74e78..6fc81a360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,11 @@
      [auth2.c monitor.c sshconnect2.c auth2-krb5.c]
      implement kerberos over ssh2 ("kerberos-2@ssh.com"); tested with jakob@
      server interops with commercial client; ok jakob@ djm@
+   - jmc@cvs.openbsd.org 2003/05/14 08:25:39
+     [sftp.1]
+     - better formatting in SYNOPSIS
+     - whitespace at EOL
+     ok djm@
  - (djm) Make portable build with MIT krb5 (some issues remain)
  - (djm) Add new UsePAM configuration directive to allow runtime control
    over usage of PAM. This allows non-root use of sshd when built with
@@ -1460,4 +1465,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2696 2003/05/14 09:23:56 djm Exp $
+$Id: ChangeLog,v 1.2697 2003/05/14 09:30:38 djm Exp $
diff --git a/sftp.1 b/sftp.1
index 53c1263f0..252e43ab2 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.42 2003/05/14 01:00:44 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.43 2003/05/14 08:25:39 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -29,7 +29,7 @@
 .Nm sftp
 .Nd Secure file transfer program
 .Sh SYNOPSIS
-.Nm
+.Nm sftp
 .Bk -words
 .Op Fl vC1
 .Op Fl b Ar batchfile
@@ -42,15 +42,15 @@
 .Op Fl S Ar program
 .Ar host
 .Ek
-.Nm
+.Nm sftp
 .Oo Oo Ar user Ns No @ Oc Ns
 .Ar host Ns Oo : Ns Ar file Oo
 .Ar file Oc Oc Oc
-.Nm
+.Nm sftp
 .Oo Oo Ar user Ns No @ Oc Ns
 .Ar host Ns Oo : Ns Ar dir Ns
 .Oo Ar / Oc Oc Oc
-.Nm
+.Nm sftp
 .Fl b Ar batchfile
 .Oo Ar user Ns No @ Oc Ns Ar host Ns
 .Sh DESCRIPTION
@@ -73,13 +73,13 @@ successful interactive authentication.
 .Pp
 The third usage format allows the sftp client to start in a remote directory.
 .Pp
-The final usage form allows for automated sessions using the 
+The final usage form allows for automated sessions using the
 .Fl b
 option. In such cases, it is usually necessary to configure public key
-authentication to obviate the need to enter a password at connection 
-time (see 
+authentication to obviate the need to enter a password at connection
+time (see
 .Xr sshd 8
-and 
+and
 .Xr ssh-keygen 1
 for details.)
 The options are as follows: