3 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 297c08bdd..0f62953c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,11 @@
      [ssh-keygen.c]
      allow fingerprinting of keys hosted in PKCS#11 tokens: ssh-keygen -lD ...
      ok markus@
+   - jmc@cvs.openbsd.org 2013/01/04 19:26:38
+     [sftp-server.8 sftp-server.c]
+     sftp-server.8: add argument name to -d
+     sftp-server.c: add -d to usage()
+     ok djm
 
 20121217
  - (dtucker) [Makefile.in] Add some scaffolding so that the new regress
diff --git a/sftp-server.8 b/sftp-server.8
index 4d15f1249..2fd3df20c 100644
--- a/sftp-server.8
+++ b/sftp-server.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp-server.8,v 1.20 2013/01/03 12:54:49 djm Exp $
+.\" $OpenBSD: sftp-server.8,v 1.21 2013/01/04 19:26:38 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Markus Friedl.  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 3 2013 $
+.Dd $Mdocdate: January 4 2013 $
 .Dt SFTP-SERVER 8
 .Os
 .Sh NAME
@@ -57,7 +57,7 @@ for more information.
 .Pp
 Valid options are:
 .Bl -tag -width Ds
-.It Fl d
+.It Fl d Ar start_directory
 specifies an alternate starting directory for users.
 The pathname may contain the following tokens that are expanded at runtime:
 %% is replaced by a literal '%',
diff --git a/sftp-server.c b/sftp-server.c
index c8858147a..cce074a56 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.95 2013/01/03 12:54:49 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.96 2013/01/04 19:26:38 jmc Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -1390,7 +1390,8 @@ sftp_server_usage(void)
         extern char *__progname;
 
         fprintf(stderr,
-            "usage: %s [-ehR] [-f log_facility] [-l log_level] [-u umask]\n",
+            "usage: %s [-ehR] [-d start_directory] [-f log_facility] "
+            "[-l log_level]\n\t[-u umask]\n",
             __progname);
         exit(1);
 }