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

www/en/news/news.xml -> www/share/sgml/news.xml

Browse source
This commit is contained in:
Joel Dahl 2006-08-20 11:45:55 +00:00
parent 9c1d176867
commit 3a4a425a60
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=28483
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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> </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.245 2006-08-19 17:26:24 remko Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.246 2006-08-20 11:45:55 joel 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.245 2006-08-19 17:26:24 remko Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.246 2006-08-20 11:45:55 joel Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.245 2006-08-19 17:26:24 remko Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.246 2006-08-20 11:45:55 joel Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1085,7 +1085,7 @@ Host pcvs.FreeBSD.org
<listitem> <listitem>
<para>Add an entry for yourself to <para>Add an entry for yourself to
<filename>www/en/news/news.xml</filename>. Look for the other <filename>www/share/sgml/news.xml</filename>. Look for the other
entries that look like <quote>A new committer</quote> and follow the entries that look like <quote>A new committer</quote> and follow the
format.</para> format.</para>
</listitem> </listitem>