From owner-svn-src-all@FreeBSD.ORG  Thu Jul 26 11:01:07 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@FreeBSD.org
Received: from lo0.su (repoman.freebsd.org [IPv6:2001:4f8:fff6::29])
	by hub.freebsd.org (Postfix) with ESMTP id 868891065672;
	Thu, 26 Jul 2012 11:01:06 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Date: Thu, 26 Jul 2012 15:01:05 +0400
From: Ruslan Ermilov <ru@FreeBSD.org>
To: David O'Brien <obrien@FreeBSD.org>
Message-ID: <20120726110105.GB48240@lo0.su>
References: <201205291949.q4TJnqtS099250@svn.freebsd.org>
	<CAE-mSOJYQZM3xdO=64a4Gz7TzRoY-tLZimxbGPgyeuee_3B_EQ@mail.gmail.com>
	<20120531030738.GA77656@dragon.NUXI.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20120531030738.GA77656@dragon.NUXI.org>
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	Sergey Kandaurov <pluknet@FreeBSD.org>, src-committers@FreeBSD.org
Subject: Re: svn commit: r236255 - head/contrib/groff/tmac
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2012 11:01:08 -0000

On Wed, May 30, 2012 at 08:07:38PM -0700, David O'Brien wrote:
> On Wed, May 30, 2012 at 07:34:33AM +0400, Sergey Kandaurov wrote:
> > On 29 May 2012 23:49, David E. O'Brien <obrien@freebsd.org> wrote:
> ...
> > > Modified: head/contrib/groff/tmac/doc-common
> ...
> > > +.ds doc-operating-system-FreeBSD-8.3     8.3
> > > +.ds doc-operating-system-FreeBSD-9.1     9.1
> > > +.ds doc-operating-system-FreeBSD-10.0    10.0
> > This should be imported from savannah.gnu.org repository,
> > and not changed directly.
> 
> Unfortunately we cannot do that per r217595:
> 
> 	This is a direct commit to contrib/ as we will no longer import
> 	any newer groff snapshots, due to licensing issues.
> 
> > For local changes not found in the (latest) contrib doc-common
> > you should use gnu/usr.bin/groff/tmac/mdoc.local
> 
> I followed r217595, was that commit the wrong approach?

Wrong.  mdoc is still distributed under the BSD license, and changes
to it should be cherry picked and merged via vendor/groff/dist/.

"8.3" and "10.0" that you added were already present in mdoc.local.

I've cleaned up this mess now while I was pulling up latest changes
to mdoc.

And BTW, I still recommend a pre-commit review for groff, as hinted
in src/MAINTAINERS.