More fixes to reflect the creation of 5-STABLE. Note: the entity

definitions for the releases are slightly out of date; I have fixed
the text so that the text is correct for now.

en_US.ISO8859-1/books/faq/book.sgml

@@ -288,9 +288,10 @@
 	    two of the three branches.  The 4.X series of releases
 	    is being made from the <emphasis>4-STABLE</emphasis> branch
 	    and the 5.X series of releases is being made from
-	    <emphasis>5-STABLE</emphasis>.  It will be some time yet
+	    <emphasis>5-STABLE</emphasis>.  It will be some time in
-	    before any releases are made from the
+	    mid-to-late 2005 before the first release will be made from the
-	    <emphasis>6-CURRENT</emphasis> branch.</para>
+	    <emphasis>6-CURRENT</emphasis> branch; that release (6.0)
+	    will be aimed at early adopters.</para>
 
 	  <para>Up until the release of 5.3, the 4.X series was the
 	    one known as <emphasis>-STABLE</emphasis>.  However,
@@ -301,14 +302,15 @@
 	    only fixes for major problems (such as security-related
 	    fixes.)</para>
 
+<!-- note: the entity definitions are out of date -->
           <para>Version <ulink
             url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;</ulink>
             is the latest release from the
-            <emphasis>-CURRENT</emphasis> branch; it was released in
+            <emphasis>5-STABLE</emphasis> branch; it was released in
             &rel.current.date;.  Version <ulink
             url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;</ulink>
             is the latest release from the
-            <emphasis>-STABLE</emphasis> branch; it was released in
+            <emphasis>4-STABLE</emphasis> branch; it was released in
             &rel2.current.date;.</para>
 
           <para>Briefly, <emphasis>-STABLE</emphasis> is aimed at the
@@ -449,8 +451,8 @@
 
           <para>5-STABLE is the actively developed -STABLE branch.
             The latest release on the 5-STABLE branch is
-            &rel2.current;-RELEASE, which was released in
+            &rel.current;-RELEASE, which was released in
-            &rel2.current.date;.</para>
+            &rel.current.date;.</para>
 
           <para>The 6-CURRENT branch is the actively developed
 	    -CURRENT branch toward the next generation of &os;.
@@ -1248,7 +1250,7 @@ File: +DESC (ignored)</screen>
             PC, with 5 MB or more of RAM
             and at least 60 MB of hard disk space. It can run with a low
             end MDA graphics card but to run X11R6, a VGA or better video
-            card is needed.  For &os; 5.X you will need a 486 or better
+            card is needed.  For &os; 5.X and later you will need a 486 or better
             PC, with 8 MB or more of RAM and at least 150 MB of hard disk
             space.</para>
 
@@ -1265,7 +1267,7 @@ File: +DESC (ignored)</screen>
         <answer>
           <para>FreeBSD 2.1.7 was the last version of FreeBSD that
             could be installed on a 4MB system.  FreeBSD 2.2 and later
-            needs at least 5MB, and &os; 5.X needs at least 8MB to
+            needs at least 5MB, and &os; 5.X and later need at least 8MB to
             install on a new system.</para>
 
           <para>All versions of FreeBSD prior to 5.X will <emphasis>run</emphasis>
@@ -1899,7 +1901,7 @@ sectors/track: 63</screen>
             configuration methods. In 4.X and earlier, when at the FreeBSD boot prompt (boot:),
             use the <option>-c</option> flag and you will be dropped into a
             visual configuration screen which allows you to configure the
-            kernel's settings for most common ISA cards.  In &os; 5.X
+            kernel's settings for most common ISA cards.  In &os; 5.X and later
             this has been replaced by much more flexible "hints" which
             can be set from the loader prompt.</para>