From ad13c1c330d8e45a79c122d14e8e63514a870170 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@FreeBSD.org>
Date: Sat, 9 Jun 2001 14:01:06 +0000
Subject: [PATCH] Link to Karl Fogel's chapters on how to use CVS.

Submitted by:	joe
---
 .../articles/committers-guide/article.sgml          | 13 ++++++++-----
 .../articles/committers-guide/article.sgml          | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 3dc5bb33e2..d815e9ef34 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.69 2001/06/02 05:45:59 dd Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.70 2001/06/03 21:39:50 dd Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -155,7 +155,10 @@
 
     <para>CVS reference information, tutorials, and FAQs can also be found at:
       <ulink
-	url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink></para>
+	url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink>, 
+      and the information in <ulink url="http://cvsbook.red-bean.com/cvsbook.html">Karl Fogel's
+        chapters from <quote>Open Source Development with CVS</quote></ulink> are also very
+      useful.</para>
 
     <para>&a.des; also supplied the following <quote>mini primer</quote> for
       CVS.</para>
@@ -516,11 +519,11 @@
         </itemizedlist>
 
         <para>You'll almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> (or in FreeBSD's case,
+          of the <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> (or in FreeBSD's case,
           <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
index 3dc5bb33e2..d815e9ef34 100644
--- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.69 2001/06/02 05:45:59 dd Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.70 2001/06/03 21:39:50 dd Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -155,7 +155,10 @@
 
     <para>CVS reference information, tutorials, and FAQs can also be found at:
       <ulink
-	url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink></para>
+	url="http://www.cvshome.org/docs/index.html">http://www.cvshome.org/docs/index.html</ulink>, 
+      and the information in <ulink url="http://cvsbook.red-bean.com/cvsbook.html">Karl Fogel's
+        chapters from <quote>Open Source Development with CVS</quote></ulink> are also very
+      useful.</para>
 
     <para>&a.des; also supplied the following <quote>mini primer</quote> for
       CVS.</para>
@@ -516,11 +519,11 @@
         </itemizedlist>
 
         <para>You'll almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> (or in FreeBSD's case,
+          of the <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> (or in FreeBSD's case,
           <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.70 2001-06-03 21:39:50 dd Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>