From owner-freebsd-doc@FreeBSD.ORG  Mon Jan 13 16:19:13 2014
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E3EACF82;
 Mon, 13 Jan 2014 16:19:13 +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 C02261E67;
 Mon, 13 Jan 2014 16:19:13 +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 s0DGJBFS002719;
 Mon, 13 Jan 2014 16:19:12 GMT
 (envelope-from jamie@catnip.dyslexicfish.net)
Received: (from jamie@localhost)
 by catnip.dyslexicfish.net (8.14.5/8.14.5/Submit) id s0DGJAK0002718;
 Mon, 13 Jan 2014 16:19:10 GMT (envelope-from jamie)
From: Jamie Landeg Jones <jamie@dyslexicfish.net>
Message-Id: <201401131619.s0DGJAK0002718@catnip.dyslexicfish.net>
Date: Mon, 13 Jan 2014 16:19:10 +0000
To: wblock@wonkity.com, jamie@dyslexicfish.net
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
References: <201312160621.rBG6LOZ1070718@catnip.dyslexicfish.net>
 <alpine.BSF.2.00.1312161428240.51221@wonkity.com>
 <20131217083511.GA7989@straylight.m.ringlet.net>
 <201401031525.s03FPj2v046272@catnip.dyslexicfish.net>
 <alpine.BSF.2.00.1401051320460.6170@wonkity.com>
 <201401052228.s05MSFd6005930@catnip.dyslexicfish.net>
 <alpine.BSF.2.00.1401051611190.7466@wonkity.com>
In-Reply-To: <alpine.BSF.2.00.1401051611190.7466@wonkity.com>
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.7
 (pacha.mail.dyslexicfish.net [127.0.0.1]);
 Mon, 13 Jan 2014 16:19:12 +0000 (GMT)
Cc: freebsd-doc@FreeBSD.org, FreeBSD-gnats-submit@FreeBSD.org
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-doc>,
 <mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc/>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
 <mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 16:19:14 -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