svn commit: r45733 - head/en_US.ISO8859-1/htdocs/security

Author: des
Date: Tue Oct  7 18:32:22 2014
New Revision: 45733
URL: https://svnweb.freebsd.org/changeset/doc/45733

Log:
  - Change "Estimated EoL" to "Expected EoL".
  
  - Rephrase the explanation for the EoL table.  Most significantly,
    remove any suggestion that we may terminate a release earlier than
    the announced date.
  
  - Remove all mention of "early adopter" releases.  We've only ever had
    one, and that was more than ten years ago.
  
  - Mention that BETA and RC releases are supported for a few weeks "as
    resources permit".

Modified:
  head/en_US.ISO8859-1/htdocs/security/security.xml

Modified: head/en_US.ISO8859-1/htdocs/security/security.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/security/security.xml	Tue Oct  7 15:42:24 2014	(r45732)
+++ head/en_US.ISO8859-1/htdocs/security/security.xml	Tue Oct  7 18:32:22 2014	(r45733)
@@ -52,13 +52,11 @@
   <a name="sup"></a>
   <h2>Supported FreeBSD releases</h2>
 
-  <p>The current designation and estimated lifetimes of the currently
-    supported branches are given below.  The <em>Estimated EoL
-    (end-of-life)</em> column gives the earliest date on which that
-    branch is likely to be dropped.  Please note that these dates may
-    be extended into the future, but only extenuating circumstances
-    would lead to a branch's support being dropped earlier than the
-    date listed.</p>
+  <p>The designation and expected lifetime of all currently supported
+    branches are given below.  The <em>Expected EoL (end-of-life)</em>
+    column indicates the earliest date on which support for that
+    branch or release will end.  Please note that these dates may be
+    pushed back if circumstances warrant it.</p>
 
   <!--
       Please also update head/en_US.ISO8859-1/htdocs/releng/index.xml
@@ -70,7 +68,7 @@
       <th>Release</th>
       <th>Type</th>
       <th>Release Date</th>
-      <th>Estimated EoL</th>
+      <th>Expected EoL</th>
     </tr>
     <tr>
       <td>stable/8</td>
@@ -174,16 +172,11 @@
       document</a>.</p>
 
   <p>Each branch is supported by the Security Officer for a limited
-    time only, and is designated as one of `<em>Early adopter</em>',
-    `<em>Normal</em>', or `<em>Extended</em>'.  The designation is
-    used as a guideline for determining the lifetime of the branch as
-    follows.</p>
+    time only, and is designated as either <em>Normal</em> or
+    <em>Extended</em>.  The designation is used as a guideline for
+    determining the lifetime of the branch as follows:</p>
 
   <dl>
-    <dt>Early adopter</dt>
-    <dd>Releases which are published from the -CURRENT branch will be
-      supported by the Security Officer for a minimum of 6 months after
-      the release.</dd>
     <dt>Normal</dt>
     <dd>Releases which are published from a -STABLE branch will be
       supported by the Security Officer for a minimum of 12 months after the
@@ -201,5 +194,10 @@
     </dd>
   </dl>
 
+  <p>In the run-up to a Normal or Extended release, a number of -BETA
+    and -RC releases may be published.  These releases are only
+    supported for a few weeks, as resources permit, and will not be
+    listed as supported on this page.  Users are strongly discouraged
+    from running these releases on production systems.</p>
 </body>
 </html>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"