svn commit: r54273 - in head: en_US.ISO8859-1/htdocs share/xml

Glen Barber gjb at FreeBSD.org
Thu Jun 18 18:23:02 UTC 2020


Author: gjb
Date: Thu Jun 18 18:23:01 2020
New Revision: 54273
URL: https://svnweb.freebsd.org/changeset/doc/54273

Log:
  Remove the commented 'download-rel' and 'dowload-rel2' sections.
  Convert the 11.3-RELEASE links from 'rel1.foo' to 'rel113.foo' for
  consistency with the rest of the file.
  
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  head/en_US.ISO8859-1/htdocs/where.xml
  head/share/xml/freebsd.ent

Modified: head/en_US.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/where.xml	Thu Jun 18 17:14:06 2020	(r54272)
+++ head/en_US.ISO8859-1/htdocs/where.xml	Thu Jun 18 18:23:01 2020	(r54273)
@@ -128,72 +128,6 @@
     </table>
     <br />
 
-    <?ignore
-    <a name="download-rel"></a>
-
-    <h1>&os; &rel.current;-RELEASE</h1>
-
-    <table class="tblbasic tblwide tbldownload">
-      <tbody>
-	<tr>
-	  <th>Installer Images</th>
-	  <th>Virtual Machine Images</th>
-	  <th>SD Card Images</th>
-	  <th>Documentation</th>
-	</tr>
-	<tr>
-	  <td>
-	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel.current;/">amd64</a></li>
-	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel.current;/">i386</a></li>
-	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">powerpc</a></li>
-	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">powerpc64</a></li>
-	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">sparc64</a></li>
-	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel.current;/">aarch64</a></li>
-	    </ul>
-	  </td>
-	  <td>
-	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/VM-IMAGES/README.txt">README</a></li>
-	      <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/amd64/Latest/">amd64</a></li>
-	      <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/i386/Latest/">i386</a></li>
-	      <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/aarch64/Latest/">aarch64</a></li>
-	    </ul>
-	  </td>
-	  <td>
-	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
-	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-BANANAPI.img.xz">BANANAPI</a></li>
-	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
-	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
-	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-GENERICSD.img.xz">GENERICSD</a></li>
-	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-RPI2.img.xz">RPI2</a></li>
-	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-PANDABOARD.img.xz">PANDABOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-WANDBOARD.img.xz">WANDBOARD</a></li>
-	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm64-aarch64-PINE64.img.xz">PINE64</a></li>
-	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm64-aarch64-PINE64-LTS.img.xz">PINE64-LTS</a></li>
-	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm64-aarch64-RPI3.img.xz">RPI3</a></li>
-	    </ul>
-	  </td>
-	  <td>
-	    <ul class="txtdocslist">
-	      <li><a href="&base;/releases/index.html#current">Released</a>: &rel.current.date;</li>
-	      <li><a href="&u.rel.notes;">Release Notes</a></li>
-	      <li><a href="&u.rel.readme;">Readme</a></li>
-	      <li><a href="&u.rel.hardware;">Hardware Compatibility List</a></li>
-	      <li><a href="&u.rel.installation;">Installation Instructions</a></li>
-	      <li><a href="&u.rel.errata;">Errata</a></li>
-	      <li><a href="&u.rel.signatures;">Signed Checksums</a></li>
-	    </ul>
-	  </td>
-	</tr>
-      </tbody>
-    </table>
-    <br />
-    ?>
-
     <a name="download-rel114"></a>
 
     <h1>&os; &rel114.current;-RELEASE</h1>
@@ -253,9 +187,9 @@
     </table>
     <br />
 
-    <a name="download-rel1"></a>
+    <a name="download-rel113"></a>
 
-    <h1>&os; &rel1.current;-RELEASE</h1>
+    <h1>&os; &rel113.current;-RELEASE</h1>
 
     <table class="tblbasic tblwide tbldownload">
       <tbody>
@@ -268,44 +202,44 @@
 	<tr>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel1.current;/">amd64</a></li>
