diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index a4476a2741..3eaa44a6da 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -348,20 +348,24 @@
 	  <listitem>
 	    <para><emphasis>France</emphasis>:
 	      :pserver:anoncvs@anoncvs.fr.FreeBSD.org:/home/ncvs
-	      (pserver (password <quote>anoncvs</quote>), ssh (no password))
-	    </para>
+	      (For pserver mode, use <command>cvs login</command> and
+	      enter the password <quote>anoncvs</quote> when prompted.
+	      For ssh, no password is required.)</para>
 	  </listitem>
+	  <!--
 	  <listitem>
 	    <para><emphasis>Japan</emphasis>:
 	      :pserver:anoncvs@anoncvs.jp.FreeBSD.org:/home/ncvs
 	      (Use <command>cvs login</command> and enter the password
 	      <quote>anoncvs</quote> when prompted.)</para>
 	  </listitem>
+	  -->
 	  <listitem>
 	    <para><emphasis>Taiwan</emphasis>:
 	      :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs
-	      (pserver (use <command>cvs login</command> and enter any
-	      password when prompted), ssh (no password))</para>
+	      (For pserver mode, use <command>cvs login</command> and
+	      enter any password when prompted. For ssh, no password
+	      is required.)</para>
 
 	      <programlisting>SSH2 HostKey: 1024 02:ed:1b:17:d6:97:2b:58:5e:5c:e2:da:3b:89:88:26 /etc/ssh/ssh_host_rsa_key.pub
 SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub</programlisting>
@@ -369,8 +373,8 @@ SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_
 	  </listitem>
 	  <listitem>
 	    <para><emphasis>USA</emphasis>:
-	      anoncvs@anoncvs1.FreeBSD.org:/home/ncvs (ssh2 only - no
-	      password)</para>
+	      anoncvs@anoncvs1.FreeBSD.org:/home/ncvs (For ssh, use ssh
+	      version 2 and no password is required.)</para>
 
 	    <programlisting>SSH2 HostKey: 2048 53:1f:15:a3:72:5c:43:f6:44:0e:6a:e9:bb:f8:01:62 /etc/ssh/ssh_host_dsa_key.pub</programlisting>