From dd87a02b58da1a48a3e4d3d6e31a10181998759a Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 8 Nov 2018 23:02:58 +0000
Subject: [PATCH] Remove mention of the pre-11 support model.

Reviewed by:	gjb, rgrimes
---
 en_US.ISO8859-1/htdocs/security/security.xml | 29 ++------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/security/security.xml b/en_US.ISO8859-1/htdocs/security/security.xml
index c1bd837eef..f8c4b1dab4 100644
--- a/en_US.ISO8859-1/htdocs/security/security.xml
+++ b/en_US.ISO8859-1/htdocs/security/security.xml
@@ -176,40 +176,15 @@
   <a name="model"></a>
   <h2>The FreeBSD support model</h2>
 
-  <p>Effective &os;&nbsp;11.0-RELEASE, the support model has been
-    changed to allow more rapid development while also providing
-    timely security updates for all supported releases.</p>
-
-  <p>Under the new support model, each major version's stable branch
+  <p>Under the current support model, each major version's stable branch
     is explicitly supported for 5 years, while each individual point
     release is only supported for three months after the next point
     release.</p>
 
-  <p>The details and rationale behind this change can be found in the
+  <p>The details and rationale behind this model can be found in the
     <a
       href="https://lists.freebsd.org/pipermail/freebsd-announce/2015-February/001624.html">official
       announcement</a> sent in February 2015.</p>
 
-  <p>Previously, branches were designated as either <em>Normal</em> or
-    <em>Extended</em>.  The designation was used as a guideline for
-    determining the lifetime of the branch as follows:</p>
-
-  <dl>
-    <dt>Normal</dt>
-    <dd>Releases which are published from a -STABLE branch were
-      supported by the Security Officer for a minimum of 12 months
-      after the release, and for sufficient additional time (if
-      needed) to ensure that there is a newer release for at least
-      3 months before the older Normal release expires.
-    </dd>
-    <dt>Extended</dt>
-    <dd>Selected releases (normally every second release plus the last
-      release from each -STABLE branch) were supported by the Security
-      Officer for a minimum of 24 months after the release, and for
-      sufficient additional time (if needed) to ensure that there is
-      a newer Extended release for at least 3 months before the older
-      Extended release expires.
-    </dd>
-  </dl>
 </body>
 </html>