From owner-svn-src-stable-12@freebsd.org Sat Oct 10 14:48:59 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 8541E3F9D92; Sat, 10 Oct 2020 14:48:59 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C7nrW2z15z3ZgM; Sat, 10 Oct 2020 14:48:59 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from localhost (p4fd3acce.dip0.t-ipconnect.de [79.211.172.206]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id E7997165C8; Sat, 10 Oct 2020 14:48:58 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Sat, 10 Oct 2020 16:48:56 +0200 From: Gordon Bergling To: Mike Karels Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: Re: svn commit: r366608 - in stable/12: bin/ls sbin/dhclient Message-ID: <20201010144856.GA16865@lion.0xfce3.net> References: <20201010132829.GA68899@lion.0xfce3.net> <202010101402.09AE2o7j001646@mail.karels.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202010101402.09AE2o7j001646@mail.karels.net> X-Url: X-Operating-System: FreeBSD 12.2-STABLE amd64 X-Host-Uptime: 4:39PM up 1 day, 4:01, 4 users, load averages: 0.20, 0.34, 0.30 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:48:59 -0000 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 > > 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