From eogren@rod.darktech.org  Wed Jul 26 23:25:25 2000
Return-Path: <eogren@rod.darktech.org>
Received: from penguin.prod.itd.earthlink.net (penguin.prod.itd.earthlink.net [207.217.120.134])
	by hub.freebsd.org (Postfix) with ESMTP id DAA6337B98B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Jul 2000 23:24:50 -0700 (PDT)
	(envelope-from eogren@rod.darktech.org)
Received: from rod.darktech.org (ip36.cambridge2.ma.pub-ip.psi.net [38.32.112.36])
	by penguin.prod.itd.earthlink.net (8.9.3-EL_1_3/8.9.3) with ESMTP id XAA01781
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Jul 2000 23:24:45 -0700 (PDT)
Received: (from eogren@localhost)
	by rod.darktech.org (8.10.1/8.9.3) id e6R6OPI00457;
	Thu, 27 Jul 2000 02:24:25 -0400 (EDT)
	(envelope-from eogren)
Message-Id: <200007270624.e6R6OPI00457@rod.darktech.org>
Date: Thu, 27 Jul 2000 02:24:25 -0400 (EDT)
From: eogren@earthlink.net
Sender: eogren@rod.darktech.org
Reply-To: eogren@earthlink.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] Update of FAQ to 4.1 
X-Send-Pr-Version: 3.2

>Number:         20209
>Category:       docs
>Synopsis:       Update of FAQ to 4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 26 23:30:00 PDT 2000
>Closed-Date:    Fri Aug 4 13:57:35 PDT 2000
>Last-Modified:  Fri Aug 04 13:58:03 PDT 2000
>Originator:     Eric Ogren
>Release:        FreeBSD 4.1-RC i386
>Organization:
>Environment:

Updated doc repository.

>Description:

 The FAQ has a couple of entries about 4.0 being the latest release on
