===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/anoncvs.html,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- www/anoncvs.html	2002/01/29 22:08:36	1.162
+++ www/anoncvs.html	2002/02/02 05:10:32	1.163
@@ -509,6 +509,13 @@
 <h3><a name="EXAMPLE"><font color="#0000e0">Example usages for cvs(1)</font>
 </a></h3>
 
+<P>
+NOTICE: If want to update a branch (such as a patch branch)
+to <i>current</i>, you would add the the <code>-A</code>
+flag to cvs, but this flag is of little use otherwise.   Some older
+versions of the OpenBSD documentation recommended use of this flag
+in many examples. We no longer recommend this flag unless absolutely necessary.
+
 <p>
 A sample use of an anoncvs server would be:
 <pre>
@@ -549,7 +556,7 @@
 <pre>
 	# <strong>setenv CVSROOT anoncvs@anoncvs.ca.openbsd.org:/cvs</strong>
 	# <strong>cd /usr</strong>
-	# <strong>cvs -q get -PA src</strong>
+	# <strong>cvs -q get -P src</strong>
 </pre>
 
 <p> (If you are following the patch branch for 2.9):
@@ -564,7 +571,7 @@
 <p> (If you are following <i>current</i>):
 <pre>
 	# <strong>cd /usr/src</strong>
-	# <strong>cvs -q up -PAd</strong>
+	# <strong>cvs -q up -Pd</strong>
 </pre>
 
 <p> (If you are following the patch branch for 2.9):
@@ -581,24 +588,14 @@
 encounter which are not in the repository.
 
 <p>
-<li> NOTES: if you are updating a source tree that you initially fetched
+<li> NOTE:
+If you are updating a source tree that you initially fetched
 from a different server, or from a CD, you <strong>must</strong>
-add the <em>-d $CVSROOT</em> options to cvs.  If you are following
-a patch branch, be sure to always <strong>omit</strong> the <code>-A</code>
-flag to cvs, or you may find yourself tracking <i>current</i> instead.
-
-<p> (If you are following <i>current</i>):
+add the <em>-d $CVSROOT</em> options to cvs.
 <pre>
 	# <strong>cd /usr/src</strong>
-	# <strong>cvs -d $CVSROOT -q up -PAd</strong>
-</pre>
-
-<p> (If you are following a patch branch):
-<pre>
-	# <strong>cd /usr/src</strong>
 	# <strong>cvs -d $CVSROOT -q up -Pd</strong>
 </pre>
-
 </li>
 </ul>
 
@@ -609,7 +606,7 @@
 <pre>
 	# <strong>setenv CVSROOT anoncvs@anoncvs.ca.openbsd.org:/cvs</strong>
 	# <strong>cd /usr</strong>
-	# <strong>cvs -q get -PA ports</strong>
+	# <strong>cvs -q get -P ports</strong>
 </pre>
 </li>
 <p> (If you are following the patch branch for 2.9):
@@ -622,7 +619,7 @@
 <p> (If you are following <i>current</i>):
 <pre>
 	# <strong>cd /usr</strong>
-	# <strong>cvs -q up -PAd ports</strong>
+	# <strong>cvs -q up -Pd ports</strong>
 </pre>
 <p> (If you are following the patch branch for 2.9):
 <pre>
@@ -653,28 +650,30 @@
 <h4>X11 Source tree</h4>
 
 <p>
-Anoncvs mirrors also carry the OpenBSD X11 source tree. You can adapt
-the recipe above to update your X11 source tree from the second CD.
-Either copy or use a union mount to get the X11 sources in <i>/usr/X11</i>:
+Anoncvs mirrors also carry the OpenBSD X11 (XFree86) source tree. You can adapt
+the recipe above to update your XFree86 source tree from the second CD.
+You can copy or download the XFree86 3 source tree with the X11 cvs module,
+although the current module containing XFree86 4 is XF4.
+There are two ways to get the XF4 sources to <i>/usr/XF4</i>:
 
 <ul>
-<li>copy the tree off it (assuming the 2nd CD is mounted on /mnt):
+<li>copy the tree off the CD (assuming the 2nd CD is mounted on /mnt):
 <pre>
-        # <strong>cd /mnt; cp -Rp X11 /usr</strong>
+        # <strong>cd /mnt; cp -Rp XF4 /usr</strong>
 </pre>
 <li>use a union mount with the CD below a writable directory.
 <pre>
-        # <strong>mount -t union -o -b /mnt/X11 /usr/X11</strong>
+        # <strong>mount -t union -o -b /mnt/XF4 /usr/XF4</strong>
 </pre>
 </ul>
 
-After this, <i>/usr/X11</i> will be ready to be used by cvs. You can for
+After this, <i>/usr/XF4</i> will be ready to be used by cvs. You can for
 example update it to -current source (assuming you've already set
 the <var>CVSROOT</var> environment variable):
 
 <pre>
-        # <strong>cd /usr/X11</strong>
-        # <strong>cvs -q update -PAd</strong>
+        # <strong>cd /usr/XF4</strong>
+        # <strong>cvs -q update -Pd</strong>
 </pre>
 
 <p>
@@ -786,7 +785,7 @@
 <a href="index.html"><img height="24" width="24" src="back.gif" border="0" 
 alt="OpenBSD"></a> 
 <a href="mailto:www@openbsd.org">www@openbsd.org</a>
-<br><small>$OpenBSD: anoncvs.html,v 1.162 2002/01/29 22:08:36 horacio Exp $
+<br><small>$OpenBSD: anoncvs.html,v 1.163 2002/02/02 05:10:32 chris Exp $
 </small>
 
 </body>