diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
index 06227ff201..aaf2bfd8b1 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.32 1999/10/29 09:29:15 jkh Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.33 1999/11/07 01:54:45 chris Exp $
 -->
 
 <chapter id="cutting-edge">
@@ -424,7 +424,9 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	  perform, with no special privileges, read-only CVS operations
 	  against one of the FreeBSD project's official anoncvs servers.  To
 	  use it, one simply sets the <envar>CVSROOT</envar> environment
-	  variable to point at the appropriate anoncvs server and then uses
+	  variable to point at the appropriate anoncvs server,
+	  provides the well-known password <quote>anoncvs</quote>
+	  with the <command>cvs login</command> command, and then uses
 	  the &man.cvs.1; command to access it like any local
 	  repository.</para>
 
@@ -464,7 +466,9 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	<itemizedlist>
 	  <listitem>
 	    <para><emphasis>USA</emphasis>:
-	      anoncvs@anoncvs.FreeBSD.org:/cvs</para>
+	      :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs
+	      (Use <command>cvs login</command> and enter the password
+	      <quote>anoncvs</quote> when prompted.)</para>
 	  </listitem>
 	</itemizedlist>
 
@@ -680,9 +684,13 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	    deleting it again:</title>
 
 	  <screen>
-&prompt.user; <userinput>setenv CVSROOT anoncvs@anoncvs.FreeBSD.org:/cvs</userinput>
+&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs</userinput>
+&prompt.user; <userinput>cvs login</userinput>
+<emphasis>At the prompt, enter the password</emphasis> <quote>anoncvs</quote>.
 &prompt.user; <userinput>cvs co ls</userinput>
-&prompt.user; <userinput>cvs release -d ls</userinput></screen>
+&prompt.user; <userinput>cvs release -d ls</userinput>
+&prompt.user; <userinput>cvs logout</userinput>
+	  </screen>
 	</example>
 
 	<example>
@@ -690,27 +698,39 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	    branch:</title>
 	    
 	  <screen>
-&prompt.user; <userinput>setenv CVSROOT anoncvs@anoncvs.FreeBSD.org:/cvs</userinput>
+&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs</userinput>
+&prompt.user; <userinput>cvs login</userinput>
+<emphasis>At the prompt, enter the password</emphasis> <quote>anoncvs</quote>.
 &prompt.user; <userinput>cvs co -rRELENG_2_2 ls</userinput>
-&prompt.user; <userinput>cvs release -d ls</userinput></screen>
+&prompt.user; <userinput>cvs release -d ls</userinput>
+&prompt.user; <userinput>cvs logout</userinput>
+	  </screen>
 	</example>
 
 	<example>
 	  <title>Creating a list of changes (as unidiffs) to &man.ls.1;</title>
 
 	  <screen>
-&prompt.user; <userinput>setenv CVSROOT anoncvs@anoncvs.FreeBSD.org:/cvs</userinput>
-&prompt.user; <userinput>cvs rdiff -u -rRELENG_2_2_2_RELEASE -rRELENG_2_2_6_RELEASE ls</userinput></screen>
+&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs</userinput>
+&prompt.user; <userinput>cvs login</userinput>
+<emphasis>At the prompt, enter the password</emphasis> <quote>anoncvs</quote>.
+&prompt.user; <userinput>cvs rdiff -u -rRELENG_2_2_2_RELEASE -rRELENG_2_2_6_RELEASE ls</userinput>
+&prompt.user; <userinput>cvs logout</userinput>
+	  </screen>
 	</example>
 
 	<example>
 	  <title>Finding out what other module names can be used:</title>
 	  
 	  <screen>
-&prompt.user; <userinput>setenv CVSROOT anoncvs@anoncvs.FreeBSD.org:/cvs</userinput>
+&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs</userinput>
+&prompt.user; <userinput>cvs login</userinput>
+<emphasis>At the prompt, enter the password</emphasis> <quote>anoncvs</quote>.
 &prompt.user; <userinput>cvs co modules</userinput>
 &prompt.user; <userinput>more modules/modules</userinput>
-&prompt.user; <userinput>cvs release -d modules</userinput></screen>
+&prompt.user; <userinput>cvs release -d modules</userinput>
+&prompt.user; <userinput>cvs logout</userinput>
+	  </screen>
 	</example>
       </sect3>
       
