From 2be2981abbffd64f7064258c5db2f7a8f8c32746 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 2 Jun 2018 01:27:07 +0000
Subject: [PATCH] - Update download URLs for 11.2 to point to RC1. - Uncomment
 the signatures.html, hardware.html, readme.html,   and relnotes.html pages on
 the 11.2-RELEASE index page. - Connect the hardware.html, readme.html,
 relnotes.html pages   to the build. - Connect the CHECKSUM* files for
 11.2-RC1 to the build.

Approveed by:	re (implicit)

Sponsored by:	The FreeBSD Foundation
---
 .../htdocs/releases/11.2R/Makefile            | 37 +++++++++++--------
 .../htdocs/releases/11.2R/index.xml           |  6 ++-
 share/xml/release.ent                         |  2 +-
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/releases/11.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/11.2R/Makefile
index 5256a13dd5..380e067be5 100644
--- a/en_US.ISO8859-1/htdocs/releases/11.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/11.2R/Makefile
@@ -9,13 +9,16 @@
 
 _OS?=		FreeBSD
 _REVISION?=	11.2
-_BRANCH?=	RELEASE
+_BRANCH?=	RC1
 THISRELEASE?=	${_OS}-${_REVISION}-${_BRANCH}
 
 DOCS=	index.xml \
 	schedule.xml
 
-DATA=	docbook.css
+DATA=	docbook.css \
+	hardware.html \
+	readme.html \
+	relnotes.html
 
 # PGP-signed checksums
 
@@ -30,27 +33,31 @@ _VMS?=		amd64 \
 		i386 \
 		arm64-aarch64
 
-_ARM?=		BANANAPI \
+_ARM?=		GUMSTIX
+
+_ARMV6?=	BANANAPI \
 		BEAGLEBONE \
 		CUBIEBOARD \
 		CUBIEBOARD2 \
 		CUBOX-HUMMINGBOARD \
-		GUMSTIX \
 		PANDABOARD \
 		RPI-B \
 		RPI2 \
 		WANDBOARD
 
-#.for CHECKSUM in SHA512 SHA256
-#. for _B in ${_BIGIRON}
-#DATA+=		CHECKSUM.${CHECKSUM}-${THISRELEASE}-${_B}.asc
-#. endfor
-#. for _V in ${_VMS}
-#DATA+=		CHECKSUM.${CHECKSUM}-${THISRELEASE}-${_V}-vm.asc
-#. endfor
-#. for _A in ${_ARM}
-#DATA+=		CHECKSUM.${CHECKSUM}-${THISRELEASE}-arm-armv6-${_A}.asc
-#. endfor
-#.endfor
+.for CHECKSUM in SHA512 SHA256
+. for _B in ${_BIGIRON}
+DATA+=		CHECKSUM.${CHECKSUM}-${THISRELEASE}-${_B}.asc
+. endfor
+. for _V in ${_VMS}
+DATA+=		CHECKSUM.${CHECKSUM}-${THISRELEASE}-${_V}-vm.asc
+. endfor
+. for _A in ${_ARM}
+DATA+=		CHECKSUM.${CHECKSUM}-${THISRELEASE}-arm-${_A}.asc
+. endfor
+. for _A in ${_ARMV6}
+DATA+=		CHECKSUM.${CHECKSUM}-${THISRELEASE}-arm-armv6-${_A}.asc
+. endfor
+.endfor
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/11.2R/index.xml b/en_US.ISO8859-1/htdocs/releases/11.2R/index.xml
index a183911549..4a66a7eb1f 100644
--- a/en_US.ISO8859-1/htdocs/releases/11.2R/index.xml
+++ b/en_US.ISO8859-1/htdocs/releases/11.2R/index.xml
@@ -31,12 +31,13 @@
     <a href="&base;/releases/&local.rel;R/schedule.html"
       >&os;&nbsp;&local.rel;-RELEASE schedule</a><br/>
 
-    <?ignore
     <a href="&base;/releases/&local.rel;R/signatures.html"
       >&os;&nbsp;&local.rel;-RELEASE signed checksum files</a><br/>
 
+    <?ignore
     <a href="&base;/releases/&local.rel;R/installation.html"
       >&os;&nbsp;&local.rel;-RELEASE installation information</a><br/>
+    ?>
 
     <a href="&base;/releases/&local.rel;R/hardware.html"
       >&os;&nbsp;&local.rel;-RELEASE hardware information</a><br/>
@@ -44,12 +45,15 @@
     <a href="&base;/releases/&local.rel;R/relnotes.html"
       >&os;&nbsp;&local.rel;-RELEASE release notes</a><br/>
 
+    <?ignore
     <a href="&base;/releases/&local.rel;R/errata.html"
       >&os;&nbsp;&local.rel;-RELEASE errata</a><br/>
+    ?>
 
     <a href="&base;/releases/&local.rel;R/readme.html"
       >&os;&nbsp;&local.rel;-RELEASE readme</a><br/>
 
+    <?ignore
     <a href="&base;/releases/&local.rel;R/todo.html">&os; Release
       Engineering TODO Page</a><br/>
     ?>
diff --git a/share/xml/release.ent b/share/xml/release.ent
index b9ab0ce852..70e83fc6f0 100644
--- a/share/xml/release.ent
+++ b/share/xml/release.ent
@@ -41,7 +41,7 @@
 <!ENTITY beta.testing "INCLUDE">
 <!ENTITY % beta.testing "INCLUDE">
 <!ENTITY betarel.current '11.2'>
-<!ENTITY betarel.vers 'BETA3'>
+<!ENTITY betarel.vers 'RC1'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
 
 <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y