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

Add reminders to new committers to ensure that they do not omit commits

Browse source 
to files containing entity declarations.
This commit is contained in:
Ceri Davies 2004-04-20 18:43:19 +00:00
parent 34faed2813
commit b16f3e6505
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20761
1 changed files with 14 additions and 10 deletions

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

@ -678,11 +678,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.189 2004-04-20 18:35:00 ceri Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.190 2004-04-20 18:43:19 ceri 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.189 2004-04-20 18:35:00 ceri Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.190 2004-04-20 18:43:19 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.189 2004-04-20 18:35:00 ceri Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.190 2004-04-20 18:43:19 ceri Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -981,16 +981,19 @@ checkout -P</programlisting>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Add yourself to the <quote>Developers</quote> section of <para>Add your author entity to
the <ulink url="../contributors/index.html">Contributors List</ulink>
and remove yourself from the <quote>Additional
Contributors</quote> section. Once you have done that, do not
forget to add your author entity to
<filename>doc/en_US.ISO8859-1/share/sgml/authors.ent</filename>; <filename>doc/en_US.ISO8859-1/share/sgml/authors.ent</filename>;
use the other entries as example.</para> this should be done first since an omission of this commit will
cause the next commits to break the doc/ build.</para>
<para>This is a relatively easy task, but remains a good first test of <para>This is a relatively easy task, but remains a good first test of
your CVS skills.</para> your CVS skills.</para>
<listitem>
<para>Add yourself to the <quote>Developers</quote> section of
the <ulink url="../contributors/index.html">Contributors List</ulink>
and remove yourself from the <quote>Additional
Contributors</quote> section.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1003,7 +1006,8 @@ checkout -P</programlisting>
<listitem> <listitem>
<para>You should add your PGP or GnuPG key to <para>You should add your PGP or GnuPG key to
<filename>doc/share/pgpkeys</filename> (and if you do not <filename>doc/share/pgpkeys</filename> (and if you do not
have a key, you should create one).</para> have a key, you should create one). Do not forget to commit
the updated <filename>doc/share/pgpkeys/pgpkeys.ent</filename>.</para>
<para>&a.des; has <para>&a.des; has
written a shell script to make this extremely simple. See the written a shell script to make this extremely simple. See the