diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index afb740f7ed..762cfd8a80 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -685,11 +685,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.192 2004-05-21 17:08:23 jkoshy Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon 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.192 2004-05-21 17:08:23 jkoshy Exp $ line, - leaving the original $Id: article.sgml,v 1.192 2004-05-21 17:08:23 jkoshy Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $ line, + leaving the original $Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $ line intact). @@ -2805,8 +2805,8 @@ docs:Documentation Bug:freebsd-doc: No. The ports manager will regenerate the - INDEX and commit it every few - days. + INDEX and commit it for each + &os; release.