diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index f61bfae503..ce699bdb78 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -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.239 2006-05-19 17:29:37 bmah Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl 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.239 2006-05-19 17:29:37 bmah Exp $ line, - leaving the original $Id: article.sgml,v 1.239 2006-05-19 17:29:37 bmah Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl Exp $ line, + leaving the original $Id: article.sgml,v 1.240 2006-06-02 20:50:17 scottl Exp $ line intact). @@ -1515,8 +1515,6 @@ docs:Documentation Bug:freebsd-doc: &a.murray; &a.dwhite; &a.rwatson; - &a.jhb; - &a.scottl; &a.kensmith; &a.hrs; &a.mux;