From owner-svn-doc-all@FreeBSD.ORG Mon Jun 3 14:41:02 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 3D9E2327; Mon, 3 Jun 2013 14:41:02 +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 EE86E10D8; Mon, 3 Jun 2013 14:41:01 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id CF4FA14D240B; Mon, 3 Jun 2013 16:40:55 +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 AYIrKA94-T6g; Mon, 3 Jun 2013 16:40:55 +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 380C014D2403; Mon, 3 Jun 2013 16:40:55 +0200 (CEST) Message-ID: <51ACAAFB.1070807@FreeBSD.org> Date: Mon, 03 Jun 2013 16:40:59 +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: Tom Rhodes Subject: Re: svn commit: r41824 - head/en_US.ISO8859-1/books/handbook References: <1370264382.6045.YahooMailClassic@web184906.mail.gq1.yahoo.com> <51AC956D.1040405@FreeBSD.org> <20130603102747.44431f4a.trhodes@FreeBSD.org> In-Reply-To: <20130603102747.44431f4a.trhodes@FreeBSD.org> 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, dru.lavigne@att.net 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:41:02 -0000 Em 03-06-2013 16:27, Tom Rhodes escreveu: > 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.:) I see that point but I think most changes are trivially demanded, e.g. style and grammar improvement, elimination of you, etc. These could directly go to head. On the other hand, reorganization of chapters is something that needs care and discussion so it could happen in a separate branch. But reducing the number of changes in that branch and not mixing mergeable and not mergeable changes can significantly facilitate the process. The questions is now if it is desired to go back to one development line again. If so, we need a list of changes that cannot directly be merged from the ISBN branch, solve them there to use a single source solution and then merge back the whole branch and continue in head. Gabor