===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diff.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/diff/diff.1	2003/06/25 18:52:46	1.5
--- src/usr.bin/diff/diff.1	2003/06/26 04:53:02	1.6
***************
*** 1,4 ****
! .\" $OpenBSD: diff.1,v 1.5 2003/06/25 18:52:46 jmc Exp $
  .\" Copyright (c) 1980, 1990, 1993
  .\"	The Regents of the University of California.  All rights reserved.
  .\"
--- 1,5 ----
! .\" $OpenBSD: diff.1,v 1.6 2003/06/26 04:53:02 millert Exp $
! .\"
  .\" Copyright (c) 1980, 1990, 1993
  .\"	The Regents of the University of California.  All rights reserved.
  .\"
***************
*** 28,34 ****
  .\"
  .\"     @(#)diff.1	8.1 (Berkeley) 6/30/93
  .\"
! .Dd June 30, 1993
  .Dt DIFF 1
  .Os
  .Sh NAME
--- 29,35 ----
  .\"
  .\"     @(#)diff.1	8.1 (Berkeley) 6/30/93
  .\"
! .Dd June 25, 2003
  .Dt DIFF 1
  .Os
  .Sh NAME
***************
*** 36,55 ****
  .Nd differential file and directory comparator
  .Sh SYNOPSIS
  .Nm diff
- .Op Fl cefhn
  .Op Fl bitw
  .Ar file1 file2
  .Nm diff
! .Op Fl D Ns Ar string
! .Op Fl biw
  .Ar file1 file2
  .Nm diff
  .Op Fl l
  .Op Fl r
  .Op Fl s
! .Op Fl cefhn
! .Op Fl bitw
! .Op Fl S Ns Ar name
  .Ar dir1 dir2
  .Sh DESCRIPTION
  The
--- 37,70 ----
  .Nd differential file and directory comparator
  .Sh SYNOPSIS
  .Nm diff
  .Op Fl bitw
+ .Oo
+ .Fl c | Fl e | Fl f |
+ .Fl h | Fl n | Fl u
+ .Oc
  .Ar file1 file2
  .Nm diff
! .Op Fl bitw
! .Op Fl C Ar number
  .Ar file1 file2
  .Nm diff
+ .Op Fl bitw
+ .Op Fl D Ar string
+ .Ar file1 file2
+ .Nm diff
+ .Op Fl bitw
+ .Op Fl U Ar number
+ .Ar file1 file2
+ .Nm diff
+ .Op Fl bitw
+ .Oo
+ .Fl c | Fl e | Fl f |
+ .Fl h | Fl n | Fl u
+ .Oc
  .Op Fl l
  .Op Fl r
  .Op Fl s
! .Op Fl S Ar name
  .Ar dir1 dir2
  .Sh DESCRIPTION
  The
***************
*** 65,74 ****
  Output options (mutually exclusive):
  .Bl -tag -width Ds
  .It Fl c
! Produces a diff with lines of context.
! The default is to present 3 lines of context and may be changed, e.g., to 10,
! by
! .Fl c10 .
  With
  .Fl c
  the output format is modified slightly:
--- 80,86 ----
  Output options (mutually exclusive):
  .Bl -tag -width Ds
  .It Fl c
! Produces a diff with 3 lines of context.
  With
  .Fl c
  the output format is modified slightly:
***************
*** 86,97 ****
  Lines which are changed from one file to the other are marked in
  both files with
  .Sq !\ \& .
! Changes which lie within
! .Aq context
! lines of each other are grouped together on output.
! (This is a change from the previous
! .Dq diff -c
! but the resulting output is usually much easier to interpret.)
  .It Fl e
  Produces output in a form suitable as input for the editor utility,
  .Xr ed 1 ,
--- 98,104 ----
  Lines which are changed from one file to the other are marked in
  both files with
  .Sq !\ \& .
! Changes which lie within 3 lines of each other are grouped together on output.
  .It Fl e
  Produces output in a form suitable as input for the editor utility,
  .Xr ed 1 ,
***************
*** 124,130 ****
  insert or delete command.
  This is the form used by
  .Xr rcsdiff 1 .
! .It Fl D Ns Ar string
  Creates a merged version of
  .Ar file1
  and
--- 131,154 ----
  insert or delete command.
  This is the form used by
  .Xr rcsdiff 1 .
! .It Fl u
! Produces a
! .Em unified
! diff with 3 lines of context.
! A unified diff is similar to the context diff produced by the
! .Fl c
! option.
! However, unlike with
! .Fl c ,
! all lines to be changed (added and/or removed) are present in
! a single section.
! .It Fl C Ar number
! Like
! .Fl c
! but produces a diff with
! .Ar number
! lines of context.
! .It Fl D Ar string
  Creates a merged version of
  .Ar file1
  and
***************
*** 138,143 ****
--- 162,173 ----
  .Ar string
  will yield
  .Ar file2 .
+ .It Fl U Ar number
+ Like
+ .Fl u
+ but produces a diff with
+ .Ar number
+ lines of context.
  .El
  .Pp
  Comparison options:
***************
*** 187,193 ****
  Causes
  .Nm
  to report files which are the same, which are otherwise not mentioned.
! .It Fl S Ns Ar name
  Re-starts a directory
  .Nm
  in the middle, beginning with file
--- 217,223 ----
  Causes
  .Nm
  to report files which are the same, which are otherwise not mentioned.
! .It Fl S Ar name
  Re-starts a directory
  .Nm
  in the middle, beginning with file
***************
*** 334,346 ****
  as the temporary directory.
  .El
  .Sh FILES
! .Bl -tag -width /usr/bin/diffh -compact
! .It Pa /tmp/d?????
  .It Pa /usr/bin/diffh
  Alternate algorithm version (used by option
  .Fl h ) .
- .It Pa /usr/bin/diff
- For directory diffs.
  .It Pa /usr/bin/pr
  Used by the
  .Fl l
--- 364,383 ----
  as the temporary directory.
  .El
  .Sh FILES
! .Bl -tag -width /tmp/diff1.XXXXXXXX -compact
! .It Pa /tmp/diff1.XXXXXXXX
! Temporary file used when
! .Ar file1
! is a device or stdin.
! .It Pa /tmp/diff2.XXXXXXXX
! Temporary file used when
! .Ar file2
! is a device or stdin.
! .It Pa /usr/bin/diff
! For directory diffs.
  .It Pa /usr/bin/diffh
  Alternate algorithm version (used by option
  .Fl h ) .
  .It Pa /usr/bin/pr
  Used by the
  .Fl l