===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/anoncvs.html,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- www/anoncvs.html	2016/09/09 14:31:25	1.463
+++ www/anoncvs.html	2016/09/20 01:01:12	1.464
@@ -12,7 +12,7 @@
 <link rel="stylesheet" type="text/css" href="openbsd.css">
 <link rel="canonical" href="https://www.openbsd.org/anoncvs.html">
 <style type="text/css">
-  h3 { color: #0000e0; }
+  h3, h4 { color: #0000e0; }
 </style>
 </head>
 
@@ -89,9 +89,10 @@
 # <b>tar xzf /tmp/ports.tar.gz</b>
 </pre></blockquote>
 
-<h3 id="using">Using CVS to get and update your source tree</h3>
+<h3 id="using">Using CVS to get and update your source trees</h3>
 
-CVS was designed to be a simple way to retrieve and update your sources.
+<a href="http://man.openbsd.org/cvs">cvs(1)</a> was designed to be a simple way
+to retrieve and update your sources.
 You must first decide whether you want to track <i>-current</i> or a
 <a href="stable.html">patch branch</a>.
 The current tree has all of the up to the minute changes,
@@ -106,11 +107,22 @@
 If you begin with <tt>src.tar.gz</tt> and <tt>sys.tar.gz</tt> as mentioned
 above, you can skip the initial <tt>get</tt> and proceed to updating.
 
-<ul>
-<li>First, start out by getting an initial tree (the following commands assume
-that your user is member of the <tt>wsrc</tt> group):
 
 <p>
+<b>Warning:</b>
+When using cvs, you should take care that your current directory is either the
+root of the tree you are referencing or in a separate place such as
+<tt>/tmp</tt>.
+Some commands, such as <tt>cvs get</tt>, can create an arbitrary sub-tree in the
+current directory, and a subsequent update will recursively flesh out this
+sub-tree.
+
+<h4>Getting an initial tree</h4>
+
+The following commands assume that your user is member of the <tt>wsrc</tt>
+group:
+
+<p>
 If you are following <i>current</i>:
 
 <blockquote><pre>
@@ -145,12 +157,11 @@
 
 <blockquote><pre>
 Are you sure you want to continue connecting (yes/no)? <b>yes</b>
-Warning: Permanently added 'anoncvs.spacehopper.org' (ED25519) to the list of known hosts.</b>
+Warning: Permanently added 'anoncvs.spacehopper.org' (ED25519) to the list of known hosts.
 </pre></blockquote>
 
-<li> Any time afterwards, to update this tree:
+<h4>Updating an existing tree</h4>
 
-<p>
 If you are following <i>current</i>:
 
 <blockquote><pre>
@@ -169,8 +180,8 @@
 It would not destroy any of your local changes; rather it would attempt
 to merge changes in.
 
-<p>
-<li> NOTE:
+<h4>Changing the server</h4>
+
 If you are updating a source tree that you initially fetched
 from a different server, or from a tar file, you <b>must</b>
 add the <em>-d [cvsroot]</em> option to cvs.
@@ -179,11 +190,13 @@
 $ <b>cd /usr/src</b>
 $ <b>cvs -d anoncvs@anoncvs.ca.openbsd.org:/cvs -q up -Pd</b>
 </pre></blockquote>
-</ul>
 
-To <a name="ports">use</a> <a href="faq/ports">ports</a>, it is similar to src.
+<h4>Getting the ports and xenocara trees</h4>
+
 Make sure your user is member of the <tt>wsrc</tt> group and that
 <tt>/usr/ports</tt> is group writable by <tt>wsrc</tt>.
+Replace <tt>ports</tt> with <tt>xenocara</tt> throughout to get or update a
+xenocara tree.
 
 <ul><li>
 
@@ -225,26 +238,15 @@
 cvs' output.
 For those who like to see screenfulls of output, it can be omitted.
 
-<p>
-To make a diff of a locally patched module (here <i>cd.c</i>) to include with
+<h4>Creating a diff</h4>
+
+To make a diff of a locally patched module (here <tt>cd.c</tt>) to include with
 a bug report:
 
 <blockquote><pre>
 $ <b>cd /usr</b>
 $ <b>cvs diff -u src/sys/scsi/cd.c &gt; /tmp/patch</b>
 </pre></blockquote>
-
-The <a href="http://man.openbsd.org/cvs">cvs(1)</a> man page
-(included with the CVS sources) has much more
-information about how CVS can be used.
-
-<p>
-<b>Warning:</b>
-When using cvs, you should take care that your current directory is either
-the root of the tree you are referencing or in a separate place such as
-<tt>/tmp</tt>.
-Some commands such as "get" can create an arbitrary sub-tree in the current
-directory, and a subsequent update will recursively flesh out this sub-tree.
 
 <h3 id="EXAMPLE">Example usage for cvs(1)</h3>