svn commit: r53219 - head/share/xml

[Glen Barber]

Author: gjb
Date: Wed Jul  3 17:47:44 2019
New Revision: 53219
URL: https://svnweb.freebsd.org/changeset/doc/53219

Log:
  Add relXXY macros to be used by other macros, i.e., relX.current.
  
  This is mentioned in a comment in the file, but more work on this
  file is planned, likely as part of the 11.3 announcement commit.
  
  The idea behind this is rel.current and rel1.current (and others)
  will include rel120.current (for 12.0) and rel112.current (for 11.2)
  in order to reduce the number of files touched in the tree when
  a new release is available, or a release reaches end-of-life.
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  head/share/xml/release.ent

Modified: head/share/xml/release.ent
==============================================================================
--- head/share/xml/release.ent	Wed Jul  3 17:05:44 2019	(r53218)
+++ head/share/xml/release.ent	Wed Jul  3 17:47:44 2019	(r53219)
@@ -58,31 +58,43 @@
 <!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'>
@@ -110,6 +122,33 @@
 <!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'>