diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index f40ae532a5..f9c3defb30 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -730,11 +730,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.253 2007-01-10 14:38:29 rwatson Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.254 2007-01-10 15:13:57 rwatson 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.253 2007-01-10 14:38:29 rwatson Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.253 2007-01-10 14:38:29 rwatson Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.254 2007-01-10 15:13:57 rwatson Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.254 2007-01-10 15:13:57 rwatson Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -1245,7 +1245,7 @@ Host pcvs.FreeBSD.org
       in some cases, compilation must be conditional or even disabled
       by default.  For example, the GENERIC kernel must be compiled
       under only licenses identical to or substantially similar to the
-      BSD license.  GPL, APSL, CDSL, etc, licensed software must not be
+      BSD license.  GPL, APSL, CDDL, etc, licensed software must not be
       compiled into GENERIC.</para>
 
     <para>Developers are reminded that in open source, getting "open"