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

Extend the conventions and traditions section with a note about

Browse source 
the developers.sgml file.
This commit is contained in:
Joel Dahl 2006-10-09 19:28:30 +00:00
parent ddb360067d
commit 3e78e2da2b
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=28821
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -729,11 +729,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.248 2006-09-06 09:22:10 pav Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.249 2006-10-09 19:28:30 joel 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.248 2006-09-06 09:22:10 pav Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.248 2006-09-06 09:22:10 pav Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.249 2006-10-09 19:28:30 joel Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.249 2006-10-09 19:28:30 joel Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1076,6 +1076,11 @@ Host pcvs.FreeBSD.org
your CVS skills.</para>
</listitem>
<listitem>
<para>Also add your author entity to
<filename>www/en/developers.sgml</filename>.</para>
</listitem>
<listitem>
<para>Add yourself to the <quote>Developers</quote> section of
the <ulink url="&url.articles.contributors;/index.html">Contributors List</ulink>