From owner-svn-src-stable-12@freebsd.org Sat Oct 10 14:02:53 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C110C3F825E; Sat, 10 Oct 2020 14:02:53 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail.karels.net (mail.karels.net [216.160.39.52]) by mx1.freebsd.org (Postfix) with ESMTP id 4C7mqJ3yShz3XPQ; Sat, 10 Oct 2020 14:02:52 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail.karels.net (localhost [127.0.0.1]) by mail.karels.net (8.15.2/8.15.2) with ESMTP id 09AE2o7j001646; Sat, 10 Oct 2020 09:02:50 -0500 (CDT) (envelope-from mike@karels.net) Message-Id: <202010101402.09AE2o7j001646@mail.karels.net> To: Gordon Bergling cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org From: Mike Karels Reply-to: mike@karels.net Subject: Re: svn commit: r366608 - in stable/12: bin/ls sbin/dhclient In-reply-to: Your message of Sat, 10 Oct 2020 15:28:29 +0200. <20201010132829.GA68899@lion.0xfce3.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <1644.1602338570.1@mail.karels.net> Content-Transfer-Encoding: quoted-printable Date: Sat, 10 Oct 2020 09:02:50 -0500 X-Rspamd-Queue-Id: 4C7mqJ3yShz3XPQ X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mike@karels.net designates 216.160.39.52 as permitted sender) smtp.mailfrom=mike@karels.net X-Spamd-Result: default: False [-1.82 / 15.00]; HAS_REPLYTO(0.00)[mike@karels.net]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[mike]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:216.160.39.52]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_ADDR_EQ_FROM(0.00)[]; DMARC_NA(0.00)[karels.net]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-0.91)[-0.914]; NEURAL_HAM_MEDIUM(-0.72)[-0.724]; NEURAL_SPAM_SHORT(0.02)[0.016]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:209, ipnet:216.160.36.0/22, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-stable-12,svn-src-stable,svn-src-all] X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Oct 2020 14:02:53 -0000 > Date: Sat, 10 Oct 2020 15:28:29 +0200 > From: Gordon Bergling > 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 > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- 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 =3D Ns Ar when > > > .Op Fl D Ar format > > > .Op Ar > > = > > This change is wrong, and should not have been MFC'd. It should be fi= xed > > 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 ad= ding > > \& 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 mand= oc and > man. > --Gordon In my testing, the comma is inside the brackets in the original version: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1,] [--color=3Dwhen] [-D fo= rmat] [file ...] It is outside the brackets with this change: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1], [--color=3Dwhen] [-D fo= rmat] [file ...] The former is correct. Caveat, I'm running mandoc on 12.1. Mike