diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index b6a72c3977..b7bb7d06f9 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.235 2005-11-29 02:54:43 linimon Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.236 2006-02-20 07:34:48 joel 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.235 2005-11-29 02:54:43 linimon Exp $ line, - leaving the original $Id: article.sgml,v 1.235 2005-11-29 02:54:43 linimon Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.236 2006-02-20 07:34:48 joel Exp $ line, + leaving the original $Id: article.sgml,v 1.236 2006-02-20 07:34:48 joel Exp $ line intact). @@ -1519,6 +1519,7 @@ docs:Documentation Bug:freebsd-doc: &a.scottl; &a.kensmith; &a.hrs; + &a.mux; These are the members of the &a.re;. This team is diff --git a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml index ff42beb122..aa77bfe9da 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml @@ -241,6 +241,10 @@ following delegated individuals: + + &a.mux; + + &a.scottl;