From jamie@dyslexicfish.net  Mon Dec 16 06:21:25 2013
Return-Path: <jamie@dyslexicfish.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id C1D56260
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Dec 2013 06:21:25 +0000 (UTC)
Received: from pacha.mail.dyslexicfish.net (pacha.mail.dyslexicfish.net [IPv6:2607:f2f8:ad14::59])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id A5A3019EE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Dec 2013 06:21:25 +0000 (UTC)
Received: from catnip.dyslexicfish.net (localhost [127.0.0.1])
	by pacha.mail.dyslexicfish.net (8.14.5/8.14.5) with ESMTP id rBG6LP8c070719
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Dec 2013 06:21:25 GMT
	(envelope-from jamie@catnip.dyslexicfish.net)
Received: (from jamie@localhost)
	by catnip.dyslexicfish.net (8.14.5/8.14.5/Submit) id rBG6LOZ1070718;
	Mon, 16 Dec 2013 06:21:24 GMT
	(envelope-from jamie)
Message-Id: <201312160621.rBG6LOZ1070718@catnip.dyslexicfish.net>
Date: Mon, 16 Dec 2013 06:21:24 GMT
From: Jamie Landeg Jones <jamie@dyslexicfish.net>
Reply-To: Jamie Landeg Jones <jamie@dyslexicfish.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] man page for 'diff3' references 'info diff' instead of 'info diff3'
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         184791
>Category:       docs
>Synopsis:       [patch] man page for 'diff3' references 'info diff' instead of 'info diff3'
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wblock
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 06:30:00 UTC 2013
>Closed-Date:    Tue Dec 17 05:01:40 UTC 2013
>Last-Modified:  Mon Jan 13 16:20:00 UTC 2014
>Originator:     Jamie Landeg Jones
>Release:        FreeBSD 9.0-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD catnip.dyslexicfish.net 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:

Most obsessive/pedantic/picky PR of the year goes to me, with:

The man page for diff3(1) refers to 'info diff' instead of
'info diff3'

	
>How-To-Repeat:

% man diff3

Compare the similarity of the end of this page with the end of the
'man diff' page.

Both refer to 'info diff' for more information, but if you compare
the results of 'info diff' and 'info diff3' you'll clearly see that
the man page for diff3 should be referencing 'info diff3'.
	
>Fix:

Patch supplied.

	

--- diff3.1.patch begins here ---
--- /usr/src/contrib/diff/man/diff3.1.orig	2013-10-24 01:39:21.000000000 +0100
+++ /usr/src/contrib/diff/man/diff3.1	2013-12-12 02:31:58.000000000 +0000
@@ -73,6 +73,6 @@
 .B diff3
 programs are properly installed at your site, the command
 .IP
-.B info diff
+.B info diff3
 .PP
 should give you access to the complete manual.
--- diff3.1.patch ends here ---


>Release-Note:
>Audit-Trail:

From: Warren Block <wblock@wonkity.com>
To: Jamie Landeg Jones <jamie@dyslexicfish.net>
Cc: FreeBSD-gnats-submit@freebsd.org, freebsd-doc@FreeBSD.org
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
Date: Mon, 16 Dec 2013 14:33:30 -0700 (MST)

 > Most obsessive/pedantic/picky PR of the year goes to me, with:
 >
 > The man page for diff3(1) refers to 'info diff' instead of
 > 'info diff3'
 >
 >
 >> How-To-Repeat:
 >
 > % man diff3
 >
 > Compare the similarity of the end of this page with the end of the
 > 'man diff' page.
 >
 > Both refer to 'info diff' for more information, but if you compare
 > the results of 'info diff' and 'info diff3' you'll clearly see that
 > the man page for diff3 should be referencing 'info diff3'.
 
 Agreed.  However, this is "contrib" software from an external source, 
 and we generally prefer to get them patched upstream to avoid having to 
 maintain local patches.  I think this is the project page:
 http://www.gnu.org/software/diffutils/
 
 It's not clear how they prefer to get bug reports, but maybe a post to 
 their mailing list would help.

