diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index f730294255..2722e67321 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -579,11 +579,11 @@
You will almost certainly get a conflict because
- of the $Id: article.sgml,v 1.127 2002-06-21 01:22:10 jmallett Exp $ (or in FreeBSD's case,
+ of the $Id: article.sgml,v 1.128 2002-07-02 00:04:18 trhodes 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.127 2002-06-21 01:22:10 jmallett Exp $ line, leaving the original
- $Id: article.sgml,v 1.127 2002-06-21 01:22:10 jmallett Exp $ line intact).
+ the second $Id: article.sgml,v 1.128 2002-07-02 00:04:18 trhodes Exp $ line, leaving the original
+ $Id: article.sgml,v 1.128 2002-07-02 00:04:18 trhodes Exp $ line intact).
@@ -2457,28 +2457,34 @@ cvs add: use 'cvs commit' to add this file permanently
Submitted by:
The name and e-mail address of the person that
- submitted the fix.
+ submitted the fix; for committers, just the username on
+ the FreeBSD cluster.
Reviewed by:
The name and e-mail address of the person or people
- that reviewed the change. If a patch was submitted to a
- mailing list for review, and the review was favorable,
- then just include the list name.
+ that reviewed the change; for committers, just the
+ username on the FreeBSD cluster. If a patch was
+ submitted to a mailing list for review, and the review
+ was favorable, then just include the list name.
Approved by:
The name and e-mail address of the person or people
- that approved the change. It is customary to get prior
- approval for a commit if it is to an area of the tree to
- which you do not usually commit. In addition, during the
- run up to a new release all commits
+ that approved the change; for committers, just the
+ username on the FreeBSD cluster. It is customary to get
+ prior approval for a commit if it is to an area of the
+ tree to which you do not usually commit. In addition,
+ during the run up to a new release all commits
must be approved by the release
- engineer. If these are your first commits then you should
- have passed them past your mentor first for approval, and
- you should list your mentor.
+ engineering team. If these are your first commits then
+ you should have passed them past your mentor first, and
+ you should list your mentor, as in
+ ``username-of-mentor
+ (mentor)''.
+