diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 73226a69c2..240f773876 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -97,7 +97,7 @@
Noteworthy CVS Tags
- RELENG_4 (4.X-STABLE), RELENG_5 (5.X-STABLE), HEAD (-CURRENT)
+ RELENG_4 (4.X-STABLE), RELENG_5 (5.X-STABLE), RELENG_6 (6.X-STABLE), HEAD (-CURRENT)
@@ -729,11 +729,11 @@ alias scvs env CVS_RSH=ssh cvs -d user@ncvs.FreeBSD.o
You will almost certainly get a conflict because
- of the $Id: article.sgml,v 1.233 2005-11-09 22:20:49 linimon Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.234 2005-11-16 16:09:53 brueffer Exp $ (or in FreeBSD's case,
$FreeBSD$)
lines, so you will have to edit the file to resolve the conflict
- (remove the marker lines and the second $Id: article.sgml,v 1.233 2005-11-09 22:20:49 linimon Exp $ line,
- leaving the original $Id: article.sgml,v 1.233 2005-11-09 22:20:49 linimon Exp $ line intact).
+ (remove the marker lines and the second $Id: article.sgml,v 1.234 2005-11-16 16:09:53 brueffer Exp $ line,
+ leaving the original $Id: article.sgml,v 1.234 2005-11-16 16:09:53 brueffer Exp $ line intact).