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

Partially back-out v. 1.220 and note that INDEX is not in CVS anymore.

Browse source 
Requested by:	krion
English clue:	ceri
This commit is contained in:
Simon L. B. Nielsen 2005-02-27 13:41:00 +00:00
parent f44c8792b5
commit e70f8b43c8
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=23928
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -728,11 +728,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.220 2005-02-27 12:56:02 simon Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.221 2005-02-27 13:41:00 simon 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.220 2005-02-27 12:56:02 simon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.220 2005-02-27 12:56:02 simon Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.221 2005-02-27 13:41:00 simon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.221 2005-02-27 13:41:00 simon Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2854,6 +2854,21 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
</answer>
</qandaentry>
<qandaentry>
<question>
<para>I added a new port. Do I need to add it to the
<filename>INDEX</filename>?</para>
</question>
<answer>
<para>No, <filename>INDEX</filename> is no longer stored
in the CVS repository. The file can either be generated
by the <command>make index</command>, or a pre-generated
version can be downloaded with <command>make
fetchindex</command>.</para>
</answer>
</qandaentry>
<qandaentry>
<question>
<para>Are there any other files I am not allowed to