From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 21:31:10 2013 Return-Path: Delivered-To: svn-doc-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B72F05E7; Wed, 30 Jan 2013 21:31:10 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from mxout3.bln1.prohost.de (mxout3.bln1.prohost.de [213.160.84.49]) by mx1.freebsd.org (Postfix) with ESMTP id 42053804; Wed, 30 Jan 2013 21:31:09 +0000 (UTC) Received: from Benedicts-Macbook-Pro.local (p4FC71B0F.dip.t-dialin.net [79.199.27.15]) (authenticated bits=0) by mx1.bln1.prohost.de (8.14.1/8.14.1) with ESMTP id r0ULV0pI027972 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Jan 2013 22:31:01 +0100 Message-ID: <5109911B.8050503@FreeBSD.org> Date: Wed, 30 Jan 2013 22:31:07 +0100 From: Benedict Reuschling Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: Glen Barber Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51096FC6.2000205@FreeBSD.org> <20130130205409.GK1402@glenbarber.us> In-Reply-To: <20130130205409.GK1402@glenbarber.us> X-Enigmail-Version: 1.5 OpenPGP: id=4A819348 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Null-Tag: d430172bedbd2025d69c64f6a4c6df5a Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org, Gabor Kovesdan X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: bcr@FreeBSD.org List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 21:31:10 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 30.01.13 21:54, schrieb Glen Barber: > On Wed, Jan 30, 2013 at 08:08:54PM +0100, Gabor Kovesdan wrote: >> Em 30-01-2013 20:01, Benedict Reuschling escreveu: >>> Author: bcr Date: Wed Jan 30 19:01:33 2013 New Revision: 40831 >>> URL:http://svnweb.freebsd.org/changeset/doc/40831 >>> >>> Log: Deactivate the build of the PGP Keys section from the >>> appendix. This will not be part of the print edition, but will >>> still be kept in the online version. >> Are you sure that this is the best way of doing this? This will >> make merges more difficult. I don't know if it has been discussed >> somewhere but I'd prefer a single-source solution. We could add a >> custom profiling attribute for online or print-only chunks. >> > > As a more immediate solution, what if we use something like this > for changes that should not be merged back to head/ ? > > MFC after: none > Rather MTC ("to" instead of "from" head), from the perspective of the branch that is. ;) We could do that. It requires going through each individual commit made to the branch when merging it back and figure out what to do with it depending on the commit message. It also does not put any pressure on translators. With the attribute solution (which I'm also in favour of) that Gabor proposed (condition="online" vs. condition="print"), these need to be put into translations as well, without having an immediate (visual) benefit for translations. To reduce the actual work of doing changes in the translated versions (except bumping revisions), the commit message approach is cleaner. That is, if we decide to translate the printed version. But when merging them back to the online handbook, translators would have to pick them up and integrate them. However, I'm also seeing that Gabor's solution is a more programatical way (using XSLT) of dealing with the problem, which also has its benefits. I'm undecided at the moment, I guess extra work for either side (translators or people doing the merges) is unavoidable. Benedict -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Darwin) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlEJkRsACgkQTSZQLkqBk0jXmgCg0sopbur6kW8/vizZsylJ5yCo EgEAoIddKXhxofSQcaK8bsn2tybpioOY =P2kr -----END PGP SIGNATURE-----