-	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel1.current;/">i386</a></li>
-	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel1.current;/">powerpc</a></li>
-	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel1.current;/">powerpc64</a></li>
-	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel1.current;/">sparc64</a></li>
-	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel1.current;/">aarch64</a></li>
+	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel113.current;/">amd64</a></li>
+	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel113.current;/">i386</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel113.current;/">powerpc</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel113.current;/">powerpc64</a></li>
+	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel113.current;/">sparc64</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel113.current;/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
 	      <li><a href="&url.rel;/VM-IMAGES/README.txt">README</a></li>
-	      <li><a href="&url.rel;/VM-IMAGES/&rel1.current;-RELEASE/amd64/Latest/">amd64</a></li>
-	      <li><a href="&url.rel;/VM-IMAGES/&rel1.current;-RELEASE/i386/Latest/">i386</a></li>
-	      <li><a href="&url.rel;/VM-IMAGES/&rel1.current;-RELEASE/aarch64/Latest/">aarch64</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel113.current;-RELEASE/amd64/Latest/">amd64</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel113.current;-RELEASE/i386/Latest/">i386</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel113.current;-RELEASE/aarch64/Latest/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-BANANAPI.img.xz">BANANAPI</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-RPI2.img.xz">RPI2</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel113.current;/&os;-&rel113.current;-RELEASE-arm-armv6-BANANAPI.img.xz">BANANAPI</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel113.current;/&os;-&rel113.current;-RELEASE-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel113.current;/&os;-&rel113.current;-RELEASE-arm-armv6-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel113.current;/&os;-&rel113.current;-RELEASE-arm-armv6-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel113.current;/&os;-&rel113.current;-RELEASE-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel113.current;/&os;-&rel113.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel113.current;/&os;-&rel113.current;-RELEASE-arm-armv6-RPI2.img.xz">RPI2</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel113.current;/&os;-&rel113.current;-RELEASE-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel113.current;/&os;-&rel113.current;-RELEASE-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdocslist">
-	      <li><a href="&base;/releases/index.html#current">Released</a>: &rel1.current.date;</li>
-	      <li><a href="&u.rel1.notes;">Release Notes</a></li>
-	      <li><a href="&u.rel1.readme;">Readme</a></li>
-	      <li><a href="&u.rel1.hardware;">Hardware Compatibility List</a></li>
-	      <li><a href="&u.rel1.installation;">Installation Instructions</a></li>
-	      <li><a href="&u.rel1.errata;">Errata</a></li>
-	      <li><a href="&u.rel1.signatures;">Signed Checksums</a></li>
+	      <li><a href="&base;/releases/index.html#current">Released</a>: &rel113.current.date;</li>
+	      <li><a href="&u.rel113.notes;">Release Notes</a></li>
+	      <li><a href="&u.rel113.readme;">Readme</a></li>
+	      <li><a href="&u.rel113.hardware;">Hardware Compatibility List</a></li>
+	      <li><a href="&u.rel113.installation;">Installation Instructions</a></li>
+	      <li><a href="&u.rel113.errata;">Errata</a></li>
+	      <li><a href="&u.rel113.signatures;">Signed Checksums</a></li>
 	    </ul>
 	  </td>
 	</tr>
@@ -313,64 +247,6 @@
     </table>
     <br />
 
