docs/52679: [patch] FAQ is out of date with regards to 5.X releases

[Simon L.Nielsen]

>Number:         52679
>Category:       docs
>Synopsis:       [patch] FAQ is out of date with regards to 5.X releases
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 25 15:40:03 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Simon L. Nielsen
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
>Description:
The FAQ is out of date with regards to 5.X and is confused by the two
release (5.0, 4.8) and somewhat out of date.

Main issue :
"The latest release on the 4-STABLE is 5.0-RELEASE, which was released
in January 2003."

The patch also tries to make description of the 5.X future (and
present) more accurate... It still still not perfect, but better than
the current state.

Also update the FreeBSD history ASCII chart to reflect reality a bit
better... again not perfect, but better han the current state (IMHO).

Change links to hardware notes to point to 4.8 hardware and not 5.0
notes since I think those are the ones people should be most
interested in.
>How-To-Repeat:
>Fix:
--- doc-faq-cur-stable.patch begins here ---
Index: book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v
retrieving revision 1.538
diff -u -d -r1.538 book.sgml
--- book.sgml	13 May 2003 19:15:26 -0000	1.538
+++ book.sgml	25 May 2003 22:22:30 -0000
@@ -323,7 +323,8 @@
           <para><ulink
             URL="../handbook/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink>
             is the development version of the operating system, which
-            will in due course become 5.0-RELEASE.  As such, it is
+            will in due course, become the new &os.stable; branch.
+            This is expected to happen around 5.2-RELEASE.  As such, it is
             really only of interest to developers working on the
             system and die-hard hobbyists.  See the <ulink
             URL="../handbook/cutting-edge.html#CURRENT">relevant
@@ -412,8 +413,10 @@
             experimental features are quite undesirable.  It receives
             only well-tested bug fixes and other small incremental
             enhancements.  FreeBSD-CURRENT, on the other hand, has
-            been one unbroken line leading towards 5.0-RELEASE (and
-            beyond) since 2.0 was released. If a little ASCII art
+            since 2.0 was released, been one unbroken line leading
+            towards 5.2-RELEASE (and beyond), where 5.X-STABLE is
+            expected to be branched off, and &os.current; becomes
+            6-CURRENT.  If a little ASCII art
             would help, this is how it looks:</para>
 
           <programlisting>                 2.0
@@ -439,9 +442,11 @@
                   |                     (May 1999) (Sep 1999) (Dec 1999) (June 2000) (July 2000)
                   |
                   |  [4.0-STABLE]
- *BRANCH*        4.0  (Mar 2000) -> 4.1 -> 4.1.1 -> 4.2 -> 4.3 -> 4.4 -> ... future 4.X releases ...
+ *BRANCH*        4.0  (Mar 2000) -> 4.1 -> 4.1.1 -> 4.2 -> 4.3 -> 4.4 -> 4.5 -> 4.6 -> 4.6.2 -> 4.7 -> 4.8 ... future 4.X releases ...
+                  |              (Jul 2000) (Sep 2000) (Nov 2000) (Apr 2001) (Sep 2001) (Jan 2002) (Jun 2002) (Aug 2002) (Oct 2002) (Apr 2003)
+                  |
+               5.0-RELEASE (Jan 2003)
                   |
-                  |              (July 2000)   (Sep 2000)   (Nov 2000)
                  \|/
                   +
           [5.0-CURRENT continues]</programlisting>
@@ -454,11 +459,11 @@
 
           <para>4-STABLE is the actively developed -STABLE branch.
             The latest release on the 4-STABLE is
-            &rel.current;-RELEASE, which was released in
-            &rel.current.date;.</para>
+            &rel2.current;-RELEASE, which was released in
+            &rel2.current.date;.</para>
 
           <para>The 5-CURRENT branch is slowly progressing toward
-            5.0-RELEASE and beyond.  See <link linkend="current">What
+            5.1-RELEASE and beyond.  See <link linkend="current">What
             is FreeBSD-CURRENT?</link> for more information on this
             branch.</para>
         </answer>
@@ -2267,7 +2272,7 @@
             lists.  Since hardware changes so quickly, however, we
             expect this.  We <emphasis>still</emphasis> strongly
             recommend that you read through the 
-	    <ulink URL="&rel.current.hardware;">Hardware Notes</ulink>
+	    <ulink URL="&rel2.current.hardware;">Hardware Notes</ulink>
 	    and search the mailing list
             <ulink URL="http://www.FreeBSD.org/search/#mailinglists">
             archives</ulink> before asking about the latest and
@@ -2305,7 +2310,7 @@
 
         <answer>
           <para>See the complete list in the current <ulink
-            URL="&rel.current.hardware;">Hardware Notes</ulink>.</para>
+            URL="&rel2.current.hardware;">Hardware Notes</ulink>.</para>
         </answer>
       </qandaentry>
 
--- doc-faq-cur-stable.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: