aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--en_US.ISO8859-1/htdocs/releng/index.xml6
-rw-r--r--en_US.ISO8859-1/htdocs/security/security.xml7
-rw-r--r--en_US.ISO8859-1/htdocs/where.xml98
-rw-r--r--share/xml/freebsd.ent10
-rw-r--r--share/xml/navibar.ent2
-rw-r--r--share/xml/release.ent69
6 files changed, 138 insertions, 54 deletions
diff --git a/en_US.ISO8859-1/htdocs/releng/index.xml b/en_US.ISO8859-1/htdocs/releng/index.xml
index c106f956d4..cc4cbb57ff 100644
--- a/en_US.ISO8859-1/htdocs/releng/index.xml
+++ b/en_US.ISO8859-1/htdocs/releng/index.xml
@@ -50,12 +50,6 @@
</tr>
<tr>
- <td>July&nbsp;2017</td>
- <td>&os;&nbsp;11.1</td>
- <td><a href="&base;/releases/11.1R/schedule.html">Target Schedule</a></td>
- </tr>
-
- <tr>
<td>October&nbsp;2017</td>
<td>&os;&nbsp;10.4</td>
<td><a href="&base;/releases/10.4R/schedule.html">Target Schedule</a></td>
diff --git a/en_US.ISO8859-1/htdocs/security/security.xml b/en_US.ISO8859-1/htdocs/security/security.xml
index f1e255a5df..cf2799801d 100644
--- a/en_US.ISO8859-1/htdocs/security/security.xml
+++ b/en_US.ISO8859-1/htdocs/security/security.xml
@@ -180,6 +180,13 @@
<td>October 10, 2016</td>
<td>11.1-RELEASE + 3 months</td>
</tr>
+ <tr>
+ <td>releng/11.1</td>
+ <td>11.1-RELEASE</td>
+ <td>n/a</td>
+ <td>July 26, 2017</td>
+ <td>11.2-RELEASE + 3 months</td>
+ </tr>
</table>
<p>In the run-up to a release, a number of -BETA and -RC releases
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>
diff --git a/share/xml/freebsd.ent b/share/xml/freebsd.ent
index 825d6b961a..c4c4f3a26c 100644
--- a/share/xml/freebsd.ent
+++ b/share/xml/freebsd.ent
@@ -69,12 +69,18 @@ used in both environments.
it's really release time -->
<!-- Entities for multiple "latest" versions of FreeBSD -->
-<!ENTITY rel.current "11.0">
-<!ENTITY rel.current.date "October 2016">
+<!ENTITY rel.current "11.1">
+<!ENTITY rel.current.date "July 2017">
<!ENTITY rel.current.notes 'http://www.FreeBSD.org/releases/&rel.current;R/notes.html'>
<!ENTITY rel.current.hardware 'http://www.FreeBSD.org/releases/&rel.current;R/hardware.html'>
<!ENTITY rel.current.errata 'http://www.FreeBSD.org/releases/&rel.current;R/errata.html'>
+<!ENTITY rel0.current "11.0">
+<!ENTITY rel0.current.date "October 2016">
+<!ENTITY rel0.current.notes 'http://www.FreeBSD.org/releases/&rel0.current;R/notes.html'>
+<!ENTITY rel0.current.hardware 'http://www.FreeBSD.org/releases/&rel0.current;R/hardware.html'>
+<!ENTITY rel0.current.errata 'http://www.FreeBSD.org/releases/&rel0.current;R/errata.html'>
+
<!ENTITY rel2.current "10.3">
<!ENTITY rel2.current.date "April 2016">
<!ENTITY rel2.current.notes 'http://www.FreeBSD.org/releases/&rel2.current;R/notes.html'>
diff --git a/share/xml/navibar.ent b/share/xml/navibar.ent
index d435fb89b8..6ffc8f37e5 100644
--- a/share/xml/navibar.ent
+++ b/share/xml/navibar.ent
@@ -100,6 +100,8 @@
<a href="&u.rel.announce;">&rel.current;</a></li>
<li>Production Release: <br />
<a href="&u.rel0.announce;">&rel0.current;</a></li>
+ <li>Production Release: <br />
+ <a href="&u.rel1.announce;">&rel1.current;</a></li>
<li>Upcoming Release: <br />
<a href="&u.betarel2.schedule;">&betarel2.current;</a></li>
</ul>
diff --git a/share/xml/release.ent b/share/xml/release.ent
index 2e6f790eb4..ec9715cd83 100644
--- a/share/xml/release.ent
+++ b/share/xml/release.ent
@@ -34,12 +34,12 @@
below to "IGNORE". If we do, use "INCLUDE". -->
<!-- Set to 'INCLUDE' when the schedule is available. -->
-<!ENTITY beta.upcoming "INCLUDE">
-<!ENTITY % beta.upcoming "INCLUDE">
+<!ENTITY beta.upcoming "IGNORE">
+<!ENTITY % beta.upcoming "IGNORE">
<!-- Set to 'INCLUDE' when the installation images are available. -->
-<!ENTITY beta.testing "INCLUDE">
-<!ENTITY % beta.testing "INCLUDE">
+<!ENTITY beta.testing "IGNORE">
+<!ENTITY % beta.testing "IGNORE">
<!ENTITY betarel.current '11.1'>
<!ENTITY betarel.vers 'RC3'>
<!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
@@ -59,8 +59,8 @@
<!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
<!ENTITY rel.current.major '11'>
-<!ENTITY rel.current '11.0'>
-<!ENTITY rel.current.date 'October, 2016'>
+<!ENTITY rel.current '11.1'>
+<!ENTITY rel.current.date 'July, 2017'>
<!-- URLs to information on the latest release -->
<!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'>
@@ -71,25 +71,24 @@
<!ENTITY u.rel.readme '&base;/releases/&rel.current;R/readme.html'>
<!ENTITY u.rel.signatures '&base;/releases/&rel.current;R/signatures.html'>
-<!ENTITY rel0.current.major '10'>
-<!ENTITY rel0.current '10.3'>
-<!ENTITY rel0.current.date 'April, 2016'>
+<!ENTITY rel0.current.major '11'>
+<!ENTITY rel0.current '11.0'>
+<!ENTITY rel0.current.date 'October, 2016'>
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel0.notes '&base;/releases/&rel0.current;R/relnotes.html'>
-<!ENTITY u.rel0.announce '&base;/releases/&rel0.current;R/announce.html'>
-<!ENTITY u.rel0.errata '&base;/releases/&rel0.current;R/errata.html'>
-<!ENTITY u.rel0.hardware '&base;/releases/&rel0.current;R/hardware.html'>
-<!ENTITY u.rel0.installation '&base;/releases/&rel0.current;R/installation.html'>
-<!ENTITY u.rel0.readme '&base;/releases/&rel0.current;R/readme.html'>
-<!ENTITY u.rel0.signatures '&base;/releases/&rel0.current;R/signatures.html'>
+<!-- URLs to information on the latest rel0ease -->
+<!ENTITY u.rel0.notes '&base;/rel0eases/&rel0.current;R/rel0notes.html'>
+<!ENTITY u.rel0.announce '&base;/rel0eases/&rel0.current;R/announce.html'>
+<!ENTITY u.rel0.errata '&base;/rel0eases/&rel0.current;R/errata.html'>
+<!ENTITY u.rel0.hardware '&base;/rel0eases/&rel0.current;R/hardware.html'>
+<!ENTITY u.rel0.installation '&base;/rel0eases/&rel0.current;R/installation.html'>
+<!ENTITY u.rel0.readme '&base;/rel0eases/&rel0.current;R/readme.html'>
+<!ENTITY u.rel0.signatures '&base;/rel0eases/&rel0.current;R/signatures.html'>
-<!-- Secondary "current release" entities -->
<!ENTITY rel1.current.major '10'>
-<!ENTITY rel1.current '&rel1.current.major;.2'>
-<!ENTITY rel1.current.date 'August, 2015'>
+<!ENTITY rel1.current '10.3'>
+<!ENTITY rel1.current.date 'April, 2016'>
-<!-- URLs to information on the latest rel1ease -->
+<!-- URLs to information on the latest release -->
<!ENTITY u.rel1.notes '&base;/releases/&rel1.current;R/relnotes.html'>
<!ENTITY u.rel1.announce '&base;/releases/&rel1.current;R/announce.html'>
<!ENTITY u.rel1.errata '&base;/releases/&rel1.current;R/errata.html'>
@@ -98,10 +97,10 @@
<!ENTITY u.rel1.readme '&base;/releases/&rel1.current;R/readme.html'>
<!ENTITY u.rel1.signatures '&base;/releases/&rel1.current;R/signatures.html'>
-<!-- Tertiary "current release" entities -->
+<!-- Secondary "current release" entities -->
<!ENTITY rel2.current.major '10'>
-<!ENTITY rel2.current '&rel2.current.major;.1'>
-<!ENTITY rel2.current.date 'November, 2014'>
+<!ENTITY rel2.current '&rel2.current.major;.2'>
+<!ENTITY rel2.current.date 'August, 2015'>
<!-- URLs to information on the latest rel2ease -->
<!ENTITY u.rel2.notes '&base;/releases/&rel2.current;R/relnotes.html'>
@@ -110,11 +109,12 @@
<!ENTITY u.rel2.hardware '&base;/releases/&rel2.current;R/hardware.html'>
<!ENTITY u.rel2.installation '&base;/releases/&rel2.current;R/installation.html'>
<!ENTITY u.rel2.readme '&base;/releases/&rel2.current;R/readme.html'>
+<!ENTITY u.rel2.signatures '&base;/releases/&rel2.current;R/signatures.html'>
-<!-- Quaternary "current release" entities -->
-<!ENTITY rel3.current.major '9'>
-<!ENTITY rel3.current '&rel3.current.major;.3'>
-<!ENTITY rel3.current.date 'July, 2014'>
+<!-- Tertiary "current release" entities -->
+<!ENTITY rel3.current.major '10'>
+<!ENTITY rel3.current '&rel3.current.major;.1'>
+<!ENTITY rel3.current.date 'November, 2014'>
<!-- URLs to information on the latest release -->
<!ENTITY u.rel3.notes '&base;/releases/&rel3.current;R/relnotes.html'>
@@ -124,6 +124,19 @@
<!ENTITY u.rel3.installation '&base;/releases/&rel3.current;R/installation.html'>
<!ENTITY u.rel3.readme '&base;/releases/&rel3.current;R/readme.html'>
+<!-- Quaternary "current release" entities -->
+<!ENTITY rel4.current.major '9'>
+<!ENTITY rel4.current '&rel4.current.major;.3'>
+<!ENTITY rel4.current.date 'July, 2014'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel4.notes '&base;/releases/&rel4.current;R/relnotes.html'>
+<!ENTITY u.rel4.announce '&base;/releases/&rel4.current;R/announce.html'>
+<!ENTITY u.rel4.errata '&base;/releases/&rel4.current;R/errata.html'>
+<!ENTITY u.rel4.hardware '&base;/releases/&rel4.current;R/hardware.html'>
+<!ENTITY u.rel4.installation '&base;/releases/&rel4.current;R/installation.html'>
+<!ENTITY u.rel4.readme '&base;/releases/&rel4.current;R/readme.html'>
+
<!ENTITY gnomeoldver '2.30'>
<!ENTITY gnomever '2.32'>
<!ENTITY gnomedevelver '3.6'>