-    <?ignore
-    <a name="download-rel2"></a>
-
-    <h1>&os; &rel2.current;-RELEASE</h1>
-
-    <table class="tblbasic tblwide tbldownload">
-      <tbody>
-	<tr>
-	  <th>Installer Images</th>
-	  <th>Virtual Machine Images</th>
-	  <th>SD Card Images</th>
-	  <th>Documentation</th>
-	</tr>
-	<tr>
-	  <td>
-	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel2.current;/">amd64</a></li>
-	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel2.current;/">i386</a></li>
-	      <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel2.current;/">ia64</a></li>
-	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">powerpc</a></li>
-	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">powerpc64</a></li>
-	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">sparc64</a></li>
-	    </ul>
-	  </td>
-	  <td>
-	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/VM-IMAGES/README.txt">README</a></li>
-	      <li><a href="&url.rel;/VM-IMAGES/&rel2.current;-RELEASE/amd64/Latest/">amd64</a></li>
-	      <li><a href="&url.rel;/VM-IMAGES/&rel2.current;-RELEASE/i386/Latest/">i386</a></li>
-	    </ul>
-	  </td>
-	  <td>
-	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
-	    </ul>
-	  </td>
-	  <td>
-	    <ul class="txtdocslist">
-	      <li><a href="&base;/releases/index.html#current">Released</a>: &rel2.current.date;</li>
-	      <li><a href="&u.rel2.notes;">Release Notes</a></li>
-	      <li><a href="&u.rel2.readme;">Readme</a></li>
-	      <li><a href="&u.rel2.hardware;">Hardware Compatibility List</a></li>
-	      <li><a href="&u.rel2.installation;">Installation Instructions</a></li>
-	      <li><a href="&u.rel2.errata;">Errata</a></li>
-	      <li><a href="&u.rel2.signatures;">Signed Checksums</a></li>
-	    </ul>
-	  </td>
-	</tr>
-      </tbody>
-    </table>
-    <br />
-    ?>
-
     &beta.desc;
     &beta.second;
 
@@ -562,54 +438,6 @@
 	</tr>
       </tbody>
     </table>
-
-    <?ignore
-    <h1>&os; &rel2.current;-STABLE</h1>
-
-    <table class="tblbasic tblwide tbldownload">
-      <tbody>
-	<tr>
-	  <th>Installer Images</th>
-	  <th>Virtual Machine Images</th>
-	  <th>SD Card Images</th>
-	  <th>Documentation</th>
-	</tr>
-	<tr>
-	  <td>
-	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel2.current;/">amd64</a></li>
-	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel2.current;/">i386</a></li>
-	      <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&rel2.current;/">ia64</a></li>
-	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">powerpc</a></li>
-	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">powerpc64</a></li>
-	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">sparc64</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">armv6</a></li>
-	    </ul>
-	  </td>
-	  <td>
-	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/VM-IMAGES/&rel2.current;-STABLE/amd64/Latest/">amd64</a></li>
-	      <li><a href="&url.snapshot;/VM-IMAGES/&rel2.current;-STABLE/i386/Latest/">i386</a></li>
-	    </ul>
-	  </td>
-	  <td>
-	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">BEAGLEBONE</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">CUBOX/HUMMINGBOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">PANDABOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">RPI-B</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">WANDBOARD</a></li>
-	    </ul>
-	  </td>
-	  <td>
-	    <ul class="txtdocslist">
-	      <li><a href="&base;/relnotes/&rel2.current.major;-STABLE/relnotes/article.html">Release Notes</a></li>
-	    </ul>
-	  </td>
-	</tr>
-      </tbody>
-    </table>
-    ?>
 
     <p>If you plan on getting &os; via HTTP or FTP, please check
       the listing of <a

Modified: head/share/xml/freebsd.ent
==============================================================================
--- head/share/xml/freebsd.ent	Thu Jun 18 17:14:06 2020	(r54272)
+++ head/share/xml/freebsd.ent	Thu Jun 18 18:23:01 2020	(r54273)
@@ -84,6 +84,12 @@ used in both environments.
 <!ENTITY rel114.current.hardware 'https://www.FreeBSD.org/releases/&rel114.current;R/hardware.html'>
 <!ENTITY rel114.current.errata 'https://www.FreeBSD.org/releases/&rel114.current;R/errata.html'>
 
+<!ENTITY rel113.current "11.3">
+<!ENTITY rel113.current.date "July 2019">
+<!ENTITY rel113.current.notes 'https://www.FreeBSD.org/releases/&rel113.current;R/notes.html'>
+<!ENTITY rel113.current.hardware 'https://www.FreeBSD.org/releases/&rel113.current;R/hardware.html'>
+<!ENTITY rel113.current.errata 'https://www.FreeBSD.org/releases/&rel113.current;R/errata.html'>
+
 <!ENTITY rel.current "12.0">
 <!ENTITY rel.current.date "December 2018">
 <!ENTITY rel.current.notes 'https://www.FreeBSD.org/releases/&rel.current;R/notes.html'>


More information about the svn-doc-all mailing list