From: Jamie Landeg Jones <jamie@dyslexicfish.net>
To: wblock@wonkity.com, jamie@dyslexicfish.net
Cc: FreeBSD-gnats-submit@freebsd.org, freebsd-doc@freebsd.org
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
Date: Tue, 17 Dec 2013 04:19:54 +0000

 > Agreed.  However, this is "contrib" software from an external source, 
 > and we generally prefer to get them patched upstream to avoid having to 
 > maintain local patches.  I think this is the project page:
 > http://www.gnu.org/software/diffutils/
 >
 > It's not clear how they prefer to get bug reports, but maybe a post to 
 > their mailing list would help.
 
 Ahhhh. Yeah. That makes sense. I'll persue that avenue. Sorry for the
 unintentional 'spam'. Feel free to close the PR!
 
 Cheers for the reply, Jamie
 
State-Changed-From-To: open->closed 
State-Changed-By: wblock 
State-Changed-When: Tue Dec 17 05:01:07 UTC 2013 
State-Changed-Why:  
Closed at submitter's request. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184791 

From: Warren Block <wblock@wonkity.com>
To: Jamie Landeg Jones <jamie@dyslexicfish.net>
Cc: FreeBSD-gnats-submit@freebsd.org, freebsd-doc@freebsd.org
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
Date: Mon, 16 Dec 2013 21:59:50 -0700 (MST)

 On Tue, 17 Dec 2013, Jamie Landeg Jones wrote:
 
 >> Agreed.  However, this is "contrib" software from an external source,
 >> and we generally prefer to get them patched upstream to avoid having to
 >> maintain local patches.  I think this is the project page:
 >> http://www.gnu.org/software/diffutils/
 >>
 >> It's not clear how they prefer to get bug reports, but maybe a post to
 >> their mailing list would help.
 >
 > Ahhhh. Yeah. That makes sense. I'll persue that avenue. Sorry for the
 > unintentional 'spam'. Feel free to close the PR!
 >
 > Cheers for the reply, Jamie
 
 It's not a problem, and thanks for making the effort to report it.  If 
 you find other problems with the documentation but aren't sure where to 
 report them, the freebsd-doc mailing list at
 http://lists.freebsd.org/mailman/listinfo/freebsd-doc can help classify 
 them.  Thanks!

