en_US.ISO8859-1/htdocs/releng/index.xml:

- Remove 11.1-RELEASE from 'Upcoming Releases.'

en_US.ISO8859-1/htdocs/security/security.xml:

- Add releng/11.1 to the security page.

share/xml/release.ent:

- Update release.ent to disable testing URLs and include
  11.1-RELEASE.

share/xml/freebsd.ent:

- Add a new rel0.current entity for 11.0.
- Update rel.current entity for 11.1.

share/xml/navibar.ent:

- Reflect 11.1-RELEASE as a production release.

en_US.ISO8859-1/htdocs/where.xml:

- Update where.html to include 11.1-RELEASE.
- Comment 11.1-STABLE snapshots for now.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation

1 files changed, 80 insertions, 18 deletions

diff --git a/en_US.ISO8859-1/htdocs/where.xml b/en_US.ISO8859-1/htdocs/where.xml
index 1e9c37081f..be5600e868 100644
--- a/en_US.ISO8859-1/htdocs/where.xml
+++ b/en_US.ISO8859-1/htdocs/where.xml
@@ -140,10 +140,10 @@
 	    <ul class="txtdownloadlist">
 	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel0.current;/">amd64</a></li>
 	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel0.current;/">i386</a></li>
-	      <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel0.current;/">ia64</a></li>
 	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel0.current;/">powerpc</a></li>
 	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel0.current;/">powerpc64</a></li>
 	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel0.current;/">sparc64</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel0.current;/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
@@ -151,14 +151,19 @@
 	      <li><a href="&url.rel;/VM-IMAGES/README.txt">README</a></li>
 	      <li><a href="&url.rel;/VM-IMAGES/&rel0.current;-RELEASE/amd64/Latest/">amd64</a></li>
 	      <li><a href="&url.rel;/VM-IMAGES/&rel0.current;-RELEASE/i386/Latest/">i386</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel0.current;-RELEASE/aarch64/Latest/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-BANANAPI.img.xz">BANANAPI</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-RPI2.img.xz">RPI2</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel0.current;/&os;-&rel0.current;-RELEASE-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
 	    </ul>
@@ -178,6 +183,61 @@
     </table>
     <br />
 
+    <a name="download-rel1"></a>
+
+    <h1>&os; &rel1.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/&rel1.current;/">amd64</a></li>
+	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel1.current;/">i386</a></li>
+	      <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel1.current;/">ia64</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>
+	    </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>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <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-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-GUMSTIX.img.xz">GUMSTIX</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-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>
+	    </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.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>
+	    </ul>
+	  </td>
+	</tr>
+      </tbody>
+    </table>
+    <br />
+
     &beta.desc;
 
     <a name="download-snapshots"></a>
@@ -248,6 +308,7 @@
 
     <p>&nbsp;</p>
 
+    <?ignore
     <h1>&os; &rel.current;-STABLE</h1>
 
     <table class="tblbasic tblwide tbldownload">
@@ -301,8 +362,9 @@
     </table>
 
     <p>&nbsp;</p>
+    ?>
 
-    <h1>&os; &rel0.current;-STABLE</h1>
+    <h1>&os; &rel1.current;-STABLE</h1>
 
     <table class="tblbasic tblwide tbldownload">
       <tbody>
@@ -315,34 +377,34 @@
 	<tr>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel0.current;/">amd64</a></li>
-	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel0.current;/">i386</a></li>
-	      <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&rel0.current;/">ia64</a></li>
-	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel0.current;/">powerpc</a></li>
-	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel0.current;/">powerpc64</a></li>
-	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel0.current;/">sparc64</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel0.current;/">armv6</a></li>
+	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel1.current;/">amd64</a></li>
+	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel1.current;/">i386</a></li>
+	      <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&rel1.current;/">ia64</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel1.current;/">powerpc</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel1.current;/">powerpc64</a></li>
+	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel1.current;/">sparc64</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">armv6</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/VM-IMAGES/&rel0.current;-STABLE/amd64/Latest/">amd64</a></li>
-	      <li><a href="&url.snapshot;/VM-IMAGES/&rel0.current;-STABLE/i386/Latest/">i386</a></li>
+	      <li><a href="&url.snapshot;/VM-IMAGES/&rel1.current;-STABLE/amd64/Latest/">amd64</a></li>
+	      <li><a href="&url.snapshot;/VM-IMAGES/&rel1.current;-STABLE/i386/Latest/">i386</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel0.current;/">BEAGLEBONE</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel0.current;/">CUBOX/HUMMINGBOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel0.current;/">GUMSTIX</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel0.current;/">PANDABOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel0.current;/">RPI-B</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel0.current;/">WANDBOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">BEAGLEBONE</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">CUBOX/HUMMINGBOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">GUMSTIX</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">PANDABOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">RPI-B</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">WANDBOARD</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdocslist">
-	      <li><a href="&base;/relnotes/&rel0.current.major;-STABLE/relnotes/article.html">Release Notes</a></li>
+	      <li><a href="&base;/relnotes/&rel1.current.major;-STABLE/relnotes/article.html">Release Notes</a></li>
 	    </ul>
 	  </td>
 	</tr>