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

Move a paragraph in preparation for other work. No content change.

Browse source
This commit is contained in:
Mark Linimon 2007-06-21 04:22:41 +00:00
parent 9430268b99
commit fab9d14788
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=30313
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -731,11 +731,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.262 2007-06-18 09:34:27 pav Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.263 2007-06-21 04:22:41 linimon Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
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.262 2007-06-18 09:34:27 pav Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.262 2007-06-18 09:34:27 pav Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.263 2007-06-21 04:22:41 linimon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.263 2007-06-21 04:22:41 linimon Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1179,6 +1179,11 @@ Host pcvs.FreeBSD.org
</listitem>
</itemizedlist>
<para>All <filename>src</filename> 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.</para>
<para>All new committers also have a mentor assigned to them for
the first few months. Your mentor is responsible for teaching
you the rules and conventions of the project and guiding your
@ -1191,11 +1196,6 @@ Host pcvs.FreeBSD.org
approval, and you should document that approval with an
<literal>Approved by:</literal> line in the commit
message.</para>
<para>All <filename>src</filename> 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.</para>
</sect1>
<sect1 id="pref-license">