From owner-svn-doc-all@FreeBSD.ORG Mon Jun 3 14:31:06 2013 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2EFC3E74; Mon, 3 Jun 2013 14:31:06 +0000 (UTC) (envelope-from trhodes@FreeBSD.org) Received: from homiemail-a70.g.dreamhost.com (caiajhbdcbhh.dreamhost.com [208.97.132.177]) by mx1.freebsd.org (Postfix) with ESMTP id 15A6A1057; Mon, 3 Jun 2013 14:31:05 +0000 (UTC) Received: from homiemail-a70.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a70.g.dreamhost.com (Postfix) with ESMTP id C7F8D76808A; Mon, 3 Jun 2013 07:28:55 -0700 (PDT) Received: from lab (ip72-219-240-45.dc.dc.cox.net [72.219.240.45]) (Authenticated sender: trhodes@fbsdsecure.org) by homiemail-a70.g.dreamhost.com (Postfix) with ESMTPA id 111A2768061; Mon, 3 Jun 2013 07:27:47 -0700 (PDT) Date: Mon, 3 Jun 2013 10:27:47 -0400 From: Tom Rhodes To: Gabor Kovesdan Subject: Re: svn commit: r41824 - head/en_US.ISO8859-1/books/handbook Message-Id: <20130603102747.44431f4a.trhodes@FreeBSD.org> In-Reply-To: <51AC956D.1040405@FreeBSD.org> References: <1370264382.6045.YahooMailClassic@web184906.mail.gq1.yahoo.com> <51AC956D.1040405@FreeBSD.org> X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: trhodes@freebsd.org, svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, dru.lavigne@att.net, 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 14:31:06 -0000 On Mon, 03 Jun 2013 15:09:01 +0200 Gabor Kovesdan wrote: > 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 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. :) -- Tom Rhodes