svn commit: r366608 - in stable/12: bin/ls sbin/dhclient

[Gordon Bergling]

On Sat, Oct 10, 2020 at 09:02:50AM -0500, Mike Karels wrote:
> > Date: Sat, 10 Oct 2020 15:28:29 +0200
> > From: Gordon Bergling <gbe at freebsd.org>
> > On Sat, Oct 10, 2020 at 08:12:43AM -0500, Mike Karels wrote:
> > > > Author: gbe (doc committer)
> > > > Date: Sat Oct 10 09:52:41 2020
> > > > New Revision: 366608
> > > > URL: https://svnweb.freebsd.org/changeset/base/366608
> > > 
> > > > Log:
> > > >   MFC r366407, r366403
> > > >   
> > > >   ls(1): Bugfix for an issue reported by mandoc
> > > >   dhclient(8): Bugfixes for some issues reported by mandoc
> > > >   
> > > >   - no blank before trailing delimiter
> > > >   - new sentence, new line
> > > 
> > > > Modified:
> > > >   stable/12/bin/ls/ls.1
> > > >   stable/12/sbin/dhclient/dhclient.leases.5
> > > >   stable/12/sbin/dhclient/dhcp-options.5
> > > > Directory Properties:
> > > >   stable/12/   (props changed)
> > > 
> > > > Modified: stable/12/bin/ls/ls.1
> > > > ==============================================================================
> > > > --- stable/12/bin/ls/ls.1	Sat Oct 10 09:50:09 2020	(r366607)
> > > > +++ stable/12/bin/ls/ls.1	Sat Oct 10 09:52:41 2020	(r366608)
> > > > @@ -40,7 +40,7 @@
> > > >  .Nd list directory contents
> > > >  .Sh SYNOPSIS
> > > >  .Nm
> > > > -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1,
> > > > +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 ,
> > > >  .Op Fl -color Ns = Ns Ar when
> > > >  .Op Fl D Ar format
> > > >  .Op Ar
> > > 
> > > This change is wrong, and should not have been MFC'd.  It should be fixed
> > > correctly instead.  The comma is not a delimiter, it is an option; it should
> > > appear inside the brackets, not after.  The warning can be fixed by adding
> > > \& after the comma rather than inserting a space.
> > > 
> > > 		Mike
> 
> > Hello Mike,
> 
> > if this change is wrong I'll correct it in head and MFC it afterwards.
> > The output of ls(1) is still the same as it was before, checked via mandoc and
> > man.
> 
> > --Gordon
> 
> In my testing, the comma is inside the brackets in the original version:
> 
>      ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1,] [--color=when] [-D format]
>         [file ...]
> 
> 
> It is outside the brackets with this change:
> 
>      ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1], [--color=when] [-D format]
>         [file ...]
> 
> The former is correct.  Caveat, I'm running mandoc on 12.1.
> 
> 		Mike

That is strange, maybe an localisation problem. I am also running my local
tests on 12.2-STABLE. I followed your suggestion in r366613 [1] and MFC it tomorrow.

--Gordon

[1] https://svnweb.freebsd.org/base?view=revision&revision=366613