===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/anoncvs.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -c -r1.38 -r1.39
*** www/anoncvs.html	1997/11/30 15:22:50	1.38
--- www/anoncvs.html	1997/12/01 10:51:02	1.39
***************
*** 50,56 ****
  <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>
  People who own an OpenBSD CD may have seen the CVS/ dirs on it.
--- 50,56 ----
  <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, preserving an unmodified copy of your version and continuing
  to update any other source modules you requested.
  <p>
  People who own an OpenBSD CD may have seen the CVS/ dirs on it.
***************
*** 96,102 ****
  <DD>Bring your working directory up to date with the repository.
  </dl>
  <p>
! To summarize, the real 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
--- 96,102 ----
  <DD>Bring your working directory up to date with the repository.
  </dl>
  <p>
! To summarize, the real strength 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
***************
*** 268,274 ****
  </pre>
  
  <p>
! Here is how someone using anoncvs regularily would update his
  source tree:
  <ul><li>First, startout by `get'-ing an initial tree:
  
--- 268,274 ----
  </pre>
  
  <p>
! Here is how someone using anoncvs regularly would update his
  source tree:
  <ul><li>First, startout by `get'-ing an initial tree:
  
***************
*** 285,291 ****
  # cvs -q up -PAd src
  </pre>
  
! Everytime you ran this it would syncronize your /usr/src tree. It would
  not destroy any of your local changes, rather it would attempt to merge
  changes in. If you use obj directories (not obj symbolic links) you may
  wish to append "-I obj" to the cvs command line, this will keep cvs from
--- 285,291 ----
  # cvs -q up -PAd src
  </pre>
  
! Everytime you ran this it would synchronize your /usr/src tree. It would
  not destroy any of your local changes, rather it would attempt to merge
  changes in. If you use obj directories (not obj symbolic links) you may
  wish to append "-I obj" to the cvs command line, this will keep cvs from
***************
*** 348,358 ****
  <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
  problem like a firewall or imperfect protocol emulator such as slirp
  may prevent you from using rsh.
  The alternative is a to use a "secure shell" connection using
! <a href=http://www.cs.hut.fi/ssh>ssh</a>.  This is a commerical product
  offered by <a href=http://www.ssh.fi>SSH Communications Security Ltd</a>,
  however they make a free unix version available that can be easily
  installed under OpenBSD.  You can download the unix version from
--- 348,358 ----
  <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 support rsh for security reasons or a local
  problem like a firewall or imperfect protocol emulator such as slirp
  may prevent you from using rsh.
  The alternative is a to use a "secure shell" connection using
! <a href=http://www.cs.hut.fi/ssh>ssh</a>.  This is a commercial product
  offered by <a href=http://www.ssh.fi>SSH Communications Security Ltd</a>,
  however they make a free unix version available that can be easily
  installed under OpenBSD.  You can download the unix version from
***************
*** 408,414 ****
  <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.38 1997/11/30 15:22:50 deraadt Exp $</small>
  
  </body>
  </html>
--- 408,414 ----
  <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.39 1997/12/01 10:51:02 todd Exp $</small>
  
  </body>
  </html>