From 361246024afda638e12acf8c9555e0826e36d558 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 9 Sep 2014 19:51:57 +0000
Subject: [PATCH] Change how the recommended mailing list to track is added to
 the footer of the release/doc/ pages by moving a hard-coded value (that is
 subject to human error to change) to release.ent where other values are
 regularly changed, and adding parsing logic to release.xsl.

Approved by:	re (implicit)
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
---
 release/doc/en_US.ISO8859-1/share/xml/release.xsl | 3 ++-
 release/doc/share/mk/doc.relnotes.mk              | 2 ++
 release/doc/share/xml/release.ent                 | 3 +++
 release/doc/share/xml/release.xsl                 | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/release/doc/en_US.ISO8859-1/share/xml/release.xsl b/release/doc/en_US.ISO8859-1/share/xml/release.xsl
index f1d14795f794..a854cd903bc5 100644
--- a/release/doc/en_US.ISO8859-1/share/xml/release.xsl
+++ b/release/doc/en_US.ISO8859-1/share/xml/release.xsl
@@ -8,6 +8,7 @@
 
   <xsl:param name="release.url"/>
   <xsl:param name="release.branch"/>
+  <xsl:param name="release.maillist"/>
 
   <xsl:template name="user.footer.content">
     <p align="center"><small>This file, and other release-related documents,
@@ -18,7 +19,7 @@
       contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.</small></p>
 
     <p align="center"><small>All users of FreeBSD <xsl:value-of select="$release.branch"/> should
-      subscribe to the &lt;<a href="mailto:current@FreeBSD.org">current@FreeBSD.org</a>&gt;
+      subscribe to the &lt;<a href="mailto:{$release.maillist}@FreeBSD.org"><xsl:value-of select="$release.maillist"/>@FreeBSD.org</a>&gt;
       mailing list.</small></p>
   
     <p align="center"><small>For questions about this documentation,
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index 8034c6315d3d..8ae9fd0e92c0 100644
--- a/release/doc/share/mk/doc.relnotes.mk
+++ b/release/doc/share/mk/doc.relnotes.mk
@@ -6,6 +6,7 @@ DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 RELEASETYPE!= grep -o 'release.type "[a-z]*"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[a-z.]* "\([a-z]*\)"|\1|'
 RELEASEURL!= grep -o 'release.url \"[^\"]*\"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|'
 RELEASEBRANCH!= grep -o 'release.branch "\([^"]*\)"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|'
+RELEASEMAILLIST!= grep -o 'release.maillist "\([^"]*\)"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|'
 .if ${RELEASETYPE} == "current"
 PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'current'"
 .elif ${RELEASETYPE} == "snapshot"
@@ -15,6 +16,7 @@ PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'re
 .endif
 XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'"
 XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'"
+XSLTPROCFLAGS+= --param release.maillist "'${RELEASEMAILLIST}'"
 
 # Find the RELNOTESng document catalogs
 EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index bdd58b70bd6a..5cc3c859e7bc 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -27,6 +27,9 @@
 <!-- The URL for obtaining this version of FreeBSD. -->
 <!ENTITY release.url "http://www.FreeBSD.org/snapshots/">
 
+<!-- The recommended mailing list to track. -->
+<!ENTITY release.maillist "current">
+
 <!-- The type of release (usually this will be either "snapshot"
      or "release" -->
 <!-- WARNING: Do not forget to also change the release type in
diff --git a/release/doc/share/xml/release.xsl b/release/doc/share/xml/release.xsl
index d3616a0c2beb..f76ae683d8a5 100644
--- a/release/doc/share/xml/release.xsl
+++ b/release/doc/share/xml/release.xsl
@@ -12,6 +12,7 @@
 
   <xsl:param name="release.url"/>
   <xsl:param name="release.branch"/>
+  <xsl:param name="release.maillist"/>
 
   <xsl:template name="paragraph">
     <xsl:param name="class" select="''"/>