diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 9b782d6be3..d6b03f33ba 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -731,11 +731,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
 	</itemizedlist>
 
 	<para>You will almost certainly get a conflict because
-	  of the <literal>$Id: article.sgml,v 1.256 2007-03-01 13:27:33 joel Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.257 2007-03-20 08:49:54 chinsan Exp $</literal> (or in FreeBSD's case,
 	  <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
 	  lines, so you will have to edit the file to resolve the conflict
-	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.256 2007-03-01 13:27:33 joel Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.256 2007-03-01 13:27:33 joel Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.257 2007-03-20 08:49:54 chinsan Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.257 2007-03-20 08:49:54 chinsan Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -1039,13 +1039,13 @@ checkout -P</programlisting>
 	  configuration into your <filename>~/.ssh/config</filename>:</para>
 
 	<programlisting>Host ncvs.FreeBSD.org
-      ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath
+      ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath
 Host dcvs.FreeBSD.org
-      ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath
+      ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath
 Host projcvs.FreeBSD.org
-      ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath
+      ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath
 Host pcvs.FreeBSD.org
-      ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath</programlisting>
+      ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath</programlisting>
 
 	<para>Now open the persistent connection to the repoman:</para>