1 files changed, 38 insertions, 13 deletions

diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
index 33ec77a924..9668b7e758 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
@@ -374,7 +374,7 @@
 	</listitem>
       </itemizedlist>
     
-      <para>&os; is available in both source and binary form on CDROM,
+      <para>&os; is available in both source and binary form on CD-ROM,
 	DVD,
         and via anonymous FTP.  Please see <xref linkend="mirrors">
         for more information about obtaining &os;.</para>
@@ -535,7 +535,7 @@
       <indexterm><primary>U.C. Berkeley</primary></indexterm>
       <indexterm><primary>386BSD</primary></indexterm>
       <indexterm><primary>Free Software Foundation</primary></indexterm>
-      <para>The first CDROM (and general net-wide) distribution was
+      <para>The first CD-ROM (and general net-wide) distribution was
 	&os;&nbsp;1.0, released in December of 1993.  This was based on the
 	4.3BSD-Lite (<quote>Net/2</quote>) tape from U.C. Berkeley, with
 	many components also provided by 386BSD and the Free Software
@@ -570,7 +570,7 @@
 	(due to various legal requirements) and the fact that the Intel
 	port of 4.4 was highly incomplete.  It took the project until
 	November of 1994 to make this transition, at which point it
-	released &os;&nbsp;2.0 to the net and on CDROM (in late December).
+	released &os;&nbsp;2.0 to the net and on CD-ROM (in late December).
 	Despite being still more than a little rough around the edges,
 	the release was a significant success and was followed by the
 	more robust and easier to install &os;&nbsp;2.0.5 release in June of
@@ -633,7 +633,7 @@
 
       <para>For now, long-term development projects continue to take place in the
 	8.X-CURRENT (trunk) branch, and SNAPshot releases of 8.X on
-	CDROM (and, of course, on the net) are continually made available
+	CD-ROM (and, of course, on the net) are continually made available
 	from <ulink url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/">
 	the snapshot server</ulink> as work progresses.</para>
     </sect2>
@@ -721,7 +721,7 @@
 
       <variablelist>
 	<varlistentry>
-	  <term>The CVS repository<anchor
+	  <term>The SVN and CVS repositories<anchor
 	    id="development-cvs-repository"></term>
 
 	  <indexterm>
@@ -732,15 +732,41 @@
 	    <primary>Concurrent Versions System</primary>
       <see>CVS</see>
 	  </indexterm>
+	  <indexterm>
+	    <primary>SVN</primary>
+	    <secondary>repository</secondary>
+	  </indexterm>
+	  <indexterm>
+	    <primary>Subversion</primary>
+	    <see>SVN</see>
+	  </indexterm>
 	  <listitem>
-	    <para>The central source tree for &os; is maintained by
+	    <para>For several years, the central source tree for &os; was maintained by
 	      <ulink url="http://ximbiot.com/cvs/wiki/">CVS</ulink>
 	      (Concurrent Versions System), a freely available source code
-	      control tool that comes bundled with &os;.  The primary
-	      <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS
-	      repository</ulink> resides on a machine in Santa Clara CA, USA
+	      control tool that comes bundled with &os;.  In June 2008, the
+	      Project switched to using <ulink
+	        url="http://subversion.tigris.org">SVN</ulink> (Subversion).
+	      The switch was deemed necessary, as the technical limitations
+	      imposed by <application>CVS</application> were becoming obvious
+	      due to the rapid expansion of the source tree and the amount
+	      of history already stored.  While the main repository now uses
+	      <application>SVN</application>, client side tools like
+	      <application>CVSup</application> and
+	      <application>csup</application> that depend on the older
+	      <application>CVS</application> infrastructure, continue to
+	      work normally &mdash; changes in the
+	      <application>SVN</application> repository are backported to
+	      <application>CVS</application> for this purpose.
+	      Currently, only the central source tree is controlled by
+	      <application>SVN</application>.
+	      The documentation, World Wide Web, and Ports repositories are
+	      still using <application>CVS</application>.  The primary
+	      <ulink
+	        url="http://www.FreeBSD.org/cgi/cvsweb.cgi">repository</ulink>
+	      resides on a machine in Santa Clara CA, USA
 	      from where it is replicated to numerous mirror machines
-	      throughout the world.  The CVS tree, which contains the <link
+	      throughout the world.  The <application>SVN</application> tree, which contains the <link
 	      linkend="current">-CURRENT</link> and <link
 	      linkend="stable">-STABLE</link> trees,
 	      can all be easily replicated to your own machine as well.
@@ -783,8 +809,7 @@
 	      is one of the functions of the core team, as is the
 	      recruitment of new core team members as others move on.
 	      The current core team was elected from a pool of committer
-	      candidates in July 2006.  Elections are held every 2 years.
-	      </para>
+	      candidates in July 2008.  Elections are held every 2 years.</para>
 
 	    <para>Some core team members also have specific areas of
 	      responsibility, meaning that they are committed to
@@ -903,7 +928,7 @@
         program you wish to install, type <command>make
         install</command>, and let the system do the rest.  The full
         original distribution for each port you build is retrieved
-        dynamically off the CDROM or a local FTP site, so you need
+        dynamically off the CD-ROM or a local FTP site, so you need
         only enough disk space to build the ports you want.  Almost
         every port is also provided as a pre-compiled
         <quote>package</quote>, which can be installed with a simple