svn commit: r321310 - in stable/11: release/doc/share/xml sys/conf

[Glen Barber]

Author: gjb
Date: Thu Jul 20 23:44:39 2017
New Revision: 321310
URL: https://svnweb.freebsd.org/changeset/base/321310

Log:
  - Set stable/11 from -PRERELEASE back to -STABLE.
  - Update version entities in release.ent.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/doc/share/xml/release.ent
  stable/11/sys/conf/newvers.sh

Modified: stable/11/release/doc/share/xml/release.ent
==============================================================================
--- stable/11/release/doc/share/xml/release.ent	Thu Jul 20 23:39:50 2017	(r321309)
+++ stable/11/release/doc/share/xml/release.ent	Thu Jul 20 23:44:39 2017	(r321310)
@@ -6,7 +6,7 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "11.0-STABLE">
+<!ENTITY release.current "11.1-STABLE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
@@ -19,10 +19,10 @@
 <!ENTITY release.prev.stable "10.3-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "11.1-RELEASE">
+<!ENTITY release.next "11.2-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "11.0-STABLE">
+<!ENTITY release.branch "11.1-STABLE">
 
 <!-- The URL for obtaining this version of FreeBSD. -->
 <!ENTITY release.url "https://www.FreeBSD.org/snapshots/">

Modified: stable/11/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh	Thu Jul 20 23:39:50 2017	(r321309)
+++ stable/11/sys/conf/newvers.sh	Thu Jul 20 23:44:39 2017	(r321310)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.1"
-BRANCH="PRERELEASE"
+BRANCH="STABLE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi