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
