Split the "Obtaining FreeBSD" appendix into four sections, for

CD-ROM, FTP, CTM, and CVSup.  Adjust cross-references accordingly.
Add a list of CVSup mirror sites, and reference it from the CVSup
tutorial.

Also, fix a spelling error in the porting document.

handbook/cvsup.sgml

@@ -247,15 +247,17 @@ cost in terms of disk space, however.
 
 <p><item>Where do you want to get them from?<label id="cvsup:config:where">
 
-<p>This one is easy.  We use the "host=" field to tell cvsup to get
+<p>We use the "host=" field to tell cvsup where to obtain its updates.
-its updates from the primary FreeBSD distribution site,
+Any of the <ref id="mirrors-cvsup" name="CVSup mirror sites"> will do,
+though you should try to select one that's near to you.
+In this example, we'll use the primary FreeBSD distribution site,
 "cvsup.FreeBSD.org":
 
 <verb>
   *default host=cvsup.FreeBSD.org
 </verb>
 
-<p>On any particular run of cvsup, we can override this setting on the
+<p>On any particular run of cvsup, you can override this setting on the
 command line, with "-h hostname".
 
 <p><item>Where do you want to put them on your own machine?<label id="cvsup:config:dest">

handbook/handbook.sgml

@@ -47,7 +47,8 @@ the <url url="http://www.FreeBSD.ORG/" name="FreeBSD World Wide
 Web server">.  It may also be downloaded in plain text, postscript 
 or HTML from the <url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/docs"
 name="FreeBSD FTP server"> or one of the numerous
-<ref id="mirrors" name="mirror sites">.  You may also want to <url url="/search.html" name="Search the Handbook">.	
+<ref id="mirrors-ftp" name="mirror sites">.  You may also want to
+<url url="/search.html" name="Search the Handbook">.	
 
 </abstract>
       <toc>

handbook/mirrors.sgml

@@ -7,12 +7,9 @@
 
 <chapt><heading>Obtaining FreeBSD<label id="mirrors"></heading>
 
-<p>The official sources for FreeBSD available via anonymous FTP from:
+<sect><heading>CD-ROM Publishers</heading>
-<quote>
+
-<url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD" 
+<p>FreeBSD is available on CD-ROM from Walnut Creek CDROM:
-name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD">
-</quote> 
-and on CD-ROM from Walnut Creek CDROM:
 <quote>
  Walnut Creek CDROM<newline>
  1547 Palos Verdes Mall, Suite 260<newline>
@@ -23,6 +20,14 @@ and on CD-ROM from Walnut Creek CDROM:
  WWW: <url url="http://www.cdrom.com/" name="http://www.cdrom.com/">
 </quote>
 
+<sect><heading>FTP Sites<label id="mirrors-ftp"></heading>
+
+<p>The official sources for FreeBSD are available via anonymous FTP from:
+<quote>
+<url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD" 
+name="ftp://ftp.FreeBSD.ORG/pub/FreeBSD">.
+</quote> 
+
 <p>Additionally, FreeBSD is available via anonymous FTP from the
       following mirror sites. If you choose to obtain FreeBSD via
       anonymous FTP, please try to use a site near you.
@@ -522,7 +527,8 @@ for this domain.
 
 </descrip>
 
-<label id="mirrors-ctm">
+<sect><heading>CTM Sites<label id="mirrors-ctm"></heading>
+
 <p>CTM/FreeBSD is available via anonymous FTP from the
       following mirror sites. If you choose to obtain CTM via
       anonymous FTP, please try to use a site near you.
@@ -579,3 +585,85 @@ try
 	name="http://ftpsearch.ntnu.no/ftpsearch">. 
 FTP search is a great free archie server in Trondheim, Norway.
 
+<sect><heading>CVSup Sites<label id="mirrors-cvsup"></heading>
+
+<p>CVSup servers for FreeBSD are running at the following sites:
+
+<descrip>
+
+<tag>Argentina</tag>
+<itemize>
+<item>cvsup.ar.FreeBSD.ORG
+(<url url="mailto:msagre@cactus.fi.uba.ar" name="maintainer">)
+</itemize>
+
+<tag>Australia</tag>
+<itemize>
+<item>cvsup.au.FreeBSD.ORG
+(<url url="mailto:dawes@physics.usyd.edu.au" name="maintainer">)
+</itemize>
+
+<tag>Germany</tag>
+<itemize>
+<item>cvsup.de.FreeBSD.ORG
+(<url url="mailto:wosch@cs.tu-berlin.de" name="maintainer">)
+</itemize>
+
+<tag>Japan</tag>
+<itemize>
+<item>cvsup.jp.FreeBSD.ORG
+(<url url="mailto:simokawa@sat.t.u-tokyo.ac.jp" name="maintainer">)
+</itemize>
+
+<tag>Netherlands</tag>
+<itemize>
+<item>cvsup.nl.FreeBSD.ORG
+(<url url="mailto:xaa@stack.urc.tue.nl" name="maintainer">)
+</itemize>
+
+<tag>Norway</tag>
+<itemize>
+<item>cvsup.no.FreeBSD.ORG
+(<url url="mailto:Tor.Egge@idt.ntnu.no" name="maintainer">)
+</itemize>
+
+<tag>South Africa</tag>
+<itemize>
+<item>cvsup.za.FreeBSD.ORG
+(<url url="mailto:markm@FreeBSD.ORG" name="maintainer">)
+</itemize>
+
+<tag>Taiwan</tag>
+<itemize>
+<item>sup.tw.FreeBSD.ORG
+(<url url="mailto:jdli@freebsd.csie.nctu.edu.tw" name="maintainer">)
+</itemize>
+
+<tag>USA</tag>
+<itemize>
+<item>cvsup.FreeBSD.ORG
+(<url url="mailto:jdp@FreeBSD.ORG" name="maintainer">)
+<item>cvsup2.FreeBSD.ORG
+(<url url="mailto:jdp@FreeBSD.ORG" name="maintainer">)
+<item>cvsup4.FreeBSD.ORG
+(<url url="mailto:jdp@FreeBSD.ORG" name="maintainer">)
+<item>cvsup5.FreeBSD.ORG
+(<url url="mailto:skynyrd@opus.cts.cwu.edu" name="maintainer">)
+</itemize>
+
+</descrip>
+
+The export-restricted code for FreeBSD (eBones and secure) is
+available via CVSup at the following international repository.
+Please use this site to get the export-restricted code, if you are
+outside the USA or Canada.
+
+<descrip>
+
+<tag>South Africa</tag>
+<itemize>
+<item>cvsup.internat.FreeBSD.ORG
+(<url url="mailto:markm@FreeBSD.ORG" name="maintainer">)
+</itemize>
+
+</descrip>

handbook/porting.sgml

@@ -608,7 +608,7 @@ MASTER_SITE_SUBDIR=   applications
 </verb></tscreen>
         <p>The user can also set the MASTER_SITE_* variables in
           <tt>/etc/make.conf</tt> to override our choices, and use their
-	  favorate mirrors of these popular archives instead.
+	  favorite mirrors of these popular archives instead.
 
       <sect3>
 	<heading>PATCHFILES<label id="porting:patchfiles"></heading>