From: Peter Pentchev <roam@ringlet.net>
To: Warren Block <wblock@wonkity.com>
Cc: Jamie Landeg Jones <jamie@dyslexicfish.net>, freebsd-doc@FreeBSD.org,
	FreeBSD-gnats-submit@freebsd.org
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
Date: Tue, 17 Dec 2013 10:35:12 +0200

 --J2SCkAp4GZ/dPZZf
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Mon, Dec 16, 2013 at 02:33:30PM -0700, Warren Block wrote:
 > >Most obsessive/pedantic/picky PR of the year goes to me, with:
 > >
 > >The man page for diff3(1) refers to 'info diff' instead of
 > >'info diff3'
 > >
 > >
 > >>How-To-Repeat:
 > >
 > >% man diff3
 > >
 > >Compare the similarity of the end of this page with the end of the
 > >'man diff' page.
 > >
 > >Both refer to 'info diff' for more information, but if you compare
 > >the results of 'info diff' and 'info diff3' you'll clearly see that
 > >the man page for diff3 should be referencing 'info diff3'.
 >=20
 > Agreed.  However, this is "contrib" software from an external
 > source, and we generally prefer to get them patched upstream to
 > avoid having to maintain local patches.  I think this is the project
 > page:
 > http://www.gnu.org/software/diffutils/
 >=20
 > It's not clear how they prefer to get bug reports, but maybe a post
 > to their mailing list would help.
 
 Just for the record, I believe that some GNU projects now use the
 debbugs installation at http://debbugs.gnu.org/ - and from a quick look
 at http://debbugs.gnu.org/Packages.html it seems that diffutils is
 indeed among them.
 
 G'luck,
 Peter
 
 --=20
 Peter Pentchev	roam@ringlet.net roam@FreeBSD.org p.penchev@storpool.com
 PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
 Key fingerprint 2EE7 A7A5 17FC 124C F115  C354 651E EFB0 2527 DF13
 The rest of this sentence is written in Thailand, on
 
 --J2SCkAp4GZ/dPZZf
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: Digital signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAEBCAAGBQJSsAy3AAoJEGUe77AlJ98TUf4QALj6G3zFHdzoNcDAX/qZuXH9
 cvviLnhDa2Avu4+HHruUQl5qLZh5uPgyLgQX+8S+kPqctT0m7/YiNT+dB2TZTGTg
 YZohLhNJoT0BMQgRz5FkHfk4KUek5jyM9oDAQ+56pjSou8KEtVnF5jZBGVdvwEAr
 7zgvGogORSlzJyAYTaRp70sHm/3CtagghTW9JP3E6PEajpEhRpoQmgD+DjqLe6B4
 A1OMqAcmhVngN7CX/e/xQJ5kSm8T1P1QQkDuQ/8SGcSukERcWfofCByVSZuyWLuq
 Ww4IkkjDUbNLcTfDqQPaNwAw+IJLh6h4T/cYMAXkt8FhZrxFB9SHFeNGH+aTf9Tc
 MxnzBYNqQ3DJgFYwFHcOryNVmPnYOZHm/MNLVvHFYViX37fsSExzOKWmh8ijA8G7
 xaolzYA/2yBzznUs9uiBVUva16zv2ajzJn4fBYBMKLjvJLnxYO06ncVEeQAXrV+T
 JF0r/+BM3vm3cuHzeXxyveYPGUyarUhc32PR5OZARQL0hnLXX4GAsgPk3XaSekSx
 dQKQARkKF73oDTuiPCNab+4BQ9CniLtX6eQ7+boNqWsztmYTrhKHXvLDxQHxGy8l
 YPwbHjQPB7IibrGEvZushhURi/e/yGmY16xFjrvl7RA5qxmmij/IKhG1Eb+/y5fp
 kGXy7NOlr4252u6QTRUg
 =DWZI
 -----END PGP SIGNATURE-----
 
 --J2SCkAp4GZ/dPZZf--

From: Jamie Landeg Jones <jamie@dyslexicfish.net>
To: wblock@wonkity.com, roam@ringlet.net
Cc: jamie@dyslexicfish.net, FreeBSD-gnats-submit@FreeBSD.org,
        freebsd-doc@FreeBSD.org
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
Date: Fri, 03 Jan 2014 15:25:44 +0000

 > > >The man page for diff3(1) refers to 'info diff' instead of
 > > >'info diff3'
 
 Thanks guys for your responses and help. I followed this up,
 and it's been corrected in the latest version of diffutils.
 
 How readily would Freebsd accept a port/merge/update of this?
 
 cheers, Jamie
 

From: Warren Block <wblock@wonkity.com>
To: Jamie Landeg Jones <jamie@dyslexicfish.net>
Cc: roam@ringlet.net, FreeBSD-gnats-submit@FreeBSD.org,
        freebsd-doc@FreeBSD.org
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
Date: Sun, 5 Jan 2014 13:24:49 -0700 (MST)

 On Fri, 3 Jan 2014, Jamie Landeg Jones wrote:
 
 >>>> The man page for diff3(1) refers to 'info diff' instead of
 >>>> 'info diff3'
 >
 > Thanks guys for your responses and help. I followed this up,
 > and it's been corrected in the latest version of diffutils.
 >
 > How readily would Freebsd accept a port/merge/update of this?
 
 Normally, it would come in when the local diffutils are updated to the 
 latest upstream version.  I don't know when that will be or who would 
 handle it.

From: Jamie Landeg Jones <jamie@dyslexicfish.net>
To: wblock@wonkity.com, jamie@dyslexicfish.net
Cc: roam@ringlet.net, FreeBSD-gnats-submit@FreeBSD.org,
        freebsd-doc@FreeBSD.org
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
Date: Sun, 05 Jan 2014 22:28:15 +0000

 >
 > Normally, it would come in when the local diffutils are updated to the 
 > latest upstream version.  I don't know when that will be or who would 
 > handle it.
 
 Yeah, that's what I meant. I'd be willing to have a look at it myself
 if I knew they were open to submissions!
 
 Cheers,
 Jamie
 
