diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 66b03754f7..4ac3b2632a 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -585,11 +585,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.105 2002-03-27 11:40:23 brian Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.106 2002-03-27 12:40:02 murray 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.105 2002-03-27 11:40:23 brian Exp $ line, leaving the original - $Id: article.sgml,v 1.105 2002-03-27 11:40:23 brian Exp $ line intact). + the second $Id: article.sgml,v 1.106 2002-03-27 12:40:02 murray Exp $ line, leaving the original + $Id: article.sgml,v 1.106 2002-03-27 12:40:02 murray Exp $ line intact). @@ -2293,6 +2293,20 @@ docs:Documentation Bug:nik: all products on the site. + + + A Free 4-CD Set Subscription + + + FreeBSD Mall, + Inc. offers a free subscription of the official + 4-CD set to all FreeBSD committers. Information about how + to obtain your free CD is mailed to + developers@FreeBSD.org following each major + release. + + +