===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/stable.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- www/stable.html	2015/07/02 05:49:04	1.38
+++ www/stable.html	2016/01/31 01:13:42	1.39
@@ -42,7 +42,7 @@
 which post-release changes 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
+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.
@@ -56,8 +56,6 @@
     <i>not</i> be merged.
     In general, if it requires a man page change, it will NOT be a
     candidate for the patch branch.
-<li>As an exception to the above rules, OpenSSH release versions will be
-    merged into the patch branch.
 </ul>
 <p>
 
@@ -76,19 +74,19 @@
 <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>)
+(from <a href="ftp.html">a mirror</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, e.g. to go from 5.4 to 5.5.  They only provide
-a means for staying up to date with the patches within a given release.
+OpenBSD to another. They only provide a means for staying up to date
+with the patches within a given release.
 
 <p>
 Do not attempt to go from one release to another via source.
-Instead, please visit the <a href="faq/upgrade55.html">upgrade guide</a>.
+Instead, please read the upgrade guide for the release in question.
 Also, you cannot go backwards, from -current back to -stable, because of
 library versioning problems and other changes.
 
@@ -99,7 +97,7 @@
 This is a simplified summary.
 
 <p>
-Once you have obtained a source tree via <a href="anoncvs.html">anoncvs</a>,
+Once you have obtained a source tree via <a href="anoncvs.html">AnonCVS</a>,
 you must rebuild the system.  The stages for doing so are:
 
 <ul>