Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Nov 2019 20:39:03 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r53524 - in head: en_US.ISO8859-1/htdocs en_US.ISO8859-1/htdocs/releases en_US.ISO8859-1/htdocs/releng en_US.ISO8859-1/htdocs/security share/xml
Message-ID:  <201911012039.xA1Kd3mh095202@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Fri Nov  1 20:39:02 2019
New Revision: 53524
URL: https://svnweb.freebsd.org/changeset/doc/53524

Log:
  Document 11.2-RELEASE has reached end of life.
  Use new 'rel*.*' macros to make future similar updates easier
  to manage.
  While here, fix a issue in where.xml that is silently causing
  build failures.
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  head/en_US.ISO8859-1/htdocs/index.xsl
  head/en_US.ISO8859-1/htdocs/releases/index.xml
  head/en_US.ISO8859-1/htdocs/releng/index.xml
  head/en_US.ISO8859-1/htdocs/security/security.xml
  head/en_US.ISO8859-1/htdocs/security/unsupported.xml
  head/en_US.ISO8859-1/htdocs/where.xml
  head/share/xml/navibar.ent

Modified: head/en_US.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/index.xsl	Fri Nov  1 16:51:47 2019	(r53523)
+++ head/en_US.ISO8859-1/htdocs/index.xsl	Fri Nov  1 20:39:02 2019	(r53524)
@@ -100,11 +100,9 @@
 				  <h2><a href="&base;/releases/">Supported Releases</a></h2>
 				  <ul id="frontreleaseslist">
 					<li>Production:&nbsp;<a
-				href="&u.rel.announce;">&rel.current;</a>,
+				href="&u.rel120.announce;">&rel120.current;</a>,
 				<a
-				  href="&u.rel1.announce;">&rel1.current;</a>,
-				<a
-				  href="&u.rel2.announce;">&rel2.current;</a></li>
+				  href="&u.rel113.announce;">&rel113.current;</a></li>
 			    <xsl:if test="'&beta.upcoming;' != 'IGNORE'">
 					<li>Upcoming: <a
 				href="&u.betarel.schedule;">&betarel.current;</a></li>

Modified: head/en_US.ISO8859-1/htdocs/releases/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/index.xml	Fri Nov  1 16:51:47 2019	(r53523)
+++ head/en_US.ISO8859-1/htdocs/releases/index.xml	Fri Nov  1 20:39:02 2019	(r53524)
@@ -38,29 +38,30 @@
   <h2>Most Recent Releases</h2>
 
     <h3>Production Release</h3>
-      <p><b>Release &rel.current;</b> (&rel.current.date;)
+      <p><b>Release &rel120.current;</b> (&rel120.current.date;)
 	<em>
-	<a href="&u.rel.announce;">Announcement</a> :
-	<a href="&u.rel.notes;">Release Notes</a> :
-	<a href="&u.rel.installation;">Installation Instructions</a> :
-	<a href="&u.rel.hardware;">Hardware Notes</a> :
-	<a href="&u.rel.readme;">Readme</a> :
-	<a href="&u.rel.errata;">Errata</a> :
-	<a href="&u.rel.signatures;">Checksums</a>
+	<a href="&u.rel120.announce;">Announcement</a> :
+	<a href="&u.rel120.notes;">Release Notes</a> :
+	<a href="&u.rel120.installation;">Installation Instructions</a> :
+	<a href="&u.rel120.hardware;">Hardware Notes</a> :
+	<a href="&u.rel120.readme;">Readme</a> :
+	<a href="&u.rel120.errata;">Errata</a> :
+	<a href="&u.rel120.signatures;">Checksums</a>
       </em></p>
 
-      <p><b>Release &rel1.current;</b> (&rel1.current.date;)
+      <p><b>Release &rel113.current;</b> (&rel113.current.date;)
 	<em>
-	<a href="&u.rel1.announce;">Announcement</a> :
-	<a href="&u.rel1.notes;">Release Notes</a> :
-	<a href="&u.rel1.installation;">Installation
+	<a href="&u.rel113.announce;">Announcement</a> :
+	<a href="&u.rel113.notes;">Release Notes</a> :
+	<a href="&u.rel113.installation;">Installation
 	  Instructions</a> :
-	<a href="&u.rel1.hardware;">Hardware Notes</a> :
-	<a href="&u.rel1.readme;">Readme</a> :
-	<a href="&u.rel1.errata;">Errata</a> :
-	<a href="&u.rel1.signatures;">Checksums</a>
+	<a href="&u.rel113.hardware;">Hardware Notes</a> :
+	<a href="&u.rel113.readme;">Readme</a> :
+	<a href="&u.rel113.errata;">Errata</a> :
+	<a href="&u.rel113.signatures;">Checksums</a>
       </em></p>
 
+    <?ignore
     <h3>Legacy Release</h3>
       <p><b>Release &rel2.current;</b> (&rel2.current.date;)
 	<em>
