From owner-freebsd-doc@FreeBSD.ORG Mon Dec 15 18:49:27 2008 Return-Path: Delivered-To: freebsd-doc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82D951065670; Mon, 15 Dec 2008 18:49:27 +0000 (UTC) (envelope-from trhodes@FreeBSD.org) Received: from pittgoth.com (pittgoth.com [205.134.163.206]) by mx1.freebsd.org (Postfix) with ESMTP id 28E0A8FC16; Mon, 15 Dec 2008 18:49:27 +0000 (UTC) (envelope-from trhodes@FreeBSD.org) Received: from localhost.fbsdsecure.org (c-68-83-213-214.hsd1.va.comcast.net [68.83.213.214]) (authenticated bits=0) by pittgoth.com (8.14.3/8.14.3) with ESMTP id mBFInPde029193 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 15 Dec 2008 13:49:26 -0500 (EST) (envelope-from trhodes@FreeBSD.org) Date: Mon, 15 Dec 2008 13:49:19 -0500 From: Tom Rhodes To: Tom Rhodes Message-Id: <20081215134919.51a88d90.trhodes@FreeBSD.org> In-Reply-To: <20081215062858.6c76fb33.trhodes@FreeBSD.org> References: <1226494693.1809.10.camel@localhost> <491B4F01.9020403@gmail.com> <2a7894eb0811121605k1310bf8avf7a69363fc504905@mail.gmail.com> <20081112200755.66c52a48.trhodes@FreeBSD.org> <491C39E7.7040609@gmail.com> <20081113185333.25a73ebf.trhodes@FreeBSD.org> <2a7894eb0812132146w42722ce5n809cd5d0a9c451eb@mail.gmail.com> <20081214185058.48a7c2c2.trhodes@FreeBSD.org> <2a7894eb0812141832u20af4821h121a520fab746c7c@mail.gmail.com> <20081215062858.6c76fb33.trhodes@FreeBSD.org> X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i386-portbld-freebsd8.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: freebsd-doc@FreeBSD.org, murray@stokely.org Subject: Re: Preface need update. X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2008 18:49:27 -0000 On Mon, 15 Dec 2008 06:28:58 -0500 Tom Rhodes wrote: > On Sun, 14 Dec 2008 18:32:07 -0800 > "Murray Stokely" wrote: > > > On Sun, Dec 14, 2008 at 3:50 PM, Tom Rhodes wrote: > > > Thanks for that! I definitely slacked here, but I'll keep this > > > in mind for the future. About the updating chapter, I am unable > > > to find any information on portsnap in my printed copy of the > > > Handbook (third edition). They could have existed (I see a > > > 2006 commit date for freebsd-update in src) but seem to have > > > not been documented in the handbook. > > > > Ahh, I see, nothing was moved over from the Cutting Edge chapter. > > > > This chapter has just about the exact same purpose as the new Updating > > chapter, they just describe different tools. The first chapter > > Updating, even references the latter chapter (Cutting Edge) as a > > pre-requisite in the synopsis by saying one needs to read it to learn > > about Mergemaster. > > > > There should only be one updating chapter. Cutting Edge was there > > first, but updating is maybe a better name. > > > > How do you feel about merging them back into one chapter? > > > > > Anyway, how does this patch look to you?: > > > > Everything else looks good, except I don't like that we now have two > > chapters for updating instead of one. I wasn't paying attention when > > that happened. =) Maybe just submit the new item for auditing while > > we sort out what to do about updating? > > > > - Murray > > > > Works for me. Let me work over a patch today (I should have > enough time) and get it out. :) This patch merges both chapters in a way I thought worked out best. Could probably use a bit of text in the intro but I'm not 100% sure. http://people.freebsd.org/~trhodes/patches/cutting-edge.diff Though I do remember why I started another chapter though, primarily because cutting-edge came off to me as "using CURRENT and/or test versions" rather than stable with bug fixes. :) Thanks, -- Tom Rhodes