===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/stable.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** www/stable.html	2000/05/31 20:21:43	1.3
--- www/stable.html	2000/06/11 19:29:36	1.4
***************
*** 18,60 ****
  
  <p>
  <ul><h3>Table Of Contents</h3>
! <li><a href="#whatis">What is a patch branch?</a>
! <li><a href="#getting">Getting a patch branch</a>
! <li><a href="#building">Building from a patch branch</a>
  </ul>
  </p>
  <hr>
  
  <a name="whatis"></a>
! <h3><font color=#0000e0>What is a patch branch?</font></h3>
  
  <p>
! Starting with 2.7, the OpenBSD project is providing a source
! tree that contains the patches and fixes from the
! <a href="errata.html">errata</a> and making
! it available via <a href="anoncvs.html">CVS</a> in addition to the
! current source.  Users can choose to follow either branch: current
! for those who want/need all of the latest features, and the patch
! branch for those who want to stick with releases and only require
! the fixes and patches between releases.
  
  <a name="getting"></a>
! <h3><font color=#0000e0>Getting a patch branch</font></h3>
  
  <p>
! To obtain a patch branch for a particular release of OpenBSD, you
! can either start with a source tree from the CD shipped with the release
! of OpenBSD you want to use (see <a href="orders.html">ordering</a>), or
! you can grab the whole tree from an <a href="anoncvs.html">AnonCVS</a> server.
! The instructions for getting a patch branch and staying up to date are
! described in the Getting Started section of the
  <a href="anoncvs.html#starting">AnonCVS documentation</a>.
! 
! <p>
! Please note that the patch branches are not helpful for upgrading from one
! release of OpenBSD to another, eg. to go from 2.5 to 2.6.  They only provide
! a means for staying up to date with the patches for a given release.  If
! you are trying to go from one release to another via source, please visit
  the <a href="faq/upgrade-minifaq.html">upgrade-minifaq</a>.
  
  <a name="building"></a>
--- 18,80 ----
  
  <p>
  <ul><h3>Table Of Contents</h3>
! <li><a href="#whatis">What is the patch branch?</a>
! <li><a href="#getting">Getting the patch branch</a>
! <li><a href="#building">Building from the patch branch</a>
  </ul>
  </p>
  <hr>
  
  <a name="whatis"></a>
! <h3><font color=#0000e0>What is the patch branch?</font></h3>
  
  <p>
! Starting with 2.7, OpenBSD is providing a source tree that contains
! important patches and fixes (ie. those from the
! <a href="errata.html">errata</a> plus others which are obvious and simple,
! but do not deserve a errata entry)
! and making it available via <a href="anoncvs.html">CVS</a> in addition to the
! current source.  Thus, users can choose three options :<p>
! <ul>
! <li>Stick with our latest release and apply the patches by hand.
! <li>Use the <b>patch branch</b> which the most important patches applied.
! <li>Use <b>current source</b> for all of the latest features.
! </ul>
! <p>
! The <a href="plus.html">Daily Changelog</a> details which post-release
! patches have made it into the patch branch.  As a general principle, all
! <a href="errata.html">Errata</a> entries will be merged into the patch
! branch within 48 hours of when an errata is published.  Other post release
! patches may be merged in as well, subject to a number of conditions:
! <ul>
! <li>The patches must be simple, short, and obviously 100% correct.
! <li>Errata entries are made for bugs which affect many people.  Other
!     patches may be merged into the patch branch if they affect a few
!     people in drastic ways.
! <li>Please do not ask for large subsystems or patches to be merged.
!     Maintaining the patch tree takes a lot of effort which could be
!     better spent on making our next release better. 
! <li>As an exception to the above rules, OpenSSH release versions will be
!     merged into the patch branch.
! </ul>
! <p>
  
  <a name="getting"></a>
! <h3><font color=#0000e0>Getting a stable branch</font></h3>
  
  <p>
! To obtain the patch branch for a particular release of OpenBSD, you
! can update on top of a pre-existing source tree
! (from <a href="ftp.html>FTP</a> or the <a href="orders.html:>CD</a>)
! or you can grab the source tree freshly from
! an <a href="anoncvs.html">AnonCVS</a> server.
! Instructions for getting the patch branch and staying up to date are
! described in the <b>Getting Started</b> section of the
  <a href="anoncvs.html#starting">AnonCVS documentation</a>.
! Note that patch branches do not help to upgrade from one release of
! OpenBSD to another, eg. to go from 2.5 to 2.6.  They only provide
! a means for staying up to date with the patches within a given release.
! If you are trying to go from one release to another via source, please visit
  the <a href="faq/upgrade-minifaq.html">upgrade-minifaq</a>.
  
  <a name="building"></a>
***************
*** 112,118 ****
  <hr>
  <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: stable.html,v 1.3 2000/05/31 20:21:43 ericj Exp $</small>
  </body>
  </html>
  
--- 132,138 ----
  <hr>
  <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: stable.html,v 1.4 2000/06/11 19:29:36 deraadt Exp $</small>
  </body>
  </html>