From: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
To: "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>
Cc: linux-man@vger.kernel.org
Subject: Re: [PATCH] man3/*: srcfx, fix warnings from "mandoc -Tlint"
Date: Sun, 21 Jun 2020 14:09:30 +0000 [thread overview]
Message-ID: <20200621140930.GA27576@rhi.hi.is> (raw)
In-Reply-To: <f2a4590c-b383-73cd-a92b-873085397937@gmail.com>
On Sun, Jun 21, 2020 at 09:21:21AM +0200, Michael Kerrisk (man-pages) wrote:
> Hello Bjarni,
>
> On 6/20/20 10:43 PM, Bjarni Ingi Gislason wrote:
> > Remove superfluous paragraph macros.
> >
> > Remove request ".br" if it precedes a line, that begins with a space,
> > as such lines automatically cause a break.
> >
> > There is no change in the output from "nroff" and "groff".
>
> Thanks. Patch applied, but I had to do some changes manually,
> since the patch wouldn't apply as a whole. The pieces
>
> > man3/gethostbyname.3 | 1 -
> > man3/getrpcent.3 | 1 -
> > man3/getsubopt.3 | 2 --
> > man3/ilogb.3 | 1 -
> > man3/posix_spawn.3 | 2 --
>
> were broken, for reasons that were not immediately obvious to me.
> (There was a similar problem in the man2/* patch).
>
The issue, as I see it, is the difference in the use of a one-font
macro versus a two-fonts macro for one argument.
The patches may contain lines with ".[BI] 1argument" while the file
to be patched contains ".[BI]R 1argument".
I don't know what "git" reports to you, but I get "merge conflict"
for those files that don't fit.
It is easy to correct with an editor, as "git" marks the place where
the conflict occurs.
--
Bjarni I. Gislason
prev parent reply other threads:[~2020-06-21 14:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-20 20:43 [PATCH] man3/*: srcfx, fix warnings from "mandoc -Tlint" Bjarni Ingi Gislason
2020-06-21 7:21 ` Michael Kerrisk (man-pages)
2020-06-21 14:09 ` Bjarni Ingi Gislason [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200621140930.GA27576@rhi.hi.is \
--to=bjarniig@rhi.hi.is \
--cc=linux-man@vger.kernel.org \
--cc=mtk.manpages@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).