diff --git a/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml
index 06227ff201..aaf2bfd8b1 100644
--- a/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.32 1999/10/29 09:29:15 jkh Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.33 1999/11/07 01:54:45 chris Exp $
 -->
 
 <chapter id="cutting-edge">
@@ -424,7 +424,9 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	  perform, with no special privileges, read-only CVS operations
 	  against one of the FreeBSD project's official anoncvs servers.  To
 	  use it, one simply sets the <envar>CVSROOT</envar> environment
-	  variable to point at the appropriate anoncvs server and then uses
+	  variable to point at the appropriate anoncvs server,
+	  provides the well-known password <quote>anoncvs</quote>
+	  with the <command>cvs login</command> command, and then uses
 	  the &man.cvs.1; command to access it like any local
 	  repository.</para>
 
@@ -464,7 +466,9 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	<itemizedlist>
 	  <listitem>
 	    <para><emphasis>USA</emphasis>:
-	      anoncvs@anoncvs.FreeBSD.org:/cvs</para>
+	      :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs
+	      (Use <command>cvs login</command> and enter the password
+	      <quote>anoncvs</quote> when prompted.)</para>
 	  </listitem>
 	</itemizedlist>
 
@@ -680,9 +684,13 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	    deleting it again:</title>
 
 	  <screen>
-&prompt.user; <userinput>setenv CVSROOT anoncvs@anoncvs.FreeBSD.org:/cvs</userinput>
+&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs</userinput>
+&prompt.user; <userinput>cvs login</userinput>
+<emphasis>At the prompt, enter the password</emphasis> <quote>anoncvs</quote>.
 &prompt.user; <userinput>cvs co ls</userinput>
-&prompt.user; <userinput>cvs release -d ls</userinput></screen>
+&prompt.user; <userinput>cvs release -d ls</userinput>
+&prompt.user; <userinput>cvs logout</userinput>
+	  </screen>
 	</example>
 
 	<example>
@@ -690,27 +698,39 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz</userinput></scr
 	    branch:</title>
 	    
 	  <screen>
-&prompt.user; <userinput>setenv CVSROOT anoncvs@anoncvs.FreeBSD.org:/cvs</userinput>
+&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs</userinput>
+&prompt.user; <userinput>cvs login</userinput>
+<emphasis>At the prompt, enter the password</emphasis> <quote>anoncvs</quote>.
 &prompt.user; <userinput>cvs co -rRELENG_2_2 ls</userinput>
-&prompt.user; <userinput>cvs release -d ls</userinput></screen>
+&prompt.user; <userinput>cvs release -d ls</userinput>
+&prompt.user; <userinput>cvs logout</userinput>
+	  </screen>
 	</example>
 
 	<example>
 	  <title>Creating a list of changes (as unidiffs) to &man.ls.1;</title>
 
 	  <screen>
-&prompt.user; <userinput>setenv CVSROOT anoncvs@anoncvs.FreeBSD.org:/cvs</userinput>
-&prompt.user; <userinput>cvs rdiff -u -rRELENG_2_2_2_RELEASE -rRELENG_2_2_6_RELEASE ls</userinput></screen>
+&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs</userinput>
+&prompt.user; <userinput>cvs login</userinput>
+<emphasis>At the prompt, enter the password</emphasis> <quote>anoncvs</quote>.
+&prompt.user; <userinput>cvs rdiff -u -rRELENG_2_2_2_RELEASE -rRELENG_2_2_6_RELEASE ls</userinput>
+&prompt.user; <userinput>cvs logout</userinput>
+	  </screen>
 	</example>
 
 	<example>
 	  <title>Finding out what other module names can be used:</title>
 	  
 	  <screen>
-&prompt.user; <userinput>setenv CVSROOT anoncvs@anoncvs.FreeBSD.org:/cvs</userinput>
+&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs</userinput>
+&prompt.user; <userinput>cvs login</userinput>
+<emphasis>At the prompt, enter the password</emphasis> <quote>anoncvs</quote>.
 &prompt.user; <userinput>cvs co modules</userinput>
 &prompt.user; <userinput>more modules/modules</userinput>
-&prompt.user; <userinput>cvs release -d modules</userinput></screen>
+&prompt.user; <userinput>cvs release -d modules</userinput>
+&prompt.user; <userinput>cvs logout</userinput>
+	  </screen>
 	</example>
       </sect3>