MFC r271331:

  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, relnotes)
Sponsored by:	The FreeBSD Foundation

4 files changed, 9 insertions, 2 deletions

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 f18e31a..a854cd9 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,
@@ -17,8 +18,8 @@
       <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
       contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.</small></p>
 
-    <p align="center"><small>All users of FreeBSD stable should
-      subscribe to the &lt;<a href="mailto:stable@FreeBSD.org">stable@FreeBSD.org</a>&gt;
+    <p align="center"><small>All users of FreeBSD <xsl:value-of select="$release.branch"/> should
+      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 8034c63..8ae9fd0 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 8fb6161..c1c9aa8 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 "stable">
+
 <!-- 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 d3616a0..f76ae68 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="''"/>