the 4-STABLE branch. Since 4.1 is hitting the FTP sites very soon (if it
hasn't already), these should probably be updated to 4.1.
 This patch also slightly rewords a couple of sentences in the big ASCII
tree in the Preface.

>How-To-Repeat:

n/a

>Fix:

Index: book.sgml
===================================================================
RCS file: /usr/local/doctree/doc/en_US.ISO_8859-1/books/faq/book.sgml,v
retrieving revision 1.80
diff -u -r1.80 book.sgml
--- book.sgml	2000/07/25 18:24:48	1.80
+++ book.sgml	2000/07/27 06:19:25
@@ -154,9 +154,9 @@
 
 	<answer>
 	  <para>Version <ulink
-	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.0-RELEASE/">4.0</ulink>
+	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/">4.0</ulink>
 	    is the latest <emphasis>stable</emphasis> version; it was
-	    released in March, 2000. This is also the latest
+	    released in July, 2000. This is also the latest
 	    <emphasis>release</emphasis> version.</para>
 
 	  <para>Briefly explained, <emphasis>-STABLE</emphasis> is aimed
@@ -300,23 +300,26 @@
                3.0-RELEASE (Oct 1998)
                   |
                   |  [3.0-STABLE]
- *BRANCH*      3.1-RELESE  (Feb 1999) -&gt; 3.2 -&gt; 3.3 -&gt; 3.4 -&gt; ... future 3.x releases ...
+ *BRANCH*      3.1-RELEASE  (Feb 1999) -&gt; 3.2 -&gt; 3.3 -&gt; 3.4 -&gt; ... future 3.x releases ...
                   |                     (May 1999) (Sep 1999) (Dec 1999)
                   |
                   |  [4.0-STABLE]
- *BRANCH*        4.0  (Mar 2000) -&gt; ... future 4.x releases ...
+ *BRANCH*        4.0  (Mar 2000) -&gt; 4.1 -&gt; ... future 4.x releases ...
                   |
-                  |
+                  |              (Jul 2000)
                  \|/
                   +
           [5.0-CURRENT continues]</literallayout>
 
 	  <para>The -CURRENT branch is slowly progressing towards 5.0 and
 	    beyond, the previous 2.2-STABLE branch having been retired
-	    with the release of 2.2.8.  3.4-STABLE has now replaced it,
+	    with the release of 2.2.8.  3-STABLE replaced it,
 	    with 3.4-RELEASE being released in mid-December 1999.
-	    4.0-RELEASE was released in March 2000. Although 4-STABLE
-	    is the actively developed -STABLE branch, bugfixes are
+	    In May 2000, the 3-STABLE branch was more or less replaced
+	    by the 4-STABLE branch.
+	    4.1-RELEASE was released in July 2000.  4-STABLE
+	    is the actively developed -STABLE branch, although some
+	    bugfixes (mostly security-related) are
 	    still being committed to 3-STABLE. It is expected that the 
 	    3.X branch will be officially obsoleted some time in
 	    summer 2000.
@@ -408,9 +411,9 @@
 	    </listitem>
 
 	    <listitem>
-	      <para>The current 4.X-STABLE release, 4.0-RELEASE can be
+	      <para>The current 4.X-STABLE release, 4.1-RELEASE can be
 	      found in the <ulink
-	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.0-RELEASE/"> the 4.0-RELEASE</ulink> directory.</para>
+	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/"> the 4.1-RELEASE</ulink> directory.</para>
 	      </listitem>
 
 	    <listitem>
@@ -2458,7 +2461,7 @@
       </literallayout>
 </para>
 
-<para>In FreeBSD 4.0-CURRENT or later, the line should be:</para>
+<para>In FreeBSD 4.0 or later, the line should be:</para>
 
 <para>
 <literallayout>        device psm0 at atkbdc? irq 12
@@ -3834,7 +3837,7 @@
 <link linkend="mailing">mailing list</link> for periodic updates on new
 entries.</para>
 
-<para>Most ports should be available for the 2.2, 3.x and 4.0
+<para>Most ports should be available for the 2.2, 3.x and 4.x
 branches, and many of them should work on 2.1.x systems as
 well.  Each time a FreeBSD release is made, a snapshot of the
 ports tree at the time of release in also included in the
@@ -3877,7 +3880,7 @@
 </listitem>
 </varlistentry>
 
-<varlistentry><term>for 4.0-RELEASE/4.X-STABLE</term>
+<varlistentry><term>for 4.1-RELEASE/4.X-STABLE</term>
 
 <listitem>
 <para><ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/</ulink></para>

>Release-Note:
>Audit-Trail:

From: Udo Erdelhoff <ue@nathan.ruhr.de>
To: eogren@earthlink.net
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: docs/20209: [PATCH] Update of FAQ to 4.1
Date: Thu, 27 Jul 2000 20:18:39 +0200

 On Thu, Jul 27, 2000 at 02:24:25AM -0400, eogren@earthlink.net wrote:
 Some comments:
 
 > Index: book.sgml
 > ===================================================================
 > RCS file: /usr/local/doctree/doc/en_US.ISO_8859-1/books/faq/book.sgml,v
 > retrieving revision 1.80
 > diff -u -r1.80 book.sgml
 > --- book.sgml	2000/07/25 18:24:48	1.80
 > +++ book.sgml	2000/07/27 06:19:25
 > @@ -154,9 +154,9 @@
 > -	    URL="ftp://[...]/releases/i386/4.0-RELEASE/">4.0</ulink>
 > +	    URL="ftp://[...]/releases/i386/4.1-RELEASE/">4.0</ulink>
                                            ^^^           ^^^
 You may want to use 1,$s/4\.0/4.1/g next time ;-)
 
 > @@ -300,23 +300,26 @@
 >                 3.0-RELEASE (Oct 1998)
 >                    |
 >                    |  [3.0-STABLE]
 > - *BRANCH*      3.1-RELESE  (Feb 1999) -&gt; 3.2 -&gt; 3.3 -&gt; 3.4 -&gt; ... future 3.x releases ...
 > + *BRANCH*      3.1-RELEASE  (Feb 1999) -&gt; 3.2 -&gt; 3.3 -&gt; 3.4 -&gt; ... future 3.x releases ...
 >                    |                     (May 1999) (Sep 1999) (Dec 1999)
 You may want to add 3.5-RELEASE (June 2000)
 
 > -	    with the release of 2.2.8.  3.4-STABLE has now replaced it,
 > +	    with the release of 2.2.8.  3-STABLE replaced it,
 >  	    with 3.4-RELEASE being released in mid-December 1999.
 "with 3.5-RELEASE having been released in June 2000"
 
 > @@ -408,9 +411,9 @@
 > -	      <para>The current 4.X-STABLE release, 4.0-RELEASE can be
 > +	      <para>The current 4.X-STABLE release, 4.1-RELEASE can be
 I would prefer to use 4-STABLE instead of 4.X-STABLE. There's only one
 CVS Branch for the variouses 4.X-Releases.
 
 >  	      found in the <ulink
 > -	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.0-RELEASE/"> the 4.0-RELEASE</ulink> directory.</para>
 > +	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/"> the 4.1-RELEASE</ulink> directory.</para>
 will result in "... found in the <the 4.1-RELEASE> directory." (link part
 denoted by <>)
 
 One of the two "the" can be removed and the word directory should be a part
 of the link, too. In other words, use 
 
 found in <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/"the 4.1-RELEASE directory</ulink>.</para>
 
 and get 
 "...found in <the 4.1-RELEASE directory>"
 
 > @@ -3877,7 +3880,7 @@
 >  </listitem>
 >  </varlistentry>
 >  
 > -<varlistentry><term>for 4.0-RELEASE/4.X-STABLE</term>
 > +<varlistentry><term>for 4.1-RELEASE/4.X-STABLE</term>
 Again, I'd prefer to use 4-STABLE instead of 4.X-STABLE.
 
 /s/Udo
 -- 
 "I say we take off and nuke the site from orbit - it's the only way
 to be sure." (Aliens II)
 
State-Changed-From-To: open->closed 
State-Changed-By: jim 
State-Changed-When: Fri Aug 4 13:57:35 PDT 2000 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=20209 
>Unformatted:
