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/
