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

Note that ports/INDEX is only updated for each relase now.

Browse source 
PR:		docs/66777
Submitted by:	krion
Discussed with:	krion, kris
This commit is contained in:
Simon L. B. Nielsen 2004-05-22 12:57:44 +00:00
parent 0ea43bdaf2
commit 1fcf2be98e
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20967
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -685,11 +685,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.192 2004-05-21 17:08:23 jkoshy Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon 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.192 2004-05-21 17:08:23 jkoshy Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.192 2004-05-21 17:08:23 jkoshy Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -2805,8 +2805,8 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<answer> <answer>
<para>No. The ports manager will regenerate the <para>No. The ports manager will regenerate the
<filename>INDEX</filename> and commit it every few <filename>INDEX</filename> and commit it for each
days.</para> &os; release.</para>
</answer> </answer>
</qandaentry> </qandaentry>