===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/anoncvs.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- www/anoncvs.html	1997/06/13 02:22:24	1.14
+++ www/anoncvs.html	1997/06/13 08:12:26	1.15
@@ -14,23 +14,75 @@
 
 <img alt="[OpenBSD]" SRC="images/smalltitle.gif">
 
+<h1>OpenBSD</h1>
+<hr>
+<h3>Anonymous CVS Access:</h3>
 <p>
-<h3>CVS Access:</h3>
-CVS is used to manage the OpenBSD source tree. This allows
-developers to work on a local source tree and commit their changes when
-ready.  Also <strong>anyone</strong> can edit source files on their
-local machines, and automatically track and merge in any changes made
-in the OpenBSD CVS repository. Additionally they can easily see the
-logs of, check out, or "diff" the source files in the OpenBSD source
-tree.
+Anonymous CVS is a method of keeping your local copy of the OpenBSD source
+tree up to date with respect to changes made to current OpenBSD sources.
 </p>
-
 <p>
-Most importantly, the <strong>anoncvs</strong> service does NOT
-delete the changes you make in your local copy of the source tree --
-read on for more details!
+The major advantage of Anonymous CVS over other source code update
+techniques is that it works directly against a central source code
+repository or mirror.  This means that you have the full set of CVS
+commands available to control merging and updating your changes with
+other source changes and for performing diff's, change histories
+and other queries against the central repository.
 </p>
+<h3>CVS:</h3>
+CVS is the source code control system used to manage the OpenBSD source tree.
+It implements a central repository for all officially relased source code
+and changes, while permitting developers to maintain local copies of the
+source code with their working changes.  Developers with "write access"
+can commit changes directly to the OpenBSD source tree, while "Anonymous
+CVS" users have "read access" and can keep their local copies of the source
+up to date and issue queries against the central depository.
+</p>
+<p>
+The major strength of CVS is that it has the ability to preform intelligent
+merges of changes to the central repository with changes that you make to
+your local copy.  This means that if you make a change to a module and
+perform an update, your changes are not "blown away", rather CVS makes
+best efforts to merge the changes made to the central sources with changes
+you've made to your local copy.
+</p>
+<p>
+In the event that the changes can't be completely merged, CVS provides a
+"soft fallback", in terms of providing you with annotated changes to your
+local copy, preeserving an unmodified copy of your version and continuing
+to update any other source modules you requested.
+</p>
+<h4>CVS COMMAND SUMMARY</h4>
+<dl>
+<DT>add
+<dd>Add a new file or directory to the repository.
+<dt>get
+<dd>Make a working directory of source files for editing.
+<dt>commit
+<dd>Apply changes to the source repository (write access)
+<dt>diff
+<dd>Show differences between local files and the source repository.
+<dt>history
+<dd>Show reports on cvs commands against the source repository.
+<dt>log
+<dd>Display CVS log information.
+<dt>rdiff
+<dd>Prepare a collection of diffs reflecting changes between release.
+<dt>status
+<dd>Show current status of files in the repository and local copies.
+<dt>update
+<DD>Bring your working directory up to date with the repository.
+</dl>
+<p>
+To summarize, the reaal strengh of using Anonymous CVS is that it is
+a "tolerant" source code control system - it <strong>respects</strong>
+changes that you have made to your local sources and makes <strong>
+"best efforts"</strong> to update your entire source tree, rather than
+leaving you a list of arcane problems that have to be resolved before
+continuing.
+</p>
 
+<h3>Using Anonymous CVS:</h3>
 <p>
 The latest version of CVS is available at
 <a href=ftp://ftp.cyclic.com/pub/cvs/>Cyclic</a>.
@@ -209,7 +261,7 @@
 </p>
 
 <p>
-<strong>Anoncvs rsh vs. ssh</strong>
+<strong>Anoncvs: rsh vs. ssh</strong>
 <br>
 By default, the CVS client uses rsh to talk to the CVS server.  Many
 of the CVS sites no longer supprt rsh for security reasons or a local
@@ -279,7 +331,7 @@
 <hr>
 <a href=index.html><img 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.14 1997/06/13 02:22:24 downsj Exp $</small>
+<br><small>$OpenBSD: anoncvs.html,v 1.15 1997/06/13 08:12:26 grr Exp $</small>
 
 </body>
 </html>