diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index fd4f927da3..3fc7914dc3 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -678,11 +678,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.181 2004-04-01 19:43:15 hrs Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.182 2004-04-02 19:26:47 des 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.181 2004-04-01 19:43:15 hrs Exp $ line,
- leaving the original $Id: article.sgml,v 1.181 2004-04-01 19:43:15 hrs Exp $ line intact).
+ (remove the marker lines and the second $Id: article.sgml,v 1.182 2004-04-02 19:26:47 des Exp $ line,
+ leaving the original $Id: article.sgml,v 1.182 2004-04-02 19:26:47 des Exp $ line intact).
@@ -1060,15 +1060,19 @@ checkout -P
All new committers also have a mentor assigned to them for
- the first few months. Your mentor is more or less responsible for
- explaining anything which is confusing to you and is also
- responsible for your actions during this initial period. If you
- make a bogus commit, it is only going to embarrass your mentor
- and you should probably make it a policy to pass at least your
- first few commits by your mentor before committing it to the
- repository.
+ the first few months. Your mentor is responsible for teaching
+ you the rules and conventions of the project and guiding your
+ first steps in the committer community. He or she is also
+ personally responsible for your actions during this initial
+ period. Until your mentor decides (and announces with a forced
+ commit to access) that you have learned the
+ ropes and are ready to commit on your own, you should not commit
+ anything without first getting your mentor's review and
+ approval, and you should document that approval with an
+ Approved by: line in the commit
+ message.
- All commits should go to &os.current; first
+ All src commits should go to &os.current; first
before being merged to &os.stable;. No major new
features or high-risk modifications should be made to the
&os.stable; branch.