Index: head/share/xml/release.ent
===================================================================
--- head/share/xml/release.ent	(revision 53218)
+++ head/share/xml/release.ent	(revision 53219)
@@ -1,142 +1,181 @@
 <!-- $FreeBSD$ -->
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- The currently released versions of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time.  When you update this, you should also
      update (at least) the following:
 
 	- similar entity in the Handbook
 	- similar entity in the Relnotes
 	- releases/index.xml has the date of the current release
 	- the FAQ has links to the release FTP url
 	- "versions supported" in security.xml
 
      (If you're the release engineer, feel free to update this list with
      other doc-related things you had to do.  It'll save you time and
      trouble the next time around :-).)
 
      As of 5.0, we now have the concept of two different "currently"
      released versions (from two different development branches).  Use
      rel.* and u.rel.* for the "latest and greatest" version and
      rel2.* and u.rel2.* for the "conservative users" version.
 -->
 
 <!-- Do not set this to 'INCLUDE' in this file. -->
 <!ENTITY % beta.local.where "IGNORE">
 <!ENTITY % beta2.local.where "IGNORE">
 
 <!ENTITY rel.head.major '13'>
 <!ENTITY rel.head '&rel.head.major;.0'>
 
 <!-- If there is no release currently in the release cycle (i.e. we
       don't have something in BETAn or RCn), then change %beta.testing
       below to "IGNORE".  If we do, use "INCLUDE". -->
 
 <!-- Set to 'INCLUDE' when the schedule is available. -->
 <!ENTITY beta.upcoming "INCLUDE">
 <!ENTITY % beta.upcoming "INCLUDE">
 
 <!-- Set to 'INCLUDE' when the installation images are available. -->
 <!ENTITY beta.testing "INCLUDE">
 <!ENTITY % beta.testing "INCLUDE">
 <!ENTITY betarel.current '11.3'>
 <!ENTITY betarel.vers 'RC3'>
 <!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
       are having release candidates at the same time), do the same here.  -->
 
 <!-- Set to 'INCLUDE' when the schedule is available. -->
 <!ENTITY beta2.upcoming "INCLUDE">
 <!ENTITY % beta2.upcoming "INCLUDE">
 
 <!-- Set to 'INCLUDE' when the installation images are available. -->
 <!ENTITY beta2.testing "IGNORE">
 <!ENTITY % beta2.testing "IGNORE">
 <!ENTITY betarel2.current '12.1'>
 <!ENTITY betarel2.vers 'RELEASE'>
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
-<!ENTITY rel.current.major '12'>
-<!ENTITY rel.current '12.0'>
-<!ENTITY rel.current.date 'December, 2018'>
+ <!-- Release-specific macros to help keep other macros such as
+      rel.current up-to-date without needing to do an entire tree
+      sweep.  This allows switching rel.current, rel1.current, and
+      rel2.current versions below with updated macros here, ultimately
+      touching as few files as necessary.
 
+      Note, this is a first pass at this structure, and by no means
+      fully complete yet.  I plan to followup on this and expand it
+      more (in addition to cleaning up this file) following the 11.3
+      release (likely as part of the 11.3 announcement commit). -gjb
+ -->
+
+<!ENTITY rel120.current.major '12'>
+<!ENTITY rel120.current '12.0'>
+<!ENTITY rel120.current.date 'December, 2018'>
+
 <!-- URLs to information on the latest release -->
-<!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'>
-<!ENTITY u.rel.announce '&base;/releases/&rel.current;R/announce.html'>
-<!ENTITY u.rel.errata '&base;/releases/&rel.current;R/errata.html'>
-<!ENTITY u.rel.hardware '&base;/releases/&rel.current;R/hardware.html'>
-<!ENTITY u.rel.installation '&base;/releases/&rel.current;R/installation.html'>
-<!ENTITY u.rel.readme '&base;/releases/&rel.current;R/readme.html'>
-<!ENTITY u.rel.signatures '&base;/releases/&rel.current;R/signatures.html'>
+<!ENTITY u.rel120.notes '&base;/releases/&rel120.current;R/relnotes.html'>
+<!ENTITY u.rel120.announce '&base;/releases/&rel120.current;R/announce.html'>
+<!ENTITY u.rel120.errata '&base;/releases/&rel120.current;R/errata.html'>
+<!ENTITY u.rel120.hardware '&base;/releases/&rel120.current;R/hardware.html'>
+<!ENTITY u.rel120.installation '&base;/releases/&rel120.current;R/installation.html'>
+<!ENTITY u.rel120.readme '&base;/releases/&rel120.current;R/readme.html'>
+<!ENTITY u.rel120.signatures '&base;/releases/&rel120.current;R/signatures.html'>
 
