Revert r52398, and properly set BRANCH to fix the build.

Sponsored by:	The FreeBSD Foundation

en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.hardware

@@ -5,7 +5,7 @@ _OS?=		FreeBSD
 _REVMAJOR?=	12
 _REVMINOR?=	0
 _REVISION?=	${REVMAJOR}.${REVMINOR}
-_BRANCH?=	CURRENT
+_BRANCH?=	BETA1
 THISRELEASE?=	${_OS}-${_REVISION}-${_BRANCH}
 
 HOSTNAME!=	hostname

en_US.ISO8859-1/htdocs/releases/12.0R/hardware/hardware.xml

@@ -639,11 +639,11 @@
 
       &hwlist.aac;
 
-      <!--&hwlist.adv;-->
+      &hwlist.adv;
 
-      <!--&hwlist.adw;-->
+      &hwlist.adw;
 
-      <!--&hwlist.aha;-->
+      &hwlist.aha;
 
       &hwlist.ahc;
 
@@ -651,7 +651,7 @@
 
       &hwlist.ahd;
 
-      <!--&hwlist.aic;-->
+      &hwlist.aic;
 
       &hwlist.amr;
 
@@ -661,7 +661,7 @@
 
       &hwlist.ciss;
 
-      <!--&hwlist.dpt;-->
+      &hwlist.dpt;
 
       <note>
 	<para>[&arch.amd64;, &arch.i386;] Booting from these
@@ -711,11 +711,11 @@
 
       &hwlist.mvs;
 
-      <!--&hwlist.ncr;-->
+      &hwlist.ncr;
 
-      <!--&hwlist.ncv;-->
+      &hwlist.ncv;
 
-      <!--&hwlist.nsp;-->
+      &hwlist.nsp;
 
       &hwlist.pms;
 
@@ -723,7 +723,7 @@
 
       &hwlist.siis;
 
-      <!--&hwlist.stg;-->
+      &hwlist.stg;
 
       &hwlist.sym;