diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index e2bf566d05..db844f930a 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -730,11 +730,11 @@ alias scvs cvs -d user@ncvs.FreeBSD.org:/home/ncvs

You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.250 2006-12-06 00:18:17 ceri Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.251 2006-12-06 00:38:21 ceri 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.250 2006-12-06 00:18:17 ceri Exp $ line, - leaving the original $Id: article.sgml,v 1.250 2006-12-06 00:18:17 ceri Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.251 2006-12-06 00:38:21 ceri Exp $ line, + leaving the original $Id: article.sgml,v 1.251 2006-12-06 00:38:21 ceri Exp $ line intact). @@ -3389,6 +3389,20 @@ MFC after: 1 month This location is accessible from any machine on the FreeBSD cluster. + + + + I would like to mentor a new committer. What process + do I need to follow? + + + + See the New + Account Creation Procedure document on the internal + pages. + +