- add -P to SYNOPSIS

 - remove "mutually exclusive" clause
 - -c produces 15 *'s, not a dozen
 - add -a to uage()
 - sync usage() with SYNOPSIS

ok tedu@

2 files changed, 13 insertions, 13 deletions

diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index 31c7624f194..cc17b63b3ad 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.20 2003/07/27 18:32:49 otto Exp $
+.\" $OpenBSD: diff.1,v 1.21 2003/09/07 18:50:58 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -59,7 +59,7 @@
 .Fl U Ar number
 .Ar file1 file2
 .Nm diff
-.Op Fl abdilNqtTw
+.Op Fl abdilNPqtTw
 .Oo
 .Fl c | Fl e | Fl f |
 .Fl n | Fl u
@@ -84,16 +84,16 @@ and writes to the standard output the list of changes necessary to
 convert one file into the other.
 No output is produced if the files are identical.
 .Pp
-Output options (mutually exclusive):
+Output options:
 .Bl -tag -width Ds
 .It Fl c
 Produces a diff with 3 lines of context.
 With
 .Fl c
 the output format is modified slightly:
-the output beginning with identification of the files involved and
+the output begins with identification of the files involved and
 their creation dates and then each change is separated
-by a line with a dozen *'s.
+by a line with fifteen *'s.
 The lines removed from
 .Ar file1
 are marked with
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index 49244bb99fe..412a5c9b9bd 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.40 2003/09/07 18:16:02 tedu Exp $	*/
+/*	$OpenBSD: diff.c,v 1.41 2003/09/07 18:50:58 jmc Exp $	*/
 
 /*
  * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: diff.c,v 1.40 2003/09/07 18:16:02 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: diff.c,v 1.41 2003/09/07 18:50:58 jmc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -376,12 +376,12 @@ __dead void
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: diff [-bdilqtTw] [-c | -e | -f | -n | -u] [-L label] file1 file2\n"
-	    "       diff [-bdilqtTw] [-L label] -C number file1 file2\n"
-	    "       diff [-bdilqtw] -D string file1 file2\n"
-	    "       diff [-bdilqtTw] [-L label] -U number file1 file2\n"
-	    "       diff [-bdilNPqwtT] [-c | -e | -f | -n | -u ] [-L label] [-r] [-s] [-S name]\n"
-	    "            [-X file] [-x pattern] dir1 dir2\n");
+	    "usage: diff [-abdilqtTw] [-c | -e | -f | -n | -u] [-L label] file1 file2\n"
+	    "       diff [-abdilqtTw] [-L label] -C number file1 file2\n"
+	    "       diff [-abdilqtw] -D string file1 file2\n"
+	    "       diff [-abdilqtTw] [-L label] -U number file1 file2\n"
+	    "       diff [-abdilNPqtTw] [-c | -e | -f | -n | -u ] [-L label] [-r] [-s]\n"
+	    "            [-S name] [-X file] [-x pattern] dir1 dir2\n");
 
 	exit(2);
 }