Responsible-Changed-From-To: freebsd-doc->wblock 
Responsible-Changed-By: wblock 
Responsible-Changed-When: Sun Jan 5 23:19:43 UTC 2014 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184791 

From: Warren Block <wblock@wonkity.com>
To: Jamie Landeg Jones <jamie@dyslexicfish.net>
Cc: roam@ringlet.net, FreeBSD-gnats-submit@FreeBSD.org,
        freebsd-doc@FreeBSD.org
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
Date: Sun, 5 Jan 2014 16:20:20 -0700 (MST)

 On Sun, 5 Jan 2014, Jamie Landeg Jones wrote:
 
 >>
 >> Normally, it would come in when the local diffutils are updated to the
 >> latest upstream version.  I don't know when that will be or who would
 >> handle it.
 >
 > Yeah, that's what I meant. I'd be willing to have a look at it myself
 > if I knew they were open to submissions!
 
 I looked a bit more.  We currently have a fairly old version of 
 diffutils, 2.8.7.  It's unlikely that newer versions will be imported 
 because they are GPL: https://wiki.freebsd.org/GPLinBase
 
 Instead, there is a project to import the OpenBSD versions:
 https://wiki.freebsd.org/SummerOfCode2012/JesseHagewood
 Current status is not clear.
 
 Given that, I don't see why we can't make interim changes to the GNU 
 versions present now.  (And I'm sorry I didn't look at that earlier.)
 
 I'll take this and commit it to -CURRENT, with an MFC planned to 
 10-STABLE and 9-STABLE.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/184791: commit references a PR
Date: Sun,  5 Jan 2014 23:28:11 +0000 (UTC)

 Author: wblock (doc committer)
 Date: Sun Jan  5 23:28:03 2014
 New Revision: 260358
 URL: http://svnweb.freebsd.org/changeset/base/260358
 
 Log:
   Fix a cut and paste error.
   
   PR:		docs/184791
   Submitted by:	Jamie Landeg Jones <jamie@dyslexicfish.net>
   MFC after:	3 days
 
 Modified:
   head/contrib/diff/man/diff3.1
 
 Modified: head/contrib/diff/man/diff3.1
 ==============================================================================
 --- head/contrib/diff/man/diff3.1	Sun Jan  5 23:13:18 2014	(r260357)
 +++ head/contrib/diff/man/diff3.1	Sun Jan  5 23:28:03 2014	(r260358)
 @@ -73,6 +73,6 @@ and
  .B diff3
  programs are properly installed at your site, the command
  .IP
 -.B info diff
 +.B info diff3
  .PP
  should give you access to the complete manual.
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: Jamie Landeg Jones <jamie@dyslexicfish.net>
To: wblock@wonkity.com, jamie@dyslexicfish.net
Cc: roam@ringlet.net, FreeBSD-gnats-submit@FreeBSD.org,
        freebsd-doc@FreeBSD.org
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
Date: Mon, 13 Jan 2014 16:19:10 +0000

 Warren Block <wblock@wonkity.com> wrote:
 
 > I looked a bit more.  We currently have a fairly old version of 
 > diffutils, 2.8.7.  It's unlikely that newer versions will be imported 
 > because they are GPL: https://wiki.freebsd.org/GPLinBase
 >
 > Instead, there is a project to import the OpenBSD versions:
 > https://wiki.freebsd.org/SummerOfCode2012/JesseHagewood
 > Current status is not clear.
 >
 > Given that, I don't see why we can't make interim changes to the GNU 
 > versions present now.  (And I'm sorry I didn't look at that earlier.)
 
 Ahhh ok. Better to always get fixes made upstream, but in this case,
 as we are no longer tracking the stream, may as well make the change
 until BSD diffs come into play!
 
 Cheers for your help, and sorry that something so trivial has become
 the biggest bikeshed ever.....
 
 For what it's worth, I'm now much clearer on the way we deal with contrib
 code.
 
 Cheers, Jamie
 
>Unformatted:
