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

Correct the Committer Guide:

Browse source 
newsflash.sgml is now news.xml

Discussed with:	nik
This commit is contained in:
Mike Barcroft 2001-08-22 23:16:09 +00:00
parent 8a0bc3bfb8
commit 5c3cd78ad4
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=10442
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.81 2001/07/16 15:33:07 nik Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.82 2001/08/06 22:43:27 murray Exp $</pubdate>
<copyright>
<year>1999</year>
@ -522,11 +522,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.82 2001-08-06 22:43:27 murray Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.83 2001-08-22 23:16:09 mike Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.82 2001-08-06 22:43:27 murray Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.82 2001-08-06 22:43:27 murray Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.83 2001-08-22 23:16:09 mike Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.83 2001-08-22 23:16:09 mike Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -825,7 +825,7 @@ checkout -P</programlisting>
<listitem>
<para>Add an entry for yourself to
<filename>www/en/news/newsflash.sgml</filename>. Look for the other
<filename>www/en/news/news.xml</filename>. Look for the other
entries that look like <quote>A new committer</quote> and follow the
format.</para>
</listitem>