===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/patch.1,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/patch/patch.1	2003/07/24 14:29:16	1.10
--- src/usr.bin/patch/patch.1	2003/07/24 14:35:22	1.11
***************
*** 1,4 ****
! .\"	$OpenBSD: patch.1,v 1.10 2003/07/24 14:29:16 millert Exp $
  .\" Copyright 1986, Larry Wall
  .\"
  .\" Redistribution and use in source and binary forms, with or without
--- 1,4 ----
! .\"	$OpenBSD: patch.1,v 1.11 2003/07/24 14:35:22 millert Exp $
  .\" Copyright 1986, Larry Wall
  .\"
  .\" Redistribution and use in source and binary forms, with or without
***************
*** 46,55 ****
  .Fl B ,
  or
  .Fl V
! switches.
  The extension used for making backup files may also be specified in the
  .Ev SIMPLE_BACKUP_SUFFIX
! environment variable, which is overridden by the above switches.
  .Pp
  If the backup file already exists,
  .Nm
--- 46,55 ----
  .Fl B ,
  or
  .Fl V
! options.
  The extension used for making backup files may also be specified in the
  .Ev SIMPLE_BACKUP_SUFFIX
! environment variable, which is overridden by the options above.
  .Pp
  If the backup file already exists,
  .Nm
***************
*** 62,68 ****
  .Pp
  You may also specify where you want the output to go with the
  .Fl o
! switch; if that file already exists, it is backed up first.
  .Pp
  If
  .Ar patchfile
--- 62,68 ----
  .Pp
  You may also specify where you want the output to go with the
  .Fl o
! option; if that file already exists, it is backed up first.
  .Pp
  If
  .Ar patchfile
***************
*** 77,83 ****
  .Fl n ,
  or
  .Fl u
! switch.
  Context diffs (old-style, new-style, and unified) and
  normal diffs are applied by the
  .Nm
--- 77,83 ----
  .Fl n ,
  or
  .Fl u
! option.
  Context diffs (old-style, new-style, and unified) and
  normal diffs are applied by the
  .Nm
***************
*** 190,197 ****
  be examined for interesting things such as filenames and revision level, as
  mentioned previously.
  .Pp
! .Nm
! recognizes the following switches:
  .Bl -tag -width Ds
  .It Fl b , Fl Fl suffix
  Causes the next argument to be interpreted as the backup extension, to be
--- 190,196 ----
  be examined for interesting things such as filenames and revision level, as
  mentioned previously.
  .Pp
! The options are as follows:
  .Bl -tag -width Ds
  .It Fl b , Fl Fl suffix
  Causes the next argument to be interpreted as the backup extension, to be
***************
*** 264,270 ****
  .Fl Fl fuzz Aq Ar number
  .Xc
  Sets the maximum fuzz factor.
! This switch only applies to context diffs, and causes
  .Nm
  to ignore up to that many lines in looking for places to install a hunk.
  Note that a larger fuzz factor increases the odds of a faulty patch.
--- 263,269 ----
  .Fl Fl fuzz Aq Ar number
  .Xc
  Sets the maximum fuzz factor.
! This option only applies to context diffs, and causes
  .Nm
  to ignore up to that many lines in looking for places to install a hunk.
  Note that a larger fuzz factor increases the odds of a faulty patch.
***************
*** 332,338 ****
  Whatever you end up with is looked for either in the current directory,
  or the directory specified by the
  .Fl d
! switch.
  .It Fl r , Fl Fl reject-file
  Causes the next argument to be interpreted as the reject file name.
  .It Fl R , Fl Fl reverse
--- 331,337 ----
  Whatever you end up with is looked for either in the current directory,
  or the directory specified by the
  .Fl d
! option.
  .It Fl r , Fl Fl reject-file
  Causes the next argument to be interpreted as the reject file name.
  .It Fl R , Fl Fl reverse
***************
*** 346,352 ****
  Rejects will come out in the swapped format.
  The
  .Fl R
! switch will not work with ed diff scripts because there is too little
  information to reconstruct the reverse operation.
  .Pp
  If the first hunk of a patch fails,
--- 345,351 ----
  Rejects will come out in the swapped format.
  The
  .Fl R
! option will not work with ed diff scripts because there is too little
  information to reconstruct the reverse operation.
  .Pp
  If the first hunk of a patch fails,
***************
*** 354,360 ****
  will reverse the hunk to see if it can be applied that way.
  If it can, you will be asked if you want to have the
  .Fl R
! switch set.
  If it can't, the patch will continue to be applied normally.
  (Note: this method cannot detect a reversed patch if it is a normal diff
  and if the first command is an append (i.e. it should have been a delete)
--- 353,359 ----
  will reverse the hunk to see if it can be applied that way.
  If it can, you will be asked if you want to have the
  .Fl R
! option set.
  If it can't, the patch will continue to be applied normally.
  (Note: this method cannot detect a reversed patch if it is a normal diff
  and if the first command is an append (i.e. it should have been a delete)
***************
*** 434,440 ****
  If you are patching something in a subdirectory, be sure to tell the patch
  user to specify a
  .Fl p
! switch as needed.
  .Pp
  Third, you can create a file by sending out a diff that compares a
  null file to the file you want to create.
--- 433,439 ----
  If you are patching something in a subdirectory, be sure to tell the patch
  user to specify a
  .Fl p
! option as needed.
  .Pp
  Third, you can create a file by sending out a diff that compares a
  null file to the file you want to create.
***************
*** 481,487 ****
  .Sh SEE ALSO
  .Xr diff 1
  .Sh AUTHORS
! .An Larry Wall Aq lwall@netlabs.com
  with many other contributors.
  .Sh CAVEATS
  .Nm
--- 480,486 ----
  .Sh SEE ALSO
  .Xr diff 1
  .Sh AUTHORS
! .An Larry Wall Aq larry@wall.org
  with many other contributors.
  .Sh CAVEATS
  .Nm