From owner-freebsd-doc@FreeBSD.ORG Sat Feb 2 09:08:38 2013 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C4357EC4 for ; Sat, 2 Feb 2013 09:08:38 +0000 (UTC) (envelope-from utisoft@gmail.com) Received: from mail-ia0-x234.google.com (ia-in-x0234.1e100.net [IPv6:2607:f8b0:4001:c02::234]) by mx1.freebsd.org (Postfix) with ESMTP id 68229732 for ; Sat, 2 Feb 2013 09:08:38 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f27so6485671iae.11 for ; Sat, 02 Feb 2013 01:08:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=MGbYi2Dke8R+TdS/PhI8mpZ+MfF82qXdSCA0px1JWDk=; b=AmeO/9qMItA2wpMmQIyIXhh2/bt6QgXXQZR4DNythGaejCWk2DsbUNvWS4kPEL9umB WISEugRGBQAfSNVxoCMZmUi18loVqLRi+d6ut7YDXFXntkfhtnIelPPU3/V+mLRwf4fz yrKw4f/x9DXmFuwl/5cMH+KaTJfyXHHMZl81IQyXarxxUEDZCo+jkwk0ycwtoK/gQLCt zuILWi9o3vePYBc6HWaQxeJzN7GmTRNGc2TYRW4gx6aNchdNQ/gJkP3JGEzdkRpMWYZm 9i4VMicgRrdCRRUzHi/44KhGDoVOlX8UPqByNzCf8Cv90i6RTqcjqHf+tYLhpNKuGaSP 8Nlg== MIME-Version: 1.0 X-Received: by 10.42.27.74 with SMTP id i10mr11334084icc.47.1359796118107; Sat, 02 Feb 2013 01:08:38 -0800 (PST) Received: by 10.64.16.73 with HTTP; Sat, 2 Feb 2013 01:08:37 -0800 (PST) Received: by 10.64.16.73 with HTTP; Sat, 2 Feb 2013 01:08:37 -0800 (PST) In-Reply-To: References: Date: Sat, 2 Feb 2013 09:08:37 +0000 Message-ID: Subject: Re: From: Chris Rees To: Eitan Adler Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: freebsd-doc@freebsd.org X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 09:08:38 -0000 On 2 Feb 2013 05:09, "Eitan Adler" wrote: > > Can I please get some review of this patch? In particular can someone > comment on the changes to the description of -STABLE. I am almost > certain the description is wrong, but can't seem to find any better > documentation on this. > > commit 2178bfca1c982f85791375bd208156d071553429 > Author: Eitan Adler > Date: Sat Feb 2 00:05:48 2013 -0500 > > Update and modernize the version numbers used in the FAQ examples. > Remove references to 7.x (which is EOL in less than a month). > > diff --git a/en_US.ISO8859-1/books/faq/book.xml > b/en_US.ISO8859-1/books/faq/book.xml > index abf7d5a..47bc922 100644 > --- a/en_US.ISO8859-1/books/faq/book.xml > +++ b/en_US.ISO8859-1/books/faq/book.xml > @@ -18,18 +18,12 @@ > RELENG_8"> > > > - > -X"> > -7-STABLE"> > -RELENG_7"> > - > - > ]> > > > > Frequently Asked Questions for &os; > - &rel3.relx;, &rel2.relx;, and &rel.relx; > + &rel2.relx;, and &rel.relx; > > The &os; Documentation Project > > @@ -80,10 +74,8 @@ > > > This is the FAQ for &os; versions > - &rel3.relx;, &rel2.relx; and &rel.relx;. > - All entries are assumed to be > - relevant to &os; &rel3.relx; and later, > - unless otherwise noted. If you are interested in helping with > + &rel2.relx; and &rel.relx;. > + If you are interested in helping with > this project, send email to the &a.doc;. The latest version of > this document is always available from the url=" http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">&os; > website. > @@ -100,7 +92,7 @@ > Introduction > > Welcome to the &os; > - &rel3.relx; -, &rel2.relx; - and &rel.relx; - > + &rel2.relx; - and &rel.relx; - > FAQ! > > As is usual with Usenet FAQs, this document aims to cover the > @@ -354,14 +346,14 @@ > made from the &rel.stable; branch, and &rel2.relx; > releases are made from the &rel2.stable; branch. > > - Up until the release of 8.0, the > - &rel3.relx; series was the one known as > - -STABLE. However, as of 8.0, the > - &rel3.relx; branch will be designated for > + Up until the release of 9.0, the Why not use rel3.stable;.0 instead of hardcoding 8.x and likewise for 9? > + 8.x series was the one known as > + -STABLE. However, as of 10.0, the > + 8.x branch will be designated for > an extended support status and receive only > fixes for major problems, such as security-related fixes. > There will be no more releases made from the > - &rel3.stable; branch, and it is considered a > + &rel2.stable; branch, and it is considered a > legacy branch and most current work will only > become a part of &rel.stable; and &rel2.stable;. > > @@ -2730,7 +2722,7 @@ kern.timecounter.hardware: TSC -> i8254 > periodic updates on new entries. > > Most ports should work on the > - &rel3.relx;, &rel2.relx;, and &rel.relx; branches. > + &rel2.relx;, and &rel.relx; branches. > Each time a &os; > release is made, a snapshot of the ports tree at the time of > release in also included in the class="directory">ports/ > @@ -2755,15 +2747,6 @@ kern.timecounter.hardware: TSC -> i8254 > > > > - for &rel3.relx; -RELEASE/&rel3.stable; > - > - > - - url=" ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;/"> ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages; > - > - > - > - > for &rel2.relx; -RELEASE/&rel2.stable; > > > @@ -2836,7 +2819,7 @@ kern.timecounter.hardware: TSC -> i8254 > > > Why can I not build this port on my > - &rel3.relx; -, &rel2.relx; -, or > + &rel2.relx; -, or > &rel.relx; -STABLE machine? > > > @@ -4723,8 +4706,8 @@ options SYSVMSG # enable for > messaging > the same way as -PRERELEASE.) > > Long answer: &os; derives its releases from one of two > - places. Major, dot-zero, releases, such as 7.0-RELEASE and > - 8.0-RELEASE, are branched from the head of the development > + places. Major, dot-zero, releases, such as 9.0-RELEASE > + are branched from the head of the development > stream, commonly referred to as linkend="current">-CURRENT. Minor releases, such as > 6.3-RELEASE or 5.2-RELEASE, have been snapshots of the > @@ -8266,11 +8249,6 @@ hint.sio.7.irq="12" > > > > - &rel3.releng; AKA > - &rel3.stable; > - > - > - > &rel2.releng; AKA > &rel2.stable; > > > > -- > Eitan Adler > _______________________________________________ > freebsd-doc@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-doc > To unsubscribe, send any mail to "freebsd-doc-unsubscribe@freebsd.org" >