os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Document policy regarding doc/ committers who want to commit to src/.

Browse source 
Approved by:	core@ (June 2004)
This commit is contained in:
Murray Stokely 2004-08-02 04:15:08 +00:00
parent 5bb642d018
commit 81a0eb646c
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=21758
1 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

36
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -191,6 +191,36 @@
<para>Committers are encouraged to seek review for their work as part <para>Committers are encouraged to seek review for their work as part
of the normal development process, regardless of the area of the of the normal development process, regardless of the area of the
tree where the work is occurring.</para> tree where the work is occurring.</para>
<sect2>
<title>Policy for <filename>doc/</filename> committer activity
in <filename>src/</filename></title>
<itemizedlist>
<listitem><para>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.</para></listitem>
<listitem><para>doc committers may commit minor src changes
and fixes, such as build fixes, small features, etc, with an
"Approved by" from a src committer.</para></listitem>
<listitem><para>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 <quote>Approved by</quote> for
some period.</para></listitem>
<listitem><para>"Approved by" is only acceptable from
non-mentored src committers -- mentored committers can
provide a "Reviewed by" but not an "Approved
by".</para></listitem>
</itemizedlist>
</sect2>
</sect1> </sect1>
<sect1 id="cvs.operations"> <sect1 id="cvs.operations">
@ -685,11 +715,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.202 2004-07-27 14:34:49 krion Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.203 2004-08-02 04:15:08 murray Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.202 2004-07-27 14:34:49 krion Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.203 2004-08-02 04:15:08 murray Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.202 2004-07-27 14:34:49 krion Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.203 2004-08-02 04:15:08 murray Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>