From owner-svn-doc-all@FreeBSD.ORG Mon Jun 3 13:09:06 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 91C872B8; Mon, 3 Jun 2013 13:09:06 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id 4F8B31C35; Mon, 3 Jun 2013 13:09:06 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 7FA3114D240B; Mon, 3 Jun 2013 15:08:57 +0200 (CEST) X-Virus-Scanned: amavisd-new at !change-mydomain-variable!.example.com Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id SLDR1Ef4_6x3; Mon, 3 Jun 2013 15:08:57 +0200 (CEST) Received: from [192.168.0.10] (54034B4D.catv.pool.telekom.hu [84.3.75.77]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id EB9B314D2403; Mon, 3 Jun 2013 15:08:56 +0200 (CEST) Message-ID: <51AC956D.1040405@FreeBSD.org> Date: Mon, 03 Jun 2013 15:09:01 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Thunderbird/22.0 MIME-Version: 1.0 To: Dru Lavigne , Tom Rhodes , Eitan Adler Subject: Re: svn commit: r41824 - head/en_US.ISO8859-1/books/handbook References: <1370264382.6045.YahooMailClassic@web184906.mail.gq1.yahoo.com> In-Reply-To: <1370264382.6045.YahooMailClassic@web184906.mail.gq1.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list 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 13:09:06 -0000 Em 03-06-2013 14:59, Dru Lavigne escreveu: >>> > >I hope we're syncing to ISBN branch? >> > >> >I shall let gjb work on this - he already said he is going >> >to be doing >> >the merge work. >> > >> >Personally, I think we did the ISBN branch wrongly, but I'll >> >leave >> >that to a different discussion. > I thought the concensus was to work in ISBN and gjb would merge those changes to HEAD? Many of the changes you are doing have already occurred in ISBN. We started the work in ISBN so that the doc slush would not slow down changes to the book. 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