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

Update link for CVS reference information

Browse source
This commit is contained in:
Chris D. Faulhaber 2000-12-28 13:40:03 +00:00
parent 00c66e0aca
commit c04b5861e1
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=8563
2 changed files with 10 additions and 10 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

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.44 2000/11/14 11:11:56 demon Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.45 2000/12/05 21:38:53 jim Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -154,7 +154,7 @@
<para>CVS reference information, tutorials, and FAQs can also be found at: <para>CVS reference information, tutorials, and FAQs can also be found at:
<ulink <ulink
url="http://www.cyclic.com/CVS/support">http://www.cyclic.com/CVS/support</ulink></para> url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink></para>
<para>&a.des; also supplied the following <quote>mini primer</quote> for <para>&a.des; also supplied the following <quote>mini primer</quote> for
CVS.</para> CVS.</para>
@ -515,11 +515,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>

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

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.44 2000/11/14 11:11:56 demon Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.45 2000/12/05 21:38:53 jim Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -154,7 +154,7 @@
<para>CVS reference information, tutorials, and FAQs can also be found at: <para>CVS reference information, tutorials, and FAQs can also be found at:
<ulink <ulink
url="http://www.cyclic.com/CVS/support">http://www.cyclic.com/CVS/support</ulink></para> url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink></para>
<para>&a.des; also supplied the following <quote>mini primer</quote> for <para>&a.des; also supplied the following <quote>mini primer</quote> for
CVS.</para> CVS.</para>
@ -515,11 +515,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.45 2000-12-05 21:38:53 jim Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>