Move the discussion about CVSup out of the cutting-edge chapter and into

the "Obtaining FreeBSD" appendix.

This is a straight cut-n-paste of the affected information.  However, in
its original location it was "<sect 2>", now it's "<sect1>", so all the
sectional elements have to upgraded by one.

A few references to "cvsup" as a link target were updated to "mirrors-cvsup"
as well.

Still based on work submitted by Eric Ogren, just broken down a little more.

1 files changed, 1357 insertions, 3 deletions

diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index ba23a92b5c..cd2c1e00e4 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml,v 1.66 2000/05/02 07:49:36 joe Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml,v 1.67 2000/06/07 23:13:34 nik Exp $
 -->
 
 <appendix id="mirrors">
@@ -1253,9 +1253,1362 @@
   </sect2></sect1>
 
   <sect1 id="mirrors-cvsup">
+    <title>Using CVSup</title>
+    
+    <sect2 id="cvsup-intro">
+      <title>Introduction</title>
+      
+      <para><application>CVSup</application> is a software package for
+	distributing and updating source trees from a master CVS
+	repository on a remote server host.  The FreeBSD sources are
+	maintained in a CVS repository on a central development machine
+	in California.  With <application>CVSup</application>, FreeBSD
+	users can easily keep their own source trees up to date.</para>
+      
+      <para><application>CVSup</application> uses the so-called
+	<emphasis>pull</emphasis> model of updating.  Under the pull
+	model, each client asks the server for updates, if and when they
+	are wanted.  The server waits passively for update requests from
+	its clients.  Thus all updates are instigated by the client.
+	The server never sends unsolicited updates.  Users must either
+	run the <application>CVSup</application> client manually to get
+	an update, or they must set up a <command>cron</command> job to
+	run it automatically on a regular basis.</para>
+      
+      <para>The term <application>CVSup</application>, capitalized just
+	so, refers to the entire software package.  Its main components
+	are the client <command>cvsup</command> which runs on each
+	user's machine, and the server <command>cvsupd</command> which
+	runs at each of the FreeBSD mirror sites.</para>
+
+      <para>As you read the FreeBSD documentation and mailing lists, you
+	may see references to <application>sup</application>.
+	<application>Sup</application> was the predecessor of
+	<application>CVSup</application>, and it served a similar
+	purpose.<application>CVSup</application> is in used in much the
+	same way as sup and, in fact, uses configuration files which are
+	backward-compatible with <command>sup</command>'s.
+	<application>Sup</application> is no longer used in the FreeBSD
+	project, because <application>CVSup</application> is both faster
+	and more flexible.</para>
+    </sect2>
+
+    <sect2 id="cvsup-install">
+      <title>Installation</title>
+      
+      <para>The easiest way to install <application>CVSup</application>
+	is to use the <filename>net/cvsup-bin</filename> port
+	from the FreeBSD <link linkend="ports">ports collection</link>.
+	If you prefer to build <application>CVSup</application> from
+	source, you can use the <filename>net/cvsup</filename>
+	port instead.  But be forewarned: the
+	<filename>net/cvsup</filename> port depends on the Modula-3
+	system, which takes a substantial amount of time, memory, and
+	disk space to build.</para>
+      
+      <para>If you do not know anything about cvsup at all and want a
+	single package which will install it, set up the configuration
+	file and start the transfer via a pointy-clicky type of
+	interface, then get the <ulink
+	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz">cvsupit</ulink>
+	package.  Just hand it to &man.pkg.add.1; and it will lead you
+	through the configuration process in a menu-oriented
+	fashion.</para>
+    </sect2>
+
+    <sect2 id="cvsup-config">
+      <title>CVSup Configuration</title>
+      
+      <para><application>CVSup</application>'s operation is controlled
+	by a configuration file called the <filename>supfile</filename>.
+	There are some sample <filename>supfiles</filename> in the
+	directory <ulink
+	  url="file:/usr/share/examples/cvsup/">/usr/share/examples/cvsup/</ulink>.</para>
+      
+      <para>The information in a <filename>supfile</filename> answers
+	the following questions for cvsup:</para>
+      
+      <itemizedlist>
+	<listitem>
+	  <para><link linkend="cvsup-config-files">Which files do you
+	      want to receive?</link></para>
+	</listitem>
+	
+	<listitem>
+	  <para><link linkend="cvsup-config-vers">Which versions of them
+	      do you want?</link></para>
+	</listitem>
+	
+	<listitem>
+	  <para><link linkend="cvsup-config-where">Where do you want to
+	      get them from?</link></para>
+	</listitem>
+	
+	<listitem>
+	  <para><link linkend="cvsup-config-dest">Where do you want to
+	      put them on your own machine?</link></para>
+	</listitem>
+	
+	<listitem>
+	  <para><link linkend="cvsup-config-status">Where do you want to
+	      put your status files?</link></para>
+	</listitem>
+      </itemizedlist>
+
+      <para>In the following sections, we will construct a typical
+	<filename>supfile</filename> by answering each of these
+	questions in turn.  First, we describe the overall structure of
+	a <filename>supfile</filename>.</para>
+
+      <para>A <filename>supfile</filename> is a text file.  Comments
+	begin with <literal>#</literal> and extend to the end of the
+	line.  Lines that are blank and lines that contain only
+	comments are ignored.</para>
+      
+      <para>Each remaining line describes a set of files that the user
+	wishes to receive.  The line begins with the name of a
+	<quote>collection</quote>, a logical grouping of files defined by
+	the server. The name of the collection tells the server which
+	files you want.  After the collection name come zero or more
+	fields, separated by white space.  These fields answer the
+	questions listed above.  There are two types of fields: flag
+	fields and value fields.  A flag field consists of a keyword
+	standing alone, e.g., <literal>delete</literal> or
+	<literal>compress</literal>.  A value field also begins with a
+	keyword, but the keyword is followed without intervening white
+	space by <literal>=</literal> and a second word.  For example,
+	<literal>release=cvs</literal> is a value field.</para>
+      
+      <para>A <filename>supfile</filename> typically specifies more than
+	one collection to receive.  One way to structure a
+	<filename>supfile</filename> is to specify all of the relevant
+	fields explicitly for each collection.  However, that tends to
+	make the <filename>supfile</filename> lines quite long, and it
+	is inconvenient because most fields are the same for all of the
+	collections in a <filename>supfile</filename>.
+	<application>CVSup</application> provides a defaulting mechanism
+	to avoid these problems.  Lines beginning with the special
+	pseudo-collection name <literal>*default</literal> can be used
+	to set flags and values which will be used as defaults for the
+	subsequent collections in the <filename>supfile</filename>.  A
+	default value can be overridden for an individual collection, by
+	specifying a different value with the collection itself.
+	Defaults can also be changed or augmented in mid-supfile by
+	additional <literal>*default</literal> lines.</para>
+
+      <para>With this background, we will now proceed to construct a
+	<filename>supfile</filename> for receiving and updating the main
+	source tree of <link
+	  linkend="current">FreeBSD-CURRENT</link>.</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para><anchor id="cvsup-config-files">Which files do you want
+	    to receive?</para>
+	  
+	  <para>The files available via <application>CVSup</application>
+	    are organized into named groups called
+	    <quote>collections</quote>.  The collections that are
+	    available are described <link
+	      linkend="cvsup-collec">here</link>.  In this example, we
+	    wish to receive the entire main source tree for the FreeBSD
+	    system.  There is a single large collection
+	    <literal>src-all</literal> which will give us all of that,
+	    except the export-controlled cryptography support.  Let us
+	    assume for this example that we are in the USA or Canada.
+	    Then we can get the cryptography code with one additional
+	    collection, <literal>cvs-crypto</literal>.  As a first step
+	    toward constructing our <filename>supfile</filename>, we
+	    simply list these collections, one per line:</para>
+
+	  <programlisting>
+src-all
+cvs-crypto</programlisting>
+	</listitem>
+
+	<listitem>
+	  <para><anchor id="cvsup-config-vers">Which version(s) of them
+	    do you want?</para>
+
+	  <para>With <application>CVSup</application>, you can receive
+	    virtually any version of the sources that ever existed.
+	    That is possible because the cvsupd server works directly
+	    from the CVS repository, which contains all of the versions.
+	    You specify which one of them you want using the
+	    <literal>tag=</literal> and <option>date=</option> value
+	    fields.</para>
+	  
+	  <warning>
+	    <para>Be very careful to specify any <literal>tag=</literal>
+	      fields correctly.  Some tags are valid only for certain
+	      collections of files.  If you specify an incorrect or
+	      misspelled tag, CVSup will delete files which you probably
+	      do not want deleted.  In particular, use <emphasis>only
+	      </emphasis> <literal>tag=.</literal> for the
+	      <literal>ports-*</literal> collections.</para>
+	  </warning>
+
+	  <para>The <literal>tag=</literal> field names a symbolic tag
+	    in the repository.  There are two kinds of tags, revision
+	    tags and branch tags.  A revision tag refers to a specific
+	    revision.  Its meaning stays the same from day to day.  A
+	    branch tag, on the other hand, refers to the latest revision
+	    on a given line of development, at any given time.  Because
+	    a branch tag does not refer to a specific revision, it may
+	    mean something different tomorrow than it means
+	    today.</para>
+	  
+	  <para>Here are the branch tags that users might be interested
+	    in.  Keep in mind that only the <literal>tag=.</literal> is
+	    relevant for the ports collection.</para>
+	  
+	  <variablelist>
+	    <varlistentry>
+	      <term>tag=.</term>
+
+	      <listitem>
+		<para>The main line of development, also known as
+		  FreeBSD-CURRENT.</para>
+
+		<note>
+		  <para>The <literal>.</literal> is not punctuation; it
+		    is the name of the tag.  Valid for all
+		    collections.</para>
+		</note>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>RELENG_3</term>
+	      
+	      <listitem>
+		<para>The line of development for FreeBSD-3.X, also
+		  known as FreeBSD-STABLE.</para>
+	      </listitem>
+	    </varlistentry>
+	      
+	    <varlistentry>
+	      <term>RELENG_2_2</term>
+		
+	      <listitem>
+		<para>The line of development for FreeBSD-2.2.X, also
+		  known as 2.2-STABLE.</para>
+	      </listitem>
+	    </varlistentry>
+	  </variablelist>
+	    
+	  <para>Here are the revision tags that users might be interested
+	    in.  Again, these are not valid for the ports
+	    collection.</para>
+	  
+	  <variablelist>
+	    <varlistentry>
+	      <term>RELENG_3_4_0_RELEASE</term>
+	      
+	      <listitem>
+		<para>FreeBSD-3.4.</para>
+	      </listitem>
+	    </varlistentry>
+	    
+	    <varlistentry>
+	      <term>tag=RELENG_3_3_0_RELEASE</term>
+	      
+	      <listitem>
+		<para>FreeBSD-3.3.</para>
+	      </listitem>
+	    </varlistentry>
+	    
+	    <varlistentry>
+	      <term>tag=RELENG_3_2_0_RELEASE</term>
+
+	      <listitem>
+		<para>FreeBSD-3.2.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>tag=RELENG_3_1_0_RELEASE</term>
+
+	      <listitem>
+		<para>FreeBSD-3.1.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>tag=RELENG_3_0_0_RELEASE</term>
+	      
+	      <listitem>
+		<para>FreeBSD-3.0.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>tag=RELENG_2_2_8_RELEASE</term>
+
+	      <listitem>
+		<para>FreeBSD-2.2.8.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>tag=RELENG_2_2_7_RELEASE</term>
+
+	      <listitem>
+		<para>FreeBSD-2.2.7.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>tag=RELENG_2_2_6_RELEASE</term>
+
+	      <listitem>
+		<para>FreeBSD-2.2.6.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>tag=RELENG_2_2_5_RELEASE</term>
+	      
+	      <listitem>
+		<para>FreeBSD-2.2.5.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>tag=RELENG_2_2_2_RELEASE</term>
+
+	      <listitem>
+		<para>FreeBSD-2.2.2.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>tag=RELENG_2_2_1_RELEASE</term>
+	      
+	      <listitem>
+		<para>FreeBSD-2.2.1.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	      <term>tag=RELENG_2_2_0_RELEASE</term>
+
+	      <listitem>
+		<para>FreeBSD-2.2.0.</para>
+	      </listitem>
+	    </varlistentry>
+	  </variablelist>
+
+	  <warning>
+	    <para>Be very careful to type the tag name exactly as shown.
+	      <application>CVSup</application> cannot distinguish
+	      between valid and invalid tags.  If you misspell the tag,
+	      <application>CVSup</application> will behave as though you
+	      had specified a valid tag which happens to refer to no
+	      files at all.  It will delete your existing sources in
+	      that case.</para>
+	  </warning>
+
+	  <para>When you specify a branch tag, you normally receive the
+	    latest versions of the files on that line of development.
+	    If you wish to receive some past version, you can do so by
+	    specifying a date with the <option>date=</option> value
+	    field. The &man.cvsup.1; manual page explains how to do
+	    that.</para>
+
+	  <para>For our example, we wish to receive FreeBSD-CURRENT.  We
+	    add this line at the beginning of our
+	    <filename>supfile</filename>:</para>
+	  
+	  <programlisting>
+*default tag=.</programlisting>
+
+	  <para>There is an important special case that comes into play
+	    if you specify neither a <literal>tag=</literal> field nor a
+	    <literal>date=</literal> field.  In that case, you receive
+	    the actual RCS files directly from the server's CVS
+	    repository, rather than receiving a particular version.
+	    Developers generally prefer this mode of operation.  By
+	    maintaining a copy of the repository itself on their
+	    systems, they gain the ability to browse the revision
+	    histories and examine past versions of files.  This gain is
+	    achieved at a large cost in terms of disk space,
+	    however.</para>
+	</listitem>
+
+	<listitem>
+	  <para><anchor id="cvsup-config-where">Where do you want to get
+	    them from?</para>
+	  
+	  <para>We use the <literal>host=</literal> field to tell
+	    <command>cvsup</command> where to obtain its updates.  Any
+	    of the <link linkend="mirrors-cvsup">CVSup mirror
+	      sites</link> will do, though you should try to select one
+	    that is close to you in cyberspace.  In this example we will
+	    use a fictional FreeBSD distribution site,
+	    <hostid role="fqdn">cvsup666.FreeBSD.org</hostid>:</para>
+
+	  <programlisting>
+*default host=cvsup666.FreeBSD.org</programlisting>
+	  
+	  <para>You will need to change the host to one that actually
+	    exists before running CVSup.  On any particular run of
+	    <command>cvsup</command>, you can override the host  setting
+	    on the command line, with <option>-h
+	      <replaceable>hostname</replaceable></option>.</para>
+	</listitem>
+	
+	<listitem>
+	  <para><anchor id="cvsup-config-dest">Where do you want to put
+	    them on your own machine?</para>
+	  
+	  <para>The <literal>prefix=</literal> field tells
+	    <command>cvsup</command> where to put the files it receives.
+	    In this example, we will put the source files directly into
+	    our main source tree, <filename>/usr/src</filename>.  The
+	    <filename>src</filename> directory is already implicit in
+	    the collections we have chosen to receive, so this is the
+	    correct specification:</para>
+	  
+	  <programlisting>
+*default prefix=/usr</programlisting>
+	</listitem>
+
+	<listitem>
+	  <para><anchor id="cvsup-config-status">Where should
+	    <command>cvsup</command> maintain its status files?</para>
+
+	  <para>The cvsup client maintains certain status files in what
+	    is called the <quote>base</quote> directory.  These files
+	    help <application>CVSup</application> to work more
+	    efficiently, by keeping track of which updates you have
+	    already received.  We will use the standard base directory,
+	    <filename>/usr/local/etc/cvsup</filename>:</para>
+
+	  <programlisting>
+*default base=/usr/local/etc/cvsup</programlisting>
+
+	  <para>This setting is used by default if it is not specified
+	    in the <filename>supfile</filename>, so we actually do not
+	    need the above line.</para>
+	  
+	  <para>If your base directory does not already exist, now would
+	    be a good time to create it.  The <command>cvsup</command>
+	    client will refuse to run if the base directory does not
+	    exist.</para>
+	</listitem>
+
+	<listitem>
+	  <para>Miscellaneous <filename>supfile</filename>
+	    settings:</para>
+	  
+	  <para>There is one more line of boiler plate that normally
+	    needs to be present in the
+	    <filename>supfile</filename>:</para>
+
+	  <programlisting>
+*default release=cvs delete use-rel-suffix compress</programlisting>
+
+	  <para><literal>release=cvs</literal> indicates that the server
+	    should get its information out of the main FreeBSD CVS
+	    repository.  This is virtually always the case, but there
+	    are other possibilities which are beyond the scope of this
+	    discussion.</para>
+	  
+	  <para><literal>delete</literal> gives
+	    <application>CVSup</application> permission to delete files.
+	    You should always specify this, so that
+	    <application>CVSup</application> can keep your source tree
+	    fully up-to-date.  <application>CVSup</application> is
+	    careful to delete only those files for which it is
+	    responsible.  Any extra files you happen to have will be
+	    left strictly alone.</para>
+	  
+	  <para><literal>use-rel-suffix</literal> is ... arcane.  If you
+	    really want to know about it, see the &man.cvsup.1; manual
+	    page.  Otherwise, just specify it and do not worry about
+	    it.</para>
+
+	  <para><literal>compress</literal> enables the use of
+	    gzip-style compression on the communication channel.  If
+	    your network link is T1 speed or faster, you probably should
+	    not use compression.  Otherwise, it helps
+	    substantially.</para>
+	</listitem>
+
+	<listitem>
+	  <para>Putting it all together:</para>
+
+	  <para>Here is the entire <filename>supfile</filename> for our
+	    example:</para>
+
+	  <programlisting>
+*default tag=.
+*default host=cvsup666.FreeBSD.org
+*default prefix=/usr
+*default base=/usr/local/etc/cvsup
+*default release=cvs delete use-rel-suffix compress
+
+src-all
+cvs-crypto</programlisting>
+	</listitem>
+      </itemizedlist>
+    </sect2>
+    
+    <sect2>
+      <title>Running <application>CVSup</application></title>
+      
+      <para>You are now ready to try an update.  The command line for
+	doing this is quite simple:</para>
+
+      <screen>&prompt.root; <userinput>cvsup <replaceable>supfile</replaceable></userinput></screen>
+
+      <para>where <filename><replaceable>supfile</replaceable></filename>
+	is of course the name of the supfile you have just created. 
+	Assuming you are running under X11, <command>cvsup</command>
+	will display a GUI window with some buttons to do the usual
+	things.  Press the <quote>go</quote> button, and watch it
+	run.</para>
+      
+      <para>Since you are updating your actual
+	<filename>/usr/src</filename> tree in this example, you will
+	need to run the program as <username>root</username> so that
+	<command>cvsup</command> has the permissions it needs to update
+	your files.  Having just created your configuration file, and
+	having never used this program before, that might
+	understandably make you nervous. There is an easy way to do a
+	trial run without touching your precious files.  Just create an
+	empty directory somewhere convenient, and name it as an extra
+	argument on the command line:</para>
+
+      <screen>&prompt.root; <userinput>mkdir /var/tmp/dest</userinput>
+&prompt.root; <userinput>cvsup supfile /var/tmp/dest</userinput></screen>
+      
+      <para>The directory you specify will be used as the destination
+	directory for all file updates.
+	<application>CVSup</application> will examine your usual files
+	in <filename>/usr/src</filename>, but it will not modify or
+	delete any of them.  Any file updates will instead land in
+	<filename>/var/tmp/dest/usr/src</filename>.
+	<application>CVSup</application> will also leave its base
+	directory status files untouched when run this way.  The new
+	versions of those files will be written into the specified
+	directory.  As long as you have read access to
+	<filename>/usr/src</filename>, you do not even need to be root
+	to perform this kind of trial run.</para>
+      
+      <para>If you are not running X11 or if you just do not like GUIs,
+	you should add a couple of options to the command line when you
+	run cvsup:</para>
+      
+      <screen>&prompt.root; <userinput>cvsup -g -L 2 supfile</userinput></screen>
+	    
+      <para>The <option>-g</option> tells cvsup not to use its GUI.
+	This is automatic if you are not running X11, but otherwise you
+	have to specify it.</para>
+      
+      <para>The <option>-L 2</option> tells cvsup to print out the
+	details of all the file updates it is doing.  There are three
+	levels of verbosity, from <option>-L 0</option> to
+	<option>-L 2</option>.  The default is 0, which means total
+	silence except for error messages.</para>
+      
+      <para>There are plenty of other options available.  For a brief
+	list of them, type <command>cvsup -H</command>.  For more
+	detailed descriptions, see the manual page.</para>
+
+      <para>Once you are satisfied with the way updates are working, you
+	can arrange for regular runs of cvsup using &man.cron.8;.
+	Obviously, you should not let cvsup use its GUI when running it
+	from cron.</para>
+    </sect2>
+
+    <sect2 id="cvsup-collec">
+      <title><application>CVSup</application> File Collections</title>
+	    
+      <para>The file collections available via
+	<application>CVSup</application> are organized hierarchically.
+	There are a few large collections, and they are divided into
+	smaller sub-collections.  Receiving a large collection is
+	equivalent to receiving each of its sub-collections.  The
+	hierarchical relationships among collections are reflected by
+	the use of indentation in the list below.</para>
+      
+      <para>The most commonly used collections are
+	<literal>src-all</literal>, <literal>cvs-crypto</literal>, and
+	<literal>ports-all</literal>.  The other collections are used
+	only by small groups of people for specialized purposes, and
+	some mirror sites may not carry all of them.</para>
+      
+      <variablelist>
+	<varlistentry>
+	  <term><literal>cvs-all release=cvs</literal></term>
+	  
+	  <listitem>
+	    <para>The main FreeBSD CVS repository, excluding the
+	      export-restricted cryptography code.</para>
+	    
+	    <variablelist>
+	      <varlistentry>
+		<term><literal>distrib release=cvs</literal></term>
+		
+		<listitem>
+		  <para>Files related to the distribution and mirroring
+		    of FreeBSD.</para>
+		</listitem>
+	      </varlistentry>
+	      
+	      <varlistentry>
+		<term><literal>doc-all release=cvs</literal></term>
+
+		<listitem>
+		  <para>Sources for the FreeBSD handbook and other
+		    documentation.</para>
+		</listitem>
+	      </varlistentry>
+
+	      <varlistentry>
+		<term><literal>ports-all release=cvs</literal></term>
+
+		<listitem>
+		  <para>The FreeBSD ports collection.</para>
+
+		  <variablelist>
+		    <varlistentry>
+		      <term><literal>ports-archivers
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Archiving tools.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-astro
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Astronomical ports.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-audio
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Sound support.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-base
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Miscellaneous files at the top of
+			  /usr/ports.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-benchmarks
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Benchmarks.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-biology
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Biology.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-cad
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Computer aided design tools.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-chinese
+			  release=cvs</literal></term>
+			
+		      <listitem>
+			<para>Chinese language support.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-comms
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Communication software.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-converters
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>character code converters.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-databases
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Databases.</para>
+		      </listitem>
+		    </varlistentry>
+		    
+		    <varlistentry>
+		      <term><literal>ports-deskutils
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Things that used to be on the desktop
+			  before computers were invented.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-devel
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Development utilities.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-editors
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Editors.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-emulators
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Emulators for other operating
+			  systems.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-ftp
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>FTP client and server utilities.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-games
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Games.</para>
+		      </listitem>
+		    </varlistentry>
+		    
+		    <varlistentry>
+		      <term><literal>ports-german
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>German language support.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-graphics
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Graphics utilities.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-irc
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Internet Relay Chat utilities.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-japanese
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Japanese language support.</para>
+		      </listitem>
+		    </varlistentry>
+		    
+		    <varlistentry>
+		      <term><literal>ports-java
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Java utilities.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-korean
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Korean language support.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-lang
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Programming languages.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-mail
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Mail software.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-math
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Numerical computation software.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-mbone
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>MBone applications.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-misc
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Miscellaneous utilities.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-net
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Networking software.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-news
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>USENET news software.</para>
+		      </listitem>
+		    </varlistentry>
+		    
+		    <varlistentry>
+		      <term><literal>ports-palm
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Software support for 3Com Palm(tm)
+			  series.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-print
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Printing software.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-russian
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Russian language support.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-security
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Security utilities.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-shells
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Command line shells.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-sysutils
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>System utilities.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-textproc
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>text processing utilities (does not
+			  include desktop publishing).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-vietnamese
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Vietnamese language support.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-www
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Software related to the World Wide
+			  Web.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-x11
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Ports to support the X window
+			  system.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-x11-clocks
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>X11 clocks.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-x11-fm
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>X11 file managers.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-x11-fonts
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>X11 fonts and font utilities.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-x11-toolkits
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>X11 toolkits.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-x11-servers</literal></term>
+		      
+		      <listitem>
+			<para>X11 servers.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>ports-x11-wm</literal></term>
+		      
+		      <listitem>
+			<para>X11 window managers.</para>
+		      </listitem>
+		    </varlistentry>
+		  </variablelist>
+		</listitem>
+	      </varlistentry>
+
+	      <varlistentry>
+		<term><literal>src-all release=cvs</literal></term>
+		
+		<listitem>
+		  <para>The main FreeBSD sources, excluding the
+		    export-restricted cryptography code.</para>
+
+		  <variablelist>
+		    <varlistentry>
+		      <term><literal>src-base
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Miscellaneous files at the top of
+			  <filename>/usr/src</filename>.</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-bin
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>User utilities that may be needed in
+			  single-user mode
+			  (<filename>/usr/src/bin</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-contrib
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Utilities and libraries from outside the
+			  FreeBSD project, used relatively unmodified
+			  (<filename>/usr/src/contrib</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-etc
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>System configuration files
+			  (<filename>/usr/src/etc</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-games
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Games
+			  (<filename>/usr/src/games</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-gnu
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Utilities covered by the GNU Public
+			  License (<filename>/usr/src/gnu</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-include
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Header files
+			  (<filename>/usr/src/include</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-kerberos5
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Kerberos5 security package
+			  (<filename>/usr/src/kerberos5</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-kerberosIV
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>KerberosIV security package
+			  (<filename>/usr/src/kerberosIV</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-lib
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Libraries
+			  (<filename>/usr/src/lib</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-libexec
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>System programs normally executed by other
+			  programs
+			  (<filename>/usr/src/libexec</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+		    
+		    <varlistentry>
+		      <term><literal>src-release
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>Files required to produce a FreeBSD
+			  release
+			  (<filename>/usr/src/release</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+		    
+		    <varlistentry>
+		      <term><literal>src-sbin
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>System utilities for single-user mode
+			  (<filename>/usr/src/sbin</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-share
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Files that can be shared across multiple
+			  systems
+			  (<filename>/usr/src/share</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-sys
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>The kernel
+			  (<filename>/usr/src/sys</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-tools
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>Various tools for the maintenance of
+			  FreeBSD
+			  (<filename>/usr/src/tools</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-usrbin
+			  release=cvs</literal></term>
+
+		      <listitem>
+			<para>User utilities
+			  (<filename>/usr/src/usr.bin</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+
+		    <varlistentry>
+		      <term><literal>src-usrsbin
+			  release=cvs</literal></term>
+		      
+		      <listitem>
+			<para>System utilities
+			  (<filename>/usr/src/usr.sbin</filename>).</para>
+		      </listitem>
+		    </varlistentry>
+		  </variablelist>
+		</listitem>
+	      </varlistentry>
+	      
+	      <varlistentry>
+		<term><literal>www release=cvs</literal></term>
+		
+		<listitem>
+		  <para>The sources for the World Wide Web data.</para>
+		</listitem>
+	      </varlistentry>
+	    </variablelist>
+	  </listitem>
+	</varlistentry>
+	
+	<varlistentry>
+	  <term><literal>cvs-crypto release=cvs</literal></term>
+	  
+	  <listitem>
+	    <para>The export-restricted cryptography code.</para>
+
+	    <variablelist>
+	      <varlistentry>
+		<term><literal>src-crypto release=cvs</literal></term>
+
+		<listitem>
+		  <para>Export-restricted utilities and libraries from
+		    outside the FreeBSD project, used relatively
+		    unmodified
+		    (<filename>/usr/src/crypto</filename>).</para>
+		</listitem>
+	      </varlistentry>
+
+	      <varlistentry>
+		<term><literal>src-eBones release=cvs</literal></term>
+		
+		<listitem>
+		  <para>Kerberos and DES
+		    (<filename>/usr/src/eBones</filename>).  Not
+		    used in current releases of FreeBSD.</para>
+		</listitem>
+	      </varlistentry>
+
+	      <varlistentry>
+		<term><literal>src-secure release=cvs</literal></term>
+
+		<listitem>
+		  <para>DES (<filename>/usr/src/secure</filename>).</para>
+		</listitem>
+	      </varlistentry>
+
+	      <varlistentry>
+		<term><literal>src-sys-crypto
+		    release=cvs</literal></term>
+		
+		<listitem>
+		  <para>Kernel cryptography code
+		    (<filename>/usr/src/sys/crypto</filename>).</para>
+		</listitem>
+	      </varlistentry>
+	    </variablelist>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><literal>distrib release=self</literal></term>
+
+	  <listitem>
+	    <para>The CVSup server's own configuration files.  Used by
+	      CVSup mirror sites.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><literal>gnats release=current</literal></term>
+
+	  <listitem>
+	    <para>The GNATS bug-tracking database.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><literal>mail-archive release=current</literal></term>
+	  
+	  <listitem>
+	    <para>FreeBSD mailing list archive.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><literal>www release=current</literal></term>
+
+	  <listitem>
+	    <para>The installed World Wide Web data.  Used by WWW mirror
+	      sites.</para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </sect2>
+
+    <sect2>
+      <title>For more information</title>
+
+      <para>For the CVSup FAQ and other information about CVSup, see
+	<ulink url="http://www.polstra.com/projects/freeware/CVSup/">The
+	  CVSup Home Page</ulink>.</para>
+
+      <para>Most FreeBSD-related discussion of
+	<application>CVSup</application> takes place on the
+	&a.hackers;.  New versions of the software are announced there,
+	as well as on the &a.announce;.</para>
+      
+      <para>Questions and bug reports should be addressed to the author
+	of the program at <email>cvsup-bugs@polstra.com</email>.</para>
+    </sect2>
+
+    <sect2>
     <title>CVSup Sites</title>
 
-    <para><link linkend="cvsup">CVSup</link> servers for FreeBSD are running
+    <para><link linkend="mirrors-cvsup">CVSup</link> servers for FreeBSD are running
       at the following sites:</para>
 
     <variablelist>
@@ -1908,8 +3261,9 @@
 	</listitem>
       </varlistentry>
     </variablelist>
+  </sect2>
   </sect1>
-
+    
   <sect1 id="mirrors-afs">
     <title>AFS Sites</title>