diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 6bd4cc0fec..91af421771 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -191,6 +191,36 @@ Committers are encouraged to seek review for their work as part of the normal development process, regardless of the area of the tree where the work is occurring. + + + Policy for <filename>doc/</filename> committer activity + in <filename>src/</filename> + + + doc committers may commit documentation + changes to src files, such as man pages, READMEs, fortune + databases, calendar files, and comment fixes without + approval from a src committer, subject to the normal care + and tending of commits. + + doc committers may commit minor src changes + and fixes, such as build fixes, small features, etc, with an + "Approved by" from a src committer. + + doc committers may seek an upgrade to a src + commit bit by acquiring a mentor, who will propose the doc + committer to core. When approved, they will be added to + 'access' and the normal mentoring period will ensue, which + will involve a continuing of Approved by for + some period. + + "Approved by" is only acceptable from + non-mentored src committers -- mentored committers can + provide a "Reviewed by" but not an "Approved + by". + + + @@ -685,11 +715,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.202 2004-07-27 14:34:49 krion Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.203 2004-08-02 04:15:08 murray 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.202 2004-07-27 14:34:49 krion Exp $ line, - leaving the original $Id: article.sgml,v 1.202 2004-07-27 14:34:49 krion Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.203 2004-08-02 04:15:08 murray Exp $ line, + leaving the original $Id: article.sgml,v 1.203 2004-08-02 04:15:08 murray Exp $ line intact).