On 7/4/20 2:02 AM, Bjarni Ingi Gislason wrote: > On Thu, Jul 02, 2020 at 12:27:25PM +0200, Michael Kerrisk (man-pages) wrote: >> Hello Bjarni, >> >> On 7/2/20 12:50 AM, Bjarni Ingi Gislason wrote: >>> Change '-' to '\-' for the prefix of names to indicate an option. >>> >>> Signed-off-by: Bjarni Ingi Gislason <bjarniig@xxxxxxxxx> >> >> Patch applied, but: >> >>> --- >>> man3/dlopen.3 | 2 +- >>> man3/fts.3 | 2 +- >>> man3/getsubopt.3 | 2 +- >>> man3/insque.3 | 2 +- >>> man3/mq_getattr.3 | 2 +- >>> man3/posix_spawn.3 | 8 ++++---- >>> man3/pthread_setname_np.3 | 2 +- >>> man3/sincos.3 | 2 +- >>> man3/strfromd.3 | 6 +++--- >> >> The above piece was broken, so I applied manually. Was your patch >> against master? >> > I always use my own copy of the repository where I apply my new > patches to. Please don't. When I've rejected particular changes (as below), for reasons that I already explained (several times), then basing your patches on private repo that still has those changes will just cause breakage and wasted time for me. Please base patches off a pristine master. Thanks, Michael > The difference is the non-applied patches to master, that change a > two-fonts macro to a single-font macro for a single argument. > > In this case in the man3/strfromd.3, ".B f" (master has ".BR f"). > > So my "git pull" sometimes causes a merge conflict, which is easy for > me to correct. > -- Michael Kerrisk Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/ Linux/UNIX System Programming Training: http://man7.org/training/
