===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diff.1,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- src/usr.bin/diff/diff.1	2003/07/04 17:50:24	1.10
+++ src/usr.bin/diff/diff.1	2003/07/06 20:48:59	1.11
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.10 2003/07/04 17:50:24 millert Exp $
+.\" $OpenBSD: diff.1,v 1.11 2003/07/06 20:48:59 millert Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -56,14 +56,18 @@
 .Op Fl U Ar number
 .Ar file1 file2
 .Nm diff
-.Op Fl abitw
+.Op Fl abiNtw
 .Oo
 .Fl c | Fl e | Fl f |
 .Fl n | Fl u
 .Oc
+.Bk -words
 .Op Fl r
 .Op Fl s
 .Op Fl S Ar name
+.Op Fl X Ar file
+.Op Fl x Ar pattern
+.Ek
 .Ar dir1 dir2
 .Sh DESCRIPTION
 The
@@ -78,8 +82,6 @@
 .Pp
 Output options (mutually exclusive):
 .Bl -tag -width Ds
-.It Fl a
-Treat all files as ASCII.
 .It Fl c
 Produces a diff with 3 lines of context.
 With
@@ -168,6 +170,8 @@
 .Pp
 Comparison options:
 .Bl -tag -width Ds
+.It Fl a
+Treat all files as ASCII.
 .It Fl b
 Causes trailing blanks (spaces and tabs) to be ignored, and other
 strings of blanks to compare equal.
@@ -197,6 +201,9 @@
 .Pp
 Directory comparison options:
 .Bl -tag -width Ds
+.It Fl N
+If a file is found in only one directory, act as if it was found in the
+other directory too but was of zero size.
 .It Fl r
 Causes application of
 .Nm
@@ -210,6 +217,21 @@
 .Nm
 in the middle, beginning with file
 .Ar name .
+.It Fl X Ar file
+Exclude files and subdirectories from comparison whose basenames match
+lines in
+.Ar file .
+Multiple
+.Fl X
+options may be specified.
+.It Fl x Ar pattern
+Exclude files and subdirectories from comparison whose basenames match
+.Ar pattern .
+Patterns are matched using shell-style globbing via
+.Xr fnmatch 3 .
+Multiple
+.Fl x
+options may be specified.
 .El
 .Pp
 If both arguments are directories,
@@ -381,7 +403,8 @@
 .Xr cmp 1 ,
 .Xr comm 1 ,
 .Xr diff3 1 ,
-.Xr ed 1
+.Xr ed 1 ,
+.Xr fnmatch 3
 .Sh HISTORY
 A
 .Nm