Date: Sun, 27 Dec 2020 12:45:43 GMT From: Gordon Bergling <gbe@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: fccec952f9b2 - stable/12 - MFC r368807: patch(1): Fix a few mandoc related issues Message-ID: <202012271245.0BRCjhYG032859@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=fccec952f9b295d8166510533762e0874df9bebf commit fccec952f9b295d8166510533762e0874df9bebf Author: Gordon Bergling <gbe@FreeBSD.org> AuthorDate: 2020-12-19 13:00:17 +0000 Commit: Gordon Bergling <gbe@FreeBSD.org> CommitDate: 2020-12-27 12:39:57 +0000 MFC r368807: patch(1): Fix a few mandoc related issues - no blank before trailing delimiter (cherry picked from commit a2f1c81b286c528a8efedf224a13e476dba1de42) --- usr.bin/patch/patch.1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1 index 3ad5287dee36..775308cc7689 100644 --- a/usr.bin/patch/patch.1 +++ b/usr.bin/patch/patch.1 @@ -164,7 +164,7 @@ ask any questions. It assumes the following: skip patches for which a file to patch cannot be found; patch files even though they have the wrong version for the -.Qq Prereq: +.Qq Prereq : line in the patch; and assume that patches are not reversed even if they look like they are. This option does not suppress commentary; use @@ -288,7 +288,7 @@ in that it suppresses questions, but makes some different assumptions: skip patches for which a file to patch cannot be found (the same as .Fl f ) ; skip patches for which the file has the wrong version for the -.Qq Prereq: +.Qq Prereq : line in the patch; and assume that patches are reversed if they look like they are. .It Fl u , Fl Fl unified @@ -393,7 +393,7 @@ line of context. If that fails, and the maximum fuzz factor is set to 2 or more, the first two and last two lines of context are ignored, and another scan is made. -.Pq The default maximum fuzz factor is 2. +.Pq The default maximum fuzz factor is 2 . .Pp If .Nm @@ -450,7 +450,7 @@ and the file is specified in the line beginning with .Qq +++ . If there is an -.Qq Index: +.Qq Index : line in the leading garbage (regardless of the diff type), .Nm will use the file name from that line as the @@ -544,13 +544,13 @@ First, you can save people a lot of grief by keeping a file which is patched to increment the patch level as the first diff in the patch file you send out. If you put a -.Qq Prereq: +.Qq Prereq : line in with the patch, it will not let them apply patches out of order without some warning. .Pp Second, make sure you have specified the file names right, either in a context diff header, or with an -.Qq Index: +.Qq Index : line. If you are patching something in a subdirectory, be sure to tell the patch user to specify a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012271245.0BRCjhYG032859>