From owner-svn-src-head@freebsd.org Sat Dec 19 13:00:18 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 53DCB4C6B40; Sat, 19 Dec 2020 13:00:18 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cym6p209Cz3Qqp; Sat, 19 Dec 2020 13:00:18 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 37DBD1D8B0; Sat, 19 Dec 2020 13:00:18 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BJD0IbN027092; Sat, 19 Dec 2020 13:00:18 GMT (envelope-from gbe@FreeBSD.org) Received: (from gbe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BJD0I1a027090; Sat, 19 Dec 2020 13:00:18 GMT (envelope-from gbe@FreeBSD.org) Message-Id: <202012191300.0BJD0I1a027090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gbe set sender to gbe@FreeBSD.org using -f From: Gordon Bergling Date: Sat, 19 Dec 2020 13:00:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368807 - head/usr.bin/patch X-SVN-Group: head X-SVN-Commit-Author: gbe X-SVN-Commit-Paths: head/usr.bin/patch X-SVN-Commit-Revision: 368807 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2020 13:00:18 -0000 Author: gbe (doc committer) Date: Sat Dec 19 13:00:17 2020 New Revision: 368807 URL: https://svnweb.freebsd.org/changeset/base/368807 Log: patch(1): Fix a few mandoc related issues - no blank before trailing delimiter MFC after: 1 week Modified: head/usr.bin/patch/patch.1 Modified: head/usr.bin/patch/patch.1 ============================================================================== --- head/usr.bin/patch/patch.1 Sat Dec 19 12:55:27 2020 (r368806) +++ head/usr.bin/patch/patch.1 Sat Dec 19 13:00:17 2020 (r368807) @@ -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 differ 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