- [-C] and [-c cookie] do not belong in the first synopsis/usage();

after some discussion with martynas
- tweak the description of -C a little more, for readability

2 files changed, 21 insertions, 13 deletions

diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 16283e917bd..c6d6d8c2d5b 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: ftp.1,v 1.64 2007/11/28 06:41:12 jmc Exp $
+.\" 	$OpenBSD: ftp.1,v 1.65 2007/11/28 16:21:25 jmc Exp $
 .\" 	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -38,13 +38,13 @@
 .Nd ARPANET file transfer program
 .Sh SYNOPSIS
 .Nm ftp
-.Op Fl 46AaCdEegimnptVv
-.Op Fl c Ar cookie
+.Op Fl 46AadEegimnptVv
 .Op Fl k Ar seconds
 .Op Fl P Ar port
 .Op Fl r Ar seconds
 .Op Ar host Op Ar port
 .Nm ftp
+.Op Fl C
 .Op Fl o Ar output
 .Sm off
 .No ftp:// Oo Ar user : password No @
@@ -53,18 +53,23 @@
 .Oc
 .Sm on
 .Nm ftp
+.Op Fl C
+.Op Fl c Ar cookie
 .Op Fl o Ar output
 .Sm off
 .No http:// Ar host Oo : Ar port
 .Oc No / Ar file
 .Sm on
 .Nm ftp
+.Op Fl C
+.Op Fl c Ar cookie
 .Op Fl o Ar output
 .Sm off
 .No https:// Ar host Oo : Ar port
 .Oc No / Ar file
 .Sm on
 .Nm ftp
+.Op Fl C
 .Op Fl o Ar output
 .Sm off
 .Ar host : No / Ar file Oo /
@@ -111,10 +116,11 @@ Causes
 .Nm
 to bypass the normal login procedure and use an anonymous login instead.
 .It Fl C
-Continue a previously interrupted FTP transfer.
+Continue a previously interrupted file transfer.
 .Nm
 will continue transferring from an offset equal to the length of
 .Ar file .
+.Pp
 Resuming HTTP(S) transfers are only supported
 if the remote server supports the
 .Dq Range
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 006607434d0..b684bec185d 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.67 2007/11/26 12:39:00 martynas Exp $	*/
+/*	$OpenBSD: main.c,v 1.68 2007/11/28 16:21:25 jmc Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
@@ -66,7 +66,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: main.c,v 1.67 2007/11/26 12:39:00 martynas Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.68 2007/11/28 16:21:25 jmc Exp $";
 #endif /* not lint and not SMALL */
 
 /*
@@ -764,15 +764,17 @@ void
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: %s [-46AaCdEegimnptVv] [-c cookie] [-k seconds] "
-	    "[-P port] [-r seconds]\n"
-	    "           [host [port]]\n"
-	    "       %s [-o output] ftp://[user:password@]host[:port]/file[/]\n"
-	    "       %s [-o output] http://host[:port]/file\n"
+	    "usage: %s [-46AadEegimnptVv] [-k seconds] "
+	    "[-P port] [-r seconds] [host [port]]\n"
+	    "       %s [-C] [-o output] "
+	    "ftp://[user:password@]host[:port]/file[/]\n"
+	    "       %s [-C] [-c cookie] [-o output] "
+	    "http://host[:port]/file\n"
 #ifndef SMALL
-	    "       %s [-o output] https://host[:port]/file\n"
+	    "       %s [-C] [-c cookie] [-o output] "
+	    "https://host[:port]/file\n"
 #endif
-	    "       %s [-o output] host:[/path/]file[/]\n",
+	    "       %s [-C] [-o output] host:[/path/]file[/]\n",
 #ifndef SMALL
 	    __progname, __progname, __progname, __progname, __progname);
 #else