summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-07-24 14:35:23 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-07-24 14:35:23 +0000
commit4efccbf539ae7f3602fb1f07769cbc4aee961431 (patch)
tree85a6f2ef0535b25ff588f4aba8c9325f8be10d8b
parentc3d911d0b3e98c9828df551c98ed6ab20f6ab9ac (diff)
"options" not "switches"; jmc@ OK
also update Larry's email address while I am at it ;-)
-rw-r--r--usr.bin/patch/patch.125
1 files changed, 12 insertions, 13 deletions
diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1
index 206766366f2..de7f5e45aa7 100644
--- a/usr.bin/patch/patch.1
+++ b/usr.bin/patch/patch.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: patch.1,v 1.10 2003/07/24 14:29:16 millert Exp $
+.\" $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,10 +46,10 @@ or as specified by the
.Fl B ,
or
.Fl V
-switches.
+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 above switches.
+environment variable, which is overridden by the options above.
.Pp
If the backup file already exists,
.Nm
@@ -62,7 +62,7 @@ backup file that does not already exist.
.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.
+option; if that file already exists, it is backed up first.
.Pp
If
.Ar patchfile
@@ -77,7 +77,7 @@ unless over-ruled by a
.Fl n ,
or
.Fl u
-switch.
+option.
Context diffs (old-style, new-style, and unified) and
normal diffs are applied by the
.Nm
@@ -190,8 +190,7 @@ and that the garbage before each diff listing will
be examined for interesting things such as filenames and revision level, as
mentioned previously.
.Pp
-.Nm
-recognizes the following switches:
+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,7 +263,7 @@ and assume that patches are reversed if they look like they are.
.Fl Fl fuzz Aq Ar number
.Xc
Sets the maximum fuzz factor.
-This switch only applies to context diffs, and causes
+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,7 +331,7 @@ in which case you get the entire pathname unmodified.
Whatever you end up with is looked for either in the current directory,
or the directory specified by the
.Fl d
-switch.
+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,7 +345,7 @@ will attempt to swap each hunk around before applying it.
Rejects will come out in the swapped format.
The
.Fl R
-switch will not work with ed diff scripts because there is too little
+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,7 +353,7 @@ If the first hunk of a patch fails,
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.
+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,7 +433,7 @@ line.
If you are patching something in a subdirectory, be sure to tell the patch
user to specify a
.Fl p
-switch as needed.
+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,7 +480,7 @@ exit status so you don't apply a later patch to a partially patched file.
.Sh SEE ALSO
.Xr diff 1
.Sh AUTHORS
-.An Larry Wall Aq lwall@netlabs.com
+.An Larry Wall Aq larry@wall.org
with many other contributors.
.Sh CAVEATS
.Nm