Put [+format] at the end of the usage message.

Make `date -?' output (pretty much) the same as
the man page
PR:		5269

2 files changed, 8 insertions, 7 deletions

diff --git a/bin/date/date.1 b/bin/date/date.1
index 4082f1f..73bdc4b 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\"	$Id: date.1,v 1.20 1997/10/03 12:49:28 danny Exp $
+.\"	$Id: date.1,v 1.21 1997/10/03 18:09:17 wosch Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -43,14 +43,14 @@
 .Nd display or set date and time
 .Sh SYNOPSIS
 .Nm date
+.Op Fl nu
 .Op Fl d Ar dst
 .Op Fl r Ar seconds
 .Op Fl t Ar minutes_west
-.Op Fl nu
-.Op Cm + Ns Ar format
-.Op Fl v Ar [+|-]val[ymwdHM]
+.Op Fl v Ns Ar [+|-]val Ns Op ymwdHM
 .Ar ...
 .Op Fl f Ar fmt Ar date | [[[[yy]mm]dd]HH]MM[\&.ss]
+.Op Cm + Ns Ar format
 .Sh DESCRIPTION
 .Nm
 displays the current date and time when invoked without arguments.
diff --git a/bin/date/date.c b/bin/date/date.c
index 31112cd..f5f7ead 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: date.c,v 1.7.2.5 1997/10/01 06:12:58 danny Exp $
+ *	$Id: date.c,v 1.21 1997/10/03 12:49:28 danny Exp $
  */
 
 #ifndef lint
@@ -276,7 +276,8 @@ static void
 usage()
 {
 	(void)fprintf(stderr, "%s\n%s\n",
-	    "usage: date [-nu] [-d dst] [-r seconds] [-t west] [+format]",
-	    "            [-v [+|-]val[ymwdHM]] ... [-f fmt date | [[[[yy]mm]dd]HH]MM[.ss]]");
+	    "usage: date [-nu] [-d dst] [-r seconds] [-t west] "
+	    "[-v[+|-]val[ymwdHM]] ... ",
+	    "            [-f fmt date | [[[[yy]mm]dd]HH]MM[.ss]] [+format]");
 	exit(1);
 }