From 38e714f5904fe2b935890e81d1e5b39f5b8b1990 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@FreeBSD.org>
Date: Sun, 29 Jun 2003 15:48:46 +0000
Subject: [PATCH] Note the difference between branch and release tags, and
 wordsmith the text to make it clear that branch tags are only used on the
 src/ tree.

---
 .../books/handbook/mirrors/chapter.sgml       | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 86f2715b4a..19e016df31 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -4205,18 +4205,24 @@ doc/zh_TW.Big5</screen>
     <para>When obtaining or updating sources from
       <application>cvs</application> and
       <application>CVSup</application> a revision tag (reference to a
-      date in time) must be specified.  The following tags are
-      available, each specifying different branches of FreeBSD at
-      different points of time:</para>
+      date in time) must be specified.</para>
 
-    <note>
-      <para>The ports tree does not have any tag associated with it,
-	it is always CURRENT.</para>
-    </note>
+    <para>A revision tag refers to either a particular line of FreeBSD
+      development, or a specific point in time.  The first type are called
+      <quote>branch tags</quote>, the second type are called <quote>release
+	tags</quote>.</para>
 
-    <para>The most common tags are:</para>
+    <sect2>
+      <title>Branch tags</title>
+
+      <para>All of these, with the exception of <literal>HEAD</literal> (which
+	is always a valid tag), only apply to the <filename>src/</filename>
+	tree.  The <filename>ports/</filename>, <filename>doc/</filename>, and
+	<filename>www/</filename> trees are not branched.</para>
 
     <variablelist>
+      <title>Branch tags</title>
+      
       <varlistentry>
 	<term>HEAD</term>
 
@@ -4336,8 +4342,15 @@ doc/zh_TW.Big5</screen>
 	    as 2.2-STABLE.  This branch is mostly obsolete.</para>
 	</listitem>
     </variablelist>
+    </sect2>
 
-    <para>Other revision tags that are available include:</para>
+    <sect2>
+      <title>Release tags</title>
+
+      <para>These tags correspond to the FreeBSD <filename>src/</filename>
+	tree (and <filename>ports/</filename>, <filename>doc/</filename>, and
+	<filename>www/</filename> trees at a specific point in time, when a
+	particular version of FreeBSD was released.</para>
 
     <variablelist>
       <varlistentry>
@@ -4556,6 +4569,7 @@ doc/zh_TW.Big5</screen>
 	</listitem>
       </varlistentry>
     </variablelist>
+    </sect2>
   </sect1>
 
   <sect1 id="mirrors-afs">