From 44d6a3d97333799ff94efb100e5423874a6a4fad Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 1 May 2018 15:48:07 +0000
Subject: [PATCH] Document 10.3-RELEASE has reached end-of-life.

---
 en_US.ISO8859-1/htdocs/index.xsl             |  6 ++---
 en_US.ISO8859-1/htdocs/releases/index.xml    | 24 ++++++++++----------
 en_US.ISO8859-1/htdocs/releng/index.xml      |  2 +-
 en_US.ISO8859-1/htdocs/security/security.xml |  7 ------
 share/xml/navibar.ent                        |  2 --
 5 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/index.xsl b/en_US.ISO8859-1/htdocs/index.xsl
index d2b13db684..4b5ae05125 100644
--- a/en_US.ISO8859-1/htdocs/index.xsl
+++ b/en_US.ISO8859-1/htdocs/index.xsl
@@ -101,10 +101,8 @@
 				  <ul id="frontreleaseslist">
 					<li>Production:&nbsp;<a
 				href="&u.rel.announce;">&rel.current;</a>,
-					<a
-				href="&u.rel1.announce;">&rel1.current;</a>,
-					<a
-				href="&u.rel2.announce;">&rel2.current;</a></li>
+				<a
+				  href="&u.rel1.announce;">&rel1.current;</a></li>
 			    <xsl:if test="'&beta.upcoming;' != 'IGNORE'">
 					<li>Upcoming: <a
 				href="&u.betarel.schedule;">&betarel.current;</a></li>
diff --git a/en_US.ISO8859-1/htdocs/releases/index.xml b/en_US.ISO8859-1/htdocs/releases/index.xml
index 1ae90501f6..c57ee0abd7 100644
--- a/en_US.ISO8859-1/htdocs/releases/index.xml
+++ b/en_US.ISO8859-1/htdocs/releases/index.xml
@@ -62,18 +62,6 @@
 	<a href="&u.rel1.signatures;">Checksums</a>
 	</em></p>
 
-      <p><b>Release &rel2.current;</b> (&rel2.current.date;)
-	<em>
-	<a href="&u.rel2.announce;">Announcement</a> :
-	<a href="&u.rel2.notes;">Release Notes</a> :
-	<a href="&u.rel2.installation;">Installation
-	Instructions</a> :
-	<a href="&u.rel2.hardware;">Hardware Notes</a> :
-	<a href="&u.rel2.readme;">Readme</a> :
-	<a href="&u.rel2.errata;">Errata</a> :
-	<a href="&u.rel2.signatures;">Checksums</a>
-	</em></p>
-
   <a name="future"></a>
   <h2>Future Releases</h2>
 
@@ -121,6 +109,18 @@
 	</em>
       </li>
 
+      <li><b>10.3</b> (April, 2016)
+	<em>
+	  <a href="10.3R/announce.html">Announcement</a>:
+	  <a href="10.3R/relnotes.html">Release Notes</a>:
+	  <a href="10.3R/installation.html">Installation Instructions</a>:
+	  <a href="10.3R/hardware.html">Hardware Notes</a>:
+	  <a href="10.3R/readme.html">Readme</a>:
+	  <a href="10.3R/errata.html">Errata</a>:
+	  <a href="10.3R/signatures.html">Checksums</a>
+	</em>
+      </li>
+
       <li><b>10.2</b> (August, 2015)
 	<em>
 	  <a href="10.2R/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 578f704b12..0702dc043a 100644
--- a/en_US.ISO8859-1/htdocs/releng/index.xml
+++ b/en_US.ISO8859-1/htdocs/releng/index.xml
@@ -136,7 +136,7 @@
       <td><tt>releng/10.3</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
-      <td>FreeBSD 10.3 supported errata fix branch.</td>
+      <td>FreeBSD 10.3 errata fix branch (not officialy 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 2e89441ecf..5dbb5a53b7 100644
--- a/en_US.ISO8859-1/htdocs/security/security.xml
+++ b/en_US.ISO8859-1/htdocs/security/security.xml
@@ -158,13 +158,6 @@
       <td>n/a</td>
       <td>October 31, 2018</td>
     </tr>
-    <tr>
-      <td>releng/10.3</td>
-      <td>10.3-RELEASE</td>
-      <td>Extended</td>
-      <td>April 4, 2016</td>
-      <td>April 30, 2018</td>
-    </tr>
     <tr>
       <td>releng/10.4</td>
       <td>10.4-RELEASE</td>
diff --git a/share/xml/navibar.ent b/share/xml/navibar.ent
index 8f7a38cd03..708a56725b 100644
--- a/share/xml/navibar.ent
+++ b/share/xml/navibar.ent
@@ -100,8 +100,6 @@
 	  <a href="&u.rel.announce;">&rel.current;</a></li>
 	<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>
     </li>
     <li><a href="&base;/snapshots/">Snapshot Releases</a>