[PATCH 1/2] man-pages.7: wfix

[PATCH 1/2] man-pages.7: wfix

[G. Branden Robinson]

[-- Attachment #1.1: Type: text/plain, Size: 771 bytes --]

Saw this while preparing the "switch to \~" change Alex invited.

---
 man7/man-pages.7 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man7/man-pages.7 b/man7/man-pages.7
index 6cb805343..3819dfd97 100644
--- a/man7/man-pages.7
+++ b/man7/man-pages.7
@@ -638,7 +638,7 @@ makes it easier to write tools that parse man page source files.)
 .SS Use semantic newlines
 In the source of a manual page,
 new sentences should be started on new lines,
-and long sentences should split into lines at clause breaks
+and long sentences should be split into lines at clause breaks
 (commas, semicolons, colons, and so on).
 This convention, sometimes known as "semantic newlines",
 makes it easier to see the effect of patches,
-- 
2.20.1


[-- Attachment #1.2: 0001-man-pages.7-wfix.patch --]
[-- Type: text/x-diff, Size: 916 bytes --]

From 73c9edb11ab7d147167268ac1fd5c5e6f81f2374 Mon Sep 17 00:00:00 2001
From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
Date: Sat, 31 Jul 2021 13:30:30 +1000
Subject: [PATCH 1/2] man-pages.7: wfix

---
 man7/man-pages.7 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man7/man-pages.7 b/man7/man-pages.7
index 6cb805343..3819dfd97 100644
--- a/man7/man-pages.7
+++ b/man7/man-pages.7
@@ -638,7 +638,7 @@ makes it easier to write tools that parse man page source files.)
 .SS Use semantic newlines
 In the source of a manual page,
 new sentences should be started on new lines,
-and long sentences should split into lines at clause breaks
+and long sentences should be split into lines at clause breaks
 (commas, semicolons, colons, and so on).
 This convention, sometimes known as "semantic newlines",
 makes it easier to see the effect of patches,
-- 
2.20.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/2] man-pages.7: wfix

[Alejandro Colomar (man-pages)]

Hi Branden,

On 7/31/21 5:39 AM, G. Branden Robinson wrote:
> Saw this while preparing the "switch to \~" change Alex invited.

Patch applied (manually).

[
$ git am -s patches/recv/\[PATCH\ 1_2\]\ man-pages.7\:\ wfix.eml
Applying: man-pages.7: wfix
error: patch failed: man7/man-pages.7:638
error: man7/man-pages.7: patch does not apply
Patch failed at 0001 man-pages.7: wfix
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
]

I don't yet understand how to fix these problems, so I wrote it myself 
and changed the author.

Thanks,

Alex

> 
> ---
>   man7/man-pages.7 | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/man7/man-pages.7 b/man7/man-pages.7
> index 6cb805343..3819dfd97 100644
> --- a/man7/man-pages.7
> +++ b/man7/man-pages.7
> @@ -638,7 +638,7 @@ makes it easier to write tools that parse man page source files.)
>   .SS Use semantic newlines
>   In the source of a manual page,
>   new sentences should be started on new lines,
> -and long sentences should split into lines at clause breaks
> +and long sentences should be split into lines at clause breaks
>   (commas, semicolons, colons, and so on).
>   This convention, sometimes known as "semantic newlines",
>   makes it easier to see the effect of patches,
> 


-- 
Alejandro Colomar
Linux man-pages comaintainer; https://www.kernel.org/doc/man-pages/
http://www.alejandro-colomar.es/

Re: [PATCH 1/2] man-pages.7: wfix

[G. Branden Robinson]

[-- Attachment #1: Type: text/plain, Size: 1006 bytes --]

Hi, Alex,

At 2021-07-31T13:36:36+0200, Alejandro Colomar (man-pages) wrote:
> Hi Branden,
> 
> On 7/31/21 5:39 AM, G. Branden Robinson wrote:
> > Saw this while preparing the "switch to \~" change Alex invited.
> 
> Patch applied (manually).
> 
> [
> $ git am -s patches/recv/\[PATCH\ 1_2\]\ man-pages.7\:\ wfix.eml
> Applying: man-pages.7: wfix
> error: patch failed: man7/man-pages.7:638
> error: man7/man-pages.7: patch does not apply
> Patch failed at 0001 man-pages.7: wfix
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> ]
> 
> I don't yet understand how to fix these problems, so I wrote it myself
> and changed the author.

Thanks for taking care of it, but I'm baffled how such a simple patch
could be screwed up.  :(

Regards,
Branden


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]