From owner-svn-doc-all@FreeBSD.ORG Mon Jun 3 16:02:32 2013 Return-Path: Delivered-To: svn-doc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1AAE8498; Mon, 3 Jun 2013 16:02:32 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from mxout1.bln1.prohost.de (mxout1.bln1.prohost.de [213.160.84.47]) by mx1.freebsd.org (Postfix) with ESMTP id 887DD1753; Mon, 3 Jun 2013 16:02:31 +0000 (UTC) Received: from Benedicts-Macbook-Pro.local (p4FC71571.dip0.t-ipconnect.de [79.199.21.113]) (authenticated bits=0) by mx1.bln1.prohost.de (8.14.4/8.14.4) with ESMTP id r53G2KF5003516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 3 Jun 2013 18:02:20 +0200 Message-ID: <51ACBE0C.4040702@FreeBSD.org> Date: Mon, 03 Jun 2013 18:02:20 +0200 From: Benedict Reuschling Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Dru Lavigne Subject: Re: svn commit: r41824 - head/en_US.ISO8859-1/books/handbook References: <1370270492.23229.YahooMailClassic@web184904.mail.gq1.yahoo.com> In-Reply-To: <1370270492.23229.YahooMailClassic@web184904.mail.gq1.yahoo.com> X-Enigmail-Version: 1.5.1 OpenPGP: id=4A819348 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Null-Tag: e5be383c8273ee99f4f5ed492f69cb53 Cc: Tom Rhodes , svn-doc-head@FreeBSD.org, svn-doc-all@FreeBSD.org, Gabor Kovesdan , doc-committers@FreeBSD.org X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: bcr@FreeBSD.org List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jun 2013 16:02:32 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 03.06.13 16:41, schrieb Dru Lavigne: > >>> I agree that it was a good choice that time but the >> two-way merges add >>> quite much overhead. When the branch was created, we >> still didn't have a >>> real XML toolchain. But now we have it so DocBook >> profiling is possible. >>> In this way, we can work with a single source and mark >> up print-only and >>> online-only sections. We can also mark up >> version-specific text so there >>> is no need to maintain two different development >> lines. >>> >>> Gabor >> >> This sounds really cool, I think we should have a discussion on >> how to do this, if we want to do this, and how we could go about >> using only one version. Personally, I kind of like a development >> version where we can make changes, discuss them, fix them, as a >> team, and have them slowly merged into a version that will appear >> on the web. :) > > > This is a good item to add to the agenda for the June 17 doc > sprint. Tom, will you be attending that one in person (in > Cincinnati?) or online? > That's a good idea and I also like what Gabor proposed. I hope that we don't spend too much time on debating this though and use he time to also assign work items for the handbook and coordinate. Once we reach a conclusion, we should make sure that the current merges Glen is doing between head and the isbn branch are finished and then work with the new model we agreed on by then. Benedict -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Darwin) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlGsvgwACgkQTSZQLkqBk0gnRgCdEixVQvv8arflgfa9VXGVqP9B TL4AnRVlaaDvfc6FYHN7Ge1YZ4721SXd =ftgQ -----END PGP SIGNATURE-----