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

Move one item in the ports section about documentation for new categories.

Browse source 
This will make the next change clearer.
This commit is contained in:
Mark Linimon 2007-06-30 02:11:52 +00:00
parent e9b9b58b64
commit 0bfa1dfac7
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=30371
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -745,11 +745,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.264 2007-06-21 04:39:45 linimon Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.265 2007-06-30 02:11:52 linimon 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.264 2007-06-21 04:39:45 linimon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.264 2007-06-21 04:39:45 linimon Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.265 2007-06-30 02:11:52 linimon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.265 2007-06-30 02:11:52 linimon Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2971,6 +2971,12 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
following:</para>
<itemizedlist>
<listitem>
<para>the section of the Handbook that lists the
<ulink url="&url.books.handbook;/cvsup.html#CVSUP-COLLEC">
cvsup collections</ulink>.</para>
</listitem>
<listitem>
<para>the
<ulink url="&url.books.porters-handbook;/makefile-categories.html#PORTING-CATEGORIES">
@ -2985,12 +2991,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<filename>www/en/ports/categories.descriptions</filename>.
</para>
</listitem>
<listitem>
<para>the section of the Handbook that lists the
<ulink url="&url.books.handbook;/cvsup.html#CVSUP-COLLEC">
cvsup collections</ulink>.</para>
</listitem>
</itemizedlist>
<para>(Note: these are
in the docs, not the ports, repository). If you