From owner-svn-src-head@freebsd.org Wed Jul 1 07:49:23 2020 Return-Path: Delivered-To: svn-src-head@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 08125366090; Wed, 1 Jul 2020 07:49:23 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 49xYJy6TvBz4498; Wed, 1 Jul 2020 07:49:22 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from localhost (p548612f6.dip0.t-ipconnect.de [84.134.18.246]) (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 6542529B93; Wed, 1 Jul 2020 07:49:22 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Wed, 1 Jul 2020 09:49:20 +0200 From: Gordon Bergling To: rgrimes@freebsd.org Cc: Gordon Bergling , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r362809 - head/contrib/mandoc Message-ID: <20200701074920.GB72275@lion.0xfce3.net> References: <202006301808.05UI8xHC098191@repo.freebsd.org> <202006302256.05UMuHZY053765@gndrsh.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202006302256.05UMuHZY053765@gndrsh.dnsmgr.net> X-Url: X-Operating-System: FreeBSD 12.1-STABLE amd64 X-Host-Uptime: 9:32AM up 20:58, 4 users, load averages: 4.72, 4.93, 4.91 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2020 07:49:23 -0000 On Tue, Jun 30, 2020 at 03:56:17PM -0700, Rodney W. Grimes wrote: > [ Charset UTF-8 unsupported, converting... ] > > Author: gbe (doc committer) > > Date: Tue Jun 30 18:08:59 2020 > > New Revision: 362809 > > URL: https://svnweb.freebsd.org/changeset/base/362809 > > > > Log: > > Mention FreeBSD in the HISTORY sections of apropos(1) and makewhatis(8). > > > > PR: 223520, 223521 > > Reviewed by: bcr (mentor) > > Approved by: bcr (mentor) > > Differential Revision: https://reviews.freebsd.org/D25521 > > > > Modified: > > head/contrib/mandoc/apropos.1 > > head/contrib/mandoc/makewhatis.8 > > > > Modified: head/contrib/mandoc/apropos.1 > > ============================================================================== > > --- head/contrib/mandoc/apropos.1 Tue Jun 30 17:21:28 2020 (r362808) > > +++ head/contrib/mandoc/apropos.1 Tue Jun 30 18:08:59 2020 (r362809) > > @@ -15,7 +15,7 @@ > > .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF > > .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > > .\" > > -.Dd $Mdocdate: November 22 2018 $ > > +.Dd $Mdocdate: June 30 2020 $ > > .Dt APROPOS 1 > > .Os > > .Sh NAME > > @@ -493,6 +493,12 @@ The options > > .Fl acfhIKklOTWw > > appeared in > > .Ox 5.7 . > > +.Pp > > +The > > +.Nm > > +utility was integrated into > > +.Fx 11.1 > > +as part of the switch to mandoc. > > Huh? FreeBSD has had apropos since 1.0 and my 5.4 system clearly has it: > freebsd {110}% uname -a > FreeBSD pdx.rh.CN85.dnsmgr.net 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #1: Mon Jul 1 17:58:50 PDT 2019 root@pdx.rh.CN85.dnsmgr.net:/usr/src/sys/i386/compile/PDXMXPIE i386 > pdx.rh.CN85.dnsmgr.net:freebsd {111}% which apropos > /usr/bin/apropos > > And a man page for it too: > APROPOS(1) FreeBSD General Commands Manual APROPOS(1) > > NAME > apropos, whatis -- search the whatis database > > SYNOPSIS > apropos keyword ... > whatis keyword ... > > DESCRIPTION > apropos searches a set of database files containing short descriptions of > system commands for keywords and displays the result on the standard out- > put. whatis displays only complete word matches. > > keyword really is an extended regular expression, please read grep(1) > manual page for more information about its format. > > DIAGNOSTICS > The apropos utility exits 0 on success, and 1 if no keyword matched. > > SEE ALSO > grep(1), makewhatis(1), man(1) > > FreeBSD 5.4 January 15, 1991 FreeBSD 5.4 > > > .Sh AUTHORS > > .An -nosplit > > .An Bill Joy > > That is true, but the version of 'apropos' we have currently in base is based on mandoc, which was imported around September 2018. Due to the nature of contributed code I thought it would be best to document only the history when it was integrated into FreeSBD. The same applies for 'makewhatis'. > > Modified: head/contrib/mandoc/makewhatis.8 > > ============================================================================== > > --- head/contrib/mandoc/makewhatis.8 Tue Jun 30 17:21:28 2020 (r362808) > > +++ head/contrib/mandoc/makewhatis.8 Tue Jun 30 18:08:59 2020 (r362809) > > @@ -15,7 +15,7 @@ > > .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF > > .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > > .\" > > -.Dd $Mdocdate: May 17 2017 $ > > +.Dd $Mdocdate: June 30 2020 $ > > .Dt MAKEWHATIS 8 > > .Os > > .Sh NAME > > @@ -211,6 +211,12 @@ and the options > > .Fl aCDnQT > > in > > .Ox 5.6 . > > +.Pp > > +The > > +.Nm > > +utility was integrated into > > +.Fx 11.1 > > +as part of the switch to mandoc. > > Ditto > > > .Sh AUTHORS > > .An -nosplit > > .An Bill Joy --Gordon