From b353781ac3fb7ac7aa88c8bff1386ae6f337370b Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 1 Oct 2018 17:29:11 +0000
Subject: [PATCH] Document that 11.1-RELEASE has reached end of life.

Sponsored by:	The FreeBSD Foundation
---
 en_US.ISO8859-1/htdocs/index.xsl                |  2 ++
 en_US.ISO8859-1/htdocs/releases/index.xml       | 14 ++++++++++++++
 en_US.ISO8859-1/htdocs/releng/index.xml         |  2 +-
 en_US.ISO8859-1/htdocs/security/security.xml    |  7 -------
 en_US.ISO8859-1/htdocs/security/unsupported.xml |  7 +++++++
 en_US.ISO8859-1/htdocs/where.xml                |  2 ++
 share/xml/navibar.ent                           |  2 ++
 7 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/index.xsl b/en_US.ISO8859-1/htdocs/index.xsl
index 1fb6967e2a..f1128e9b26 100644
--- a/en_US.ISO8859-1/htdocs/index.xsl
+++ b/en_US.ISO8859-1/htdocs/index.xsl
@@ -101,8 +101,10 @@
 				  <ul id="frontreleaseslist">
 					<li>Production:&nbsp;<a
 				href="&u.rel.announce;">&rel.current;</a>,
+				<?ignore
 				<a
 				  href="&u.rel1.announce;">&rel1.current;</a>,
+				?>
 				<a
 				  href="&u.rel2.announce;">&rel2.current;</a></li>
 			    <xsl:if test="'&beta.upcoming;' != 'IGNORE'">
diff --git a/en_US.ISO8859-1/htdocs/releases/index.xml b/en_US.ISO8859-1/htdocs/releases/index.xml
index a85860e03e..f54256d709 100644
--- a/en_US.ISO8859-1/htdocs/releases/index.xml
+++ b/en_US.ISO8859-1/htdocs/releases/index.xml
@@ -49,6 +49,7 @@
 	<a href="&u.rel.signatures;">Checksums</a>
       </em></p>
 
+      <?ignore
       <p><b>Release &rel1.current;</b> (&rel1.current.date;)
 	<em>
 	<a href="&u.rel1.announce;">Announcement</a> :
@@ -60,6 +61,7 @@
 	<a href="&u.rel1.errata;">Errata</a> :
 	<a href="&u.rel1.signatures;">Checksums</a>
       </em></p>
+      ?>
 
     <h3>Legacy Release</h3>
       <p><b>Release &rel2.current;</b> (&rel2.current.date;)
@@ -109,6 +111,18 @@
 	Information</a> page.</p>
 
     <ul>
+      <li><b>11.1</b> (July, 2017)
+	<em>
+	  <a href="11.1R/announce.html">Announcement</a>:
+	  <a href="11.1R/relnotes.html">Release Notes</a>:
+	  <a href="11.1R/installation.html">Installation Instructions</a>:
+	  <a href="11.1R/hardware.html">Hardware Notes</a>:
+	  <a href="11.1R/readme.html">Readme</a>:
+	  <a href="11.1R/errata.html">Errata</a>:
+	  <a href="11.1R/signatures.html">Checksums</a>
+	</em>
+      </li>
+
       <li><b>11.0</b> (October, 2016)
 	<em>
 	  <a href="11.0R/announce.html">Announcement</a>:
diff --git a/en_US.ISO8859-1/htdocs/releng/index.xml b/en_US.ISO8859-1/htdocs/releng/index.xml
index d5e6cbad1d..51f7d07d04 100644
--- a/en_US.ISO8859-1/htdocs/releng/index.xml
+++ b/en_US.ISO8859-1/htdocs/releng/index.xml
@@ -107,7 +107,7 @@
       <td><tt>releng/11.1</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
-      <td>FreeBSD 11.1 supported errata fix branch.</td>
+      <td>FreeBSD 11.1 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>
diff --git a/en_US.ISO8859-1/htdocs/security/security.xml b/en_US.ISO8859-1/htdocs/security/security.xml
index f69d5d2d6f..ea76e75129 100644
--- a/en_US.ISO8859-1/htdocs/security/security.xml
+++ b/en_US.ISO8859-1/htdocs/security/security.xml
@@ -172,13 +172,6 @@
       <td>n/a</td>
       <td>September 30, 2021</td>
     </tr>
-    <tr>
-      <td>releng/11.1</td>
-      <td>11.1-RELEASE</td>
-      <td>n/a</td>
-      <td>July 26, 2017</td>
-      <td>September 30, 2018</td>
-    </tr>
     <tr>
       <td>releng/11.2</td>
       <td>11.2-RELEASE</td>
diff --git a/en_US.ISO8859-1/htdocs/security/unsupported.xml b/en_US.ISO8859-1/htdocs/security/unsupported.xml
index ac8f77cff7..50f9e31802 100644
--- a/en_US.ISO8859-1/htdocs/security/unsupported.xml
+++ b/en_US.ISO8859-1/htdocs/security/unsupported.xml
@@ -263,6 +263,13 @@
        <td>October 10, 2016</td>
        <td>November 30, 2017</td>
      </tr>
+     <tr>
+       <td>releng/11.1</td>
+       <td>11.1-RELEASE</td>
+       <td>n/a</td>
+       <td>July 26, 2016</td>
+       <td>September 30, 2018</td>
+     </tr>
     </table>
 
   </body>
diff --git a/en_US.ISO8859-1/htdocs/where.xml b/en_US.ISO8859-1/htdocs/where.xml
index 26678f1239..4a615dffca 100644
--- a/en_US.ISO8859-1/htdocs/where.xml
+++ b/en_US.ISO8859-1/htdocs/where.xml
@@ -124,6 +124,7 @@
     </table>
     <br />
 
+    <?ignore
     <a name="download-rel1"></a>
 
     <h1>&os; &rel1.current;-RELEASE</h1>
@@ -184,6 +185,7 @@
       </tbody>
     </table>
     <br />
+    ?>
 
     <a name="download-rel2"></a>
 
diff --git a/share/xml/navibar.ent b/share/xml/navibar.ent
index 24978e1910..69451dae8d 100644
--- a/share/xml/navibar.ent
+++ b/share/xml/navibar.ent
@@ -98,8 +98,10 @@
       <ul>
 	<li>Production Release: <br />
 	  <a href="&u.rel.announce;">&rel.current;</a></li>
+	<?ignore
 	<li>Production Release: <br />
 	  <a href="&u.rel1.announce;">&rel1.current;</a></li>
+	?>
 	<li>Production Release: <br />
 	  <a href="&u.rel2.announce;">&rel2.current;</a></li>
       </ul>