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

Small changes to not clutter up next commit:

Browse source 
* use corpauthor
* add 2009
* capitalize "Ports Management Team"
* the "ports frozen" announcement is also sent to ports@

Reviewed by:	trhodes, gabor, keramida
Approved by:	keramida
This commit is contained in:
Rene Ladan 2009-04-05 18:30:41 +00:00
parent e11dd15f68
commit ef332c8084
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=34043
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,11 +7,7 @@
<articleinfo>
<title>Committer's Guide</title>
<authorgroup>
<author>
<surname>The FreeBSD Documentation Project</surname>
</author>
</authorgroup>
<corpauthor>The &os; Documentation Project</corpauthor>
<pubdate>$FreeBSD$</pubdate>
@ -26,6 +22,7 @@
<year>2006</year>
<year>2007</year>
<year>2008</year>
<year>2009</year>
<holder>The FreeBSD Documentation Project</holder>
</copyright>
@ -751,11 +748,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.281 2009-01-07 20:32:16 rene Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.282 2009-04-05 18:30:41 rene 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.281 2009-01-07 20:32:16 rene Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.281 2009-01-07 20:32:16 rene Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.282 2009-04-05 18:30:41 rene Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.282 2009-04-05 18:30:41 rene Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2828,9 +2825,9 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<answer>
<para>During the ports freeze, you are not allowed to
commit anything to the tree without explicit approval
from the ports management team. <quote>Explicit
from the Ports Management Team. <quote>Explicit
approval</quote> here means that you send a patch to
the ports management team for review and get a reply
the Ports Management Team for review and get a reply
saying, <quote>Go ahead and commit it.</quote>
</para>
@ -2863,7 +2860,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
rolled.</para>
<para>When the freeze starts, there will be another
announcement to the &a.committers;, of course.</para>
announcement to the &a.ports; and &a.committers;, of course.</para>
</answer>
</qandaentry>