From owner-freebsd-doc@FreeBSD.ORG  Sun Jan  5 23:20:36 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 8D368279;
 Sun,  5 Jan 2014 23:20:36 +0000 (UTC)
Received: from wonkity.com (wonkity.com [67.158.26.137])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 177111E3D;
 Sun,  5 Jan 2014 23:20:35 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.7/8.14.7) with ESMTP id s05NKKOM007665;
 Sun, 5 Jan 2014 16:20:20 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.7/8.14.7/Submit) with ESMTP id s05NKKxn007657;
 Sun, 5 Jan 2014 16:20:20 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Sun, 5 Jan 2014 16:20:20 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Jamie Landeg Jones <jamie@dyslexicfish.net>
Subject: Re: docs/184791: [patch] man page for 'diff3' references 'info diff'
 instead of 'info diff3'
In-Reply-To: <201401052228.s05MSFd6005930@catnip.dyslexicfish.net>
Message-ID: <alpine.BSF.2.00.1401051611190.7466@wonkity.com>
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>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3
 (wonkity.com [127.0.0.1]); Sun, 05 Jan 2014 16:20:20 -0700 (MST)
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: Sun, 05 Jan 2014 23:20:36 -0000

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.