From f02d45fdf628ab8ea67f14d5730341f63a910dc2 Mon Sep 17 00:00:00 2001
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sat, 21 Jun 2008 07:40:10 +0000
Subject: [PATCH] Update Question 10.22: - Mark up different version types with
 <emphasis> - Use <replaceable> as needed - Update version numbers

Reviewed by:  trhodes, danger
Approved by:  gabor
---
 en_US.ISO8859-1/books/faq/book.sgml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 88eb0dc0ca..4a08dfb5ea 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -6299,24 +6299,24 @@ options    SYSVMSG          # enable for messaging</programlisting>
 
       <qandaentry>
         <question id="release-candidate">
-          <para>I tried to update my system to the latest -STABLE, but
-            got -BETAx, -RC or -PRERELEASE!  What is going on?</para>
+          <para>I tried to update my system to the latest <emphasis>-STABLE</emphasis>, but
+            got <emphasis>-BETA<replaceable>x</replaceable></emphasis>, <emphasis>-RC</emphasis> or <emphasis>-PRERELEASE</emphasis>!  What is going on?</para>
         </question>
 
         <answer>
-          <para>Short answer: it is just a name.  RC stands for
+          <para>Short answer: it is just a name.  <emphasis>RC</emphasis> stands for
             <quote>Release Candidate</quote>.  It signifies that a
-            release is imminent.  In FreeBSD, -PRERELEASE is typically
+            release is imminent.  In FreeBSD, <emphasis>-PRERELEASE</emphasis> is typically
             synonymous with the code freeze before a release.  (For
-            some releases, the -BETA label was used in the same way as
-            -PRERELEASE.)</para>
+            some releases, the <emphasis>-BETA</emphasis> label was used in the same way as
+            <emphasis>-PRERELEASE</emphasis>.)</para>
 
           <para>Long answer: FreeBSD derives its releases from one of
             two places.  Major, dot-zero, releases, such as
-            4.0-RELEASE and 5.0-RELEASE, are branched from the head of
+            6.0-RELEASE and 7.0-RELEASE, are branched from the head of
             the development stream, commonly referred to as <link
             linkend="current">-CURRENT</link>.  Minor releases, such
-            as 4.1-RELEASE or 5.2-RELEASE, have been snapshots of the
+            as 6.3-RELEASE or 5.2-RELEASE, have been snapshots of the
             active <link linkend="stable">-STABLE</link> branch.
             Starting with 4.3-RELEASE, each release also now has its
             own branch which can be tracked by people requiring an
@@ -6328,17 +6328,17 @@ options    SYSVMSG          # enable for messaging</programlisting>
             process.  Part of this process is a code freeze.  When a
             code freeze is initiated, the name of the branch is
             changed to reflect that it is about to become a release.
-            For example, if the branch used to be called 4.5-STABLE,
-            its name will be changed to 4.6-PRERELEASE to signify the
+            For example, if the branch used to be called 6.2-STABLE,
+            its name will be changed to 6.3-PRERELEASE to signify the
             code freeze and signify that extra pre-release testing
             should be happening.  Bug fixes can still be committed to
             be part of the release.  When the source code is in shape
-            for the release the name will be changed to 4.6-RC to
+            for the release the name will be changed to 6.3-RC to
             signify that a release is about to be made from it.  Once
             in the RC stage, only the most critical bugs found can be
-            fixed.  Once the release (4.6-RELEASE in this example) and
+            fixed.  Once the release (6.3-RELEASE in this example) and
             release branch have been made, the branch will be renamed
-            to 4.6-STABLE.</para>
+            to 6.3-STABLE.</para>
 
           <para>For more information on version numbers and the
             various CVS branches, refer to the