-<!ENTITY rel1.current.major '11'>
-<!ENTITY rel1.current '11.2'>
-<!ENTITY rel1.current.date 'June, 2018'>
+<!ENTITY rel112.current.major '11'>
+<!ENTITY rel112.current '11.2'>
+<!ENTITY rel112.current.date 'June, 2018'>
 
 <!-- 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'>
-<!ENTITY u.rel1.hardware '&base;/releases/&rel1.current;R/hardware.html'>
-<!ENTITY u.rel1.installation '&base;/releases/&rel1.current;R/installation.html'>
-<!ENTITY u.rel1.readme '&base;/releases/&rel1.current;R/readme.html'>
-<!ENTITY u.rel1.signatures '&base;/releases/&rel1.current;R/signatures.html'>
+<!ENTITY u.rel112.notes '&base;/releases/&rel112.current;R/relnotes.html'>
+<!ENTITY u.rel112.announce '&base;/releases/&rel112.current;R/announce.html'>
+<!ENTITY u.rel112.errata '&base;/releases/&rel112.current;R/errata.html'>
+<!ENTITY u.rel112.hardware '&base;/releases/&rel112.current;R/hardware.html'>
+<!ENTITY u.rel112.installation '&base;/releases/&rel112.current;R/installation.html'>
+<!ENTITY u.rel112.readme '&base;/releases/&rel112.current;R/readme.html'>
+<!ENTITY u.rel112.signatures '&base;/releases/&rel112.current;R/signatures.html'>
 
 <!-- Tertiary "current release" entities -->
 <!ENTITY rel3.current.major '10'>
 <!ENTITY rel3.current '&rel3.current.major;.2'>
 <!ENTITY rel3.current.date 'August, 2015'>
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel3.notes '&base;/releases/&rel3.current;R/relnotes.html'>
 <!ENTITY u.rel3.announce '&base;/releases/&rel3.current;R/announce.html'>
 <!ENTITY u.rel3.errata '&base;/releases/&rel3.current;R/errata.html'>
 <!ENTITY u.rel3.hardware '&base;/releases/&rel3.current;R/hardware.html'>
 <!ENTITY u.rel3.installation '&base;/releases/&rel3.current;R/installation.html'>
 <!ENTITY u.rel3.readme '&base;/releases/&rel3.current;R/readme.html'>
 <!ENTITY u.rel3.signatures '&base;/releases/&rel3.current;R/signatures.html'>
 
 <!-- URLs to old releases, kept so the build succeeds -->
 <!ENTITY rel0.current.major '11'>
 <!ENTITY rel0.current '11.0'>
 <!ENTITY rel0.current.date 'October, 2016'>
 
 <!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 for backwards compatibility with previous doc structure -->
+<!ENTITY rel.current.major '&rel120.current.major;'>
+<!ENTITY rel.current '&rel120.current;'>
+<!ENTITY rel.current.date '&rel120.current.date;'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel.notes '&u.rel120.notes;'>
+<!ENTITY u.rel.announce '&u.rel120.announce;'>
+<!ENTITY u.rel.errata '&u.rel120.errata;'>
+<!ENTITY u.rel.hardware '&u.rel120.hardware;'>
+<!ENTITY u.rel.installation '&u.rel120.installation;'>
+<!ENTITY u.rel.readme '&u.rel120.readme;'>
+<!ENTITY u.rel.signatures '&u.rel120.signatures;'>
+
+<!ENTITY rel1.current.major '&rel112.current.major;'>
+<!ENTITY rel1.current '&rel112.current;'>
+<!ENTITY rel1.current.date 'rel112.current.date;'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel1.notes '&u.rel112.notes;'>
+<!ENTITY u.rel1.announce '&u.rel112.announce;'>
+<!ENTITY u.rel1.errata '&u.rel112.errata;'>
+<!ENTITY u.rel1.hardware '&u.rel112.hardware;'>
+<!ENTITY u.rel1.installation '&u.rel112.installation;'>
+<!ENTITY u.rel1.readme '&u.rel112.readme;'>
+<!ENTITY u.rel1.signatures '&u.rel112.signatures;'>
 
 <!ENTITY rel2.current.major '10'>
 <!ENTITY rel2.current '10.4'>
 <!ENTITY rel2.current.date 'October, 2017'>
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel2.notes '&base;/releases/&rel2.current;R/relnotes.html'>
 <!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'>
 <!ENTITY u.rel2.errata '&base;/releases/&rel2.current;R/errata.html'>
 <!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 rel4.current.major '10'>
 <!ENTITY rel4.current '&rel4.current.major;.1'>
 <!ENTITY rel4.current.date 'November, 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'>