@@ -73,6 +74,7 @@
 	<a href="&u.rel2.errata;">Errata</a> :
 	<a href="&u.rel2.signatures;">Checksums</a>
 	</em></p>
+      ?>
 
   <a name="future"></a>
   <h2>Future Releases</h2>
@@ -109,6 +111,18 @@
 	Information</a> page.</p>
 
     <ul>
+      <li><b>11.2</b> (June, 2018)
+	<em>
+	  <a href="11.2R/announce.html">Announcement</a>:
+	  <a href="11.2R/relnotes.html">Release Notes</a>:
+	  <a href="11.2R/installation.html">Installation Instructions</a>:
+	  <a href="11.2R/hardware.html">Hardware Notes</a>:
+	  <a href="11.2R/readme.html">Readme</a>:
+	  <a href="11.2R/errata.html">Errata</a>:
+	  <a href="11.2R/signatures.html">Checksums</a>
+	</em>
+      </li>
+
       <li><b>11.1</b> (July, 2017)
 	<em>
 	  <a href="11.1R/announce.html">Announcement</a>:

Modified: head/en_US.ISO8859-1/htdocs/releng/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/index.xml	Fri Nov  1 16:51:47 2019	(r53523)
+++ head/en_US.ISO8859-1/htdocs/releng/index.xml	Fri Nov  1 20:39:02 2019	(r53524)
@@ -128,7 +128,7 @@
       <td><tt>releng/11.2</tt></td>
       <td>Frozen</td>
       <td>&contact.so;</td>
-      <td>FreeBSD 11.2 supported errata fix branch.</td>
+      <td>FreeBSD 11.2 errata fix branch (not officially supported).</td>
     </tr>
 
     <tr>

Modified: head/en_US.ISO8859-1/htdocs/security/security.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/security/security.xml	Fri Nov  1 16:51:47 2019	(r53523)
+++ head/en_US.ISO8859-1/htdocs/security/security.xml	Fri Nov  1 20:39:02 2019	(r53524)
@@ -211,13 +211,6 @@
       <td>September 30, 2021</td>
     </tr>
     <tr>
-      <td>releng/11.2</td>
-      <td>11.2-RELEASE</td>
-      <td>n/a</td>
-      <td>June 28, 2018</td>
-      <td>October 31, 2019</td>
-    </tr>
-    <tr>
       <td>releng/11.3</td>
       <td>11.3-RELEASE</td>
       <td>n/a</td>

Modified: head/en_US.ISO8859-1/htdocs/security/unsupported.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/security/unsupported.xml	Fri Nov  1 16:51:47 2019	(r53523)
+++ head/en_US.ISO8859-1/htdocs/security/unsupported.xml	Fri Nov  1 20:39:02 2019	(r53524)
@@ -277,6 +277,13 @@
        <td>July 26, 2017</td>
        <td>September 30, 2018</td>
      </tr>
+    <tr>
+      <td>releng/11.2</td>
+      <td>11.2-RELEASE</td>
+      <td>n/a</td>
+      <td>June 28, 2018</td>
+      <td>October 31, 2019</td>
+    </tr>
     </table>
 
   </body>

Modified: head/en_US.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/where.xml	Fri Nov  1 16:51:47 2019	(r53523)
+++ head/en_US.ISO8859-1/htdocs/where.xml	Fri Nov  1 20:39:02 2019	(r53524)
@@ -187,6 +187,7 @@
     </table>
     <br />
 
+    <?ignore
     <a name="download-rel2"></a>
 
     <h1>&os; &rel2.current;-RELEASE</h1>
@@ -242,6 +243,7 @@
       </tbody>
     </table>
     <br />
+    ?>
 
     &beta.desc;
     &beta.second;
@@ -374,6 +376,7 @@
 	      <?ignore
 	      <li><a href="&base;/relnotes/&rel121.current.major;-STABLE/relnotes/article.html">Release Notes</a></li>
 	      ?>
+	      <li>&nbsp;</li>
 	    </ul>
 	  </td>
 	</tr>

Modified: head/share/xml/navibar.ent
==============================================================================
--- head/share/xml/navibar.ent	Fri Nov  1 16:51:47 2019	(r53523)
+++ head/share/xml/navibar.ent	Fri Nov  1 20:39:02 2019	(r53524)
@@ -96,11 +96,9 @@
     <li><a href="&base;/releases/">Release Information</a>
       <ul>
 	<li>Production Release: <br />
-	  <a href="&u.rel.announce;">&rel.current;</a></li>
+	  <a href="&u.rel120.announce;">&rel120.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>
+	  <a href="&u.rel113.announce;">&rel113.current;</a></li>
       </ul>
     </li>
     <li><a href="&base;/snapshots/">Snapshot Releases</a>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911012039.xA1Kd3mh095202>