From 1edcbf65ebd2febeaf10a836468f35e519eed7ca Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 18 Oct 2013 10:17:17 +1100
Subject: [PATCH]    - jmc@cvs.openbsd.org 2013/10/17 07:35:48      [sftp.1
 sftp.c]      tweak previous;

---
 ChangeLog | 3 +++
 sftp.1    | 4 ++--
 sftp.c    | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09ba997fa..3f0f0f5da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - djm@cvs.openbsd.org 2013/10/09 23:44:14
      [regress/Makefile regress/sftp-perm.sh]
      regression test for sftp request white/blacklisting and readonly mode.
+   - jmc@cvs.openbsd.org 2013/10/17 07:35:48
+     [sftp.1 sftp.c]
+     tweak previous;
 
 20131017
  - (djm) OpenBSD CVS Sync
diff --git a/sftp.1 b/sftp.1
index 9809bec6f..c5e30504f 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.95 2013/10/17 00:30:13 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.96 2013/10/17 07:35:48 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -384,7 +384,7 @@ If the
 .Fl f
 flag is specified, then
 .Xr fsync 2
-will ba called after the file transfer has completed to flush the file
+will be called after the file transfer has completed to flush the file
 to disk.
 .Pp
 If either the
diff --git a/sftp.c b/sftp.c
index c316e1ed4..abc689e8c 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.156 2013/10/17 00:30:13 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.157 2013/10/17 07:35:48 jmc Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -2195,7 +2195,7 @@ usage(void)
 	extern char *__progname;
 
 	fprintf(stderr,
-	    "usage: %s [-1246aCpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
+	    "usage: %s [-1246aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
 	    "          [-D sftp_server_path] [-F ssh_config] "
 	    "[-i identity_file] [-l limit]\n"
 	    "          [-o ssh_option] [-P port] [-R num_requests] "