From 5c595b304cd78cbed9743e96b61c802019e4f4ab Mon Sep 17 00:00:00 2001
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sat, 5 Jul 2008 03:13:17 +0000
Subject: [PATCH] Update Question 18.3: - Unfold "SNAPs" and "RELEASEs" in the
 question - Update versions from 5-STABLE to 6-STABLE, 6-STABLE to 7-STABLE
 and   7-CURRENT to 8-CURRENT - Mark up -CURRENT with <emphasis> instead of
 <quote> - Yank date of forks

Reviewed by:  trhodes
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 08fe1b8d9b..db4bf56a05 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -10406,7 +10406,7 @@ hint.sio.7.irq="12"</programlisting>
 
       <qandaentry>
         <question id="define-snap-release">
-          <para>What are SNAPs and RELEASEs?</para>
+          <para>What are snapshots and releases?</para>
         </question>
 
         <answer>
@@ -10419,19 +10419,19 @@ hint.sio.7.irq="12"</programlisting>
 
             <itemizedlist>
               <listitem>
-                <para><literal>RELENG_5</literal>     AKA
-                  <emphasis>5-STABLE</emphasis></para>
+                <para><literal>RELENG_6</literal>     AKA
+                  <emphasis>6-STABLE</emphasis></para>
               </listitem>
 
               <listitem>
-                <para><literal>RELENG_6</literal>      AKA
-                  <emphasis>6-STABLE</emphasis></para>
+                <para><literal>RELENG_7</literal>      AKA
+                  <emphasis>7-STABLE</emphasis></para>
               </listitem>
 
               <listitem>
                 <para><literal>HEAD</literal>         AKA
                   <emphasis>-CURRENT</emphasis>  AKA
-                  <emphasis>7.X-CURRENT</emphasis></para>
+                  <emphasis>8-CURRENT</emphasis></para>
               </listitem>
 
             </itemizedlist>
@@ -10440,15 +10440,15 @@ hint.sio.7.irq="12"</programlisting>
             like the other two; it is simply a symbolic constant for
             <quote><emphasis>the current, non-branched development
             stream</emphasis></quote> which we simply refer to as
-            <quote>-CURRENT</quote>.</para>
+            <emphasis>-CURRENT</emphasis>.</para>
 
-          <para>Right now, <quote>-CURRENT</quote> is the 7.X development
-            stream; the <literal>5-STABLE</literal> branch,
-            <symbol>RELENG_5</symbol>, forked off from
-            <quote>-CURRENT</quote> in October 2004, and
-            the <literal>6-STABLE</literal> branch,
+          <para>Right now, <emphasis>-CURRENT</emphasis> is the 8.<replaceable>X</replaceable> development
+            stream; the <literal>6-STABLE</literal> branch,
             <symbol>RELENG_6</symbol>, forked off from
-            <quote>-CURRENT</quote> in November 2005.</para>
+            <emphasis>-CURRENT</emphasis> in November 2005, and
+            the <literal>7-STABLE</literal> branch,
+            <symbol>RELENG_7</symbol>, forked off from
+            <emphasis>-CURRENT</emphasis> in February 2008.</para>
         </answer>
       </qandaentry>