From fdccb80d6d54dedecdaa5d90ae6c3f0ad8a4c9fb Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 8 Nov 2004 06:44:16 +0000
Subject: [PATCH] Now that the release date is here, re-add the adjustments
 from 1.658.

---
 en_US.ISO8859-1/books/faq/book.sgml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 43936e349d..f702f4e2fb 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -292,10 +292,9 @@
 	    before any releases are made from the
 	    <emphasis>6-CURRENT</emphasis> branch.</para>
 
-<!-- at 5.3-RELEASE, s/will be/has been/ -->
 	  <para>Up until the release of 5.3, the 4.X series was the
 	    one known as <emphasis>-STABLE</emphasis>.  However,
-	    as of 5.3, 5.X will be designated the new
+	    as of 5.3, 5.X has been designated the new
 	    <emphasis>-STABLE</emphasis> and 4.X will no longer see
 	    much new development.  Instead, it will be designated
 	    for an &quot;extended support&quot; status and receive
@@ -448,13 +447,10 @@
 	    for some time but focus primarily on security-related bug
 	    fixes and other serious issues.</para>
 
-<!-- temporarily commented out until 5.3R is released -->
-<!--
           <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
             &rel2.current.date;.</para>
--->
 
           <para>The 6-CURRENT branch is the actively developed
 	    -CURRENT branch toward the next generation of &os;.
@@ -541,9 +537,8 @@
                 developers.</para>
             </listitem>
 
-<!-- change -CURRENT to -STABLE on 5.3R -->
             <listitem>
-              <para>The latest 5-CURRENT release, &rel2.current;-RELEASE can be
+              <para>The latest 5-STABLE release, &rel2.current;-RELEASE can be
                 found in the <ulink
                 url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;-RELEASE directory</ulink>.</para>
             </listitem>