From eb20c7f9b0c58a645e8fc3218f27874deb7a0202 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Wed, 26 Jul 2017 01:00:20 +0000 Subject: [PATCH] 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 --- en_US.ISO8859-1/htdocs/releng/index.xml | 6 -- en_US.ISO8859-1/htdocs/security/security.xml | 7 ++ en_US.ISO8859-1/htdocs/where.xml | 98 ++++++++++++++++---- share/xml/freebsd.ent | 10 +- share/xml/navibar.ent | 2 + share/xml/release.ent | 73 +++++++++------ 6 files changed, 140 insertions(+), 56 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 @@ -49,12 +49,6 @@ Information - - July 2017 - &os; 11.1 - Target Schedule - - October 2017 &os; 10.4 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 @@ October 10, 2016 11.1-RELEASE + 3 months + + releng/11.1 + 11.1-RELEASE + n/a + July 26, 2017 + 11.2-RELEASE + 3 months +

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 @@

@@ -151,14 +151,19 @@
  • README
  • amd64
  • i386
    • +
  • aarch64
    • @@ -178,6 +183,61 @@
    + + +

    &os; &rel1.current;-RELEASE

    + + + + + + + + + + + + + + + + +
    Installer ImagesVirtual Machine ImagesSD Card ImagesDocumentation
    + + + + + + + +
    +
    + &beta.desc; @@ -248,6 +308,7 @@

     

    + &os; &rel.current;-STABLE @@ -301,8 +362,9 @@

     

    + ?> -

    &os; &rel0.current;-STABLE

    +

    &os; &rel1.current;-STABLE

    @@ -315,34 +377,34 @@ 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 --> - - + + + + + + + + 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 @@ &rel.current;
  • Production Release:
    &rel0.current;
    • +
  • Production Release:
    + &rel1.current;
  • Upcoming Release:
    &betarel2.current;
    • 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". --> - - + + - - + + @@ -59,8 +59,8 @@ - - + + @@ -71,25 +71,24 @@ - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - @@ -98,10 +97,10 @@ - + - - + + @@ -110,11 +109,12 @@ + - - - - + + + + @@ -124,6 +124,19 @@ + + + + + + + + + + + + +