diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2008-06-06 20:44:01 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2008-06-06 20:44:01 +0000 |
commit | f7a9c8b6b66bec1c047350562cc48cd01c329f4d (patch) | |
tree | 71e3a71483007215165c8342fea8b39204f3cc0c /usr.bin | |
parent | c76681e19a23fc686b44d24e71a47d8dda9affff (diff) |
update the description of -b and STANDARDS; suggested by grunk
ok millert
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/patch/patch.1 | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1 index c2c6855d513..59f93a092b0 100644 --- a/usr.bin/patch/patch.1 +++ b/usr.bin/patch/patch.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: patch.1,v 1.21 2008/01/11 20:16:02 jmc Exp $ +.\" $OpenBSD: patch.1,v 1.22 2008/06/06 20:44:00 jmc Exp $ .\" Copyright 1986, Larry Wall .\" .\" Redistribution and use in source and binary forms, with or without @@ -19,7 +19,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: January 11 2008 $ +.Dd $Mdocdate: June 6 2008 $ .Dt PATCH 1 .Os .Sh NAME @@ -102,7 +102,9 @@ unless the file already has a numbered backup, in which case a numbered backup is made. This is equivalent to specifying .Qo Fl V Cm existing Qc . -This option is currently the default but that will change in a future release. +This option is currently the default, unless +.Fl -posix +is specified. .It Fl C , Fl Fl check Checks that the patch would apply cleanly, but does not modify anything. .It Fl c , Fl Fl context @@ -345,7 +347,7 @@ used in place of .Qq .orig . .It Fl Fl posix Enables strict -.St -p1003.2 +.St -p1003.1-2004 conformance, specifically: .Bl -enum .It @@ -459,7 +461,7 @@ match used: If .Nm is operating in strict -.St -p1003.2 +.St -p1003.1-2004 mode, the first of the .Dq old , .Dq new @@ -635,8 +637,13 @@ The .Nm utility is compliant with the .St -p1003.1-2004 -specification, -but its presence is optional. +specification +(except as detailed above for the +.Fl -posix +option), +though the presence of +.Nm +itself is optional. .Pp The flags .Op Fl CEfstuvBFVxz |