Index: stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl
===================================================================
--- stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl	(revision 271470)
+++ stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl	(revision 271471)
@@ -1,27 +1,28 @@
 <?xml version="1.0"?>
 <!-- $FreeBSD$ -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'
                 xmlns="http://www.w3.org/TR/xhtml1/transitional"
                 xmlns:db="http://docbook.org/ns/docbook"
                 exclude-result-prefixes="db">
 
   <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,
       can be downloaded from <a href="{$release.url}"><xsl:value-of select="$release.url"/></a>.</small></p>
 
     <p align="center"><small>For questions about FreeBSD, read the
       <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,
       e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
   </xsl:template>
 </xsl:stylesheet>
Index: stable/10/release/doc/share/mk/doc.relnotes.mk
===================================================================
--- stable/10/release/doc/share/mk/doc.relnotes.mk	(revision 271470)
+++ stable/10/release/doc/share/mk/doc.relnotes.mk	(revision 271471)
@@ -1,51 +1,53 @@
 # $FreeBSD$
 
 DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 
 # XXX
 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"
 PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'snapshot'"
 .elif ${RELEASETYPE} == "release"
 PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'release'"
 .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 \
 		 file://${RELN_ROOT}/share/xml/catalog.xml
 
 XSLXHTML= http://www.FreeBSD.org/release/XML/share/xml/release.xsl
 
 #
 # Automatic device list generation:
 #
 .if exists(${RELN_ROOT}/../man4)
 MAN4DIR?=	${RELN_ROOT}/../man4
 .elif exists(${RELN_ROOT}/../../man4)
 MAN4DIR?=	${RELN_ROOT}/../../man4
 .else
 MAN4DIR?=	${RELN_ROOT}/../../share/man/man4
 .endif
 MAN4PAGES?=	${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4
 ARCHLIST?=	${RELN_ROOT}/share/misc/dev.archlist.txt
 DEV-AUTODIR=	${RELN_ROOT:S/${.CURDIR}/${.OBJDIR}/}/share/xml
 CLEANFILES+=	${DEV-AUTODIR}/dev-auto.ent
 
 MAN2HWNOTES_CMD=${RELN_ROOT}/share/misc/man2hwnotes.pl
 .if defined(HWNOTES_MI)
 MAN2HWNOTES_FLAGS=
 .else
 MAN2HWNOTES_FLAGS=	-c
 .endif
 
 # Dependency that the article makefiles can use to pull in
 # dev-auto.ent.
 ${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.ent: ${MAN4PAGES} \
 	${ARCHLIST} ${MAN2HWNOTES_CMD}
 	cd ${RELN_ROOT}/share/xml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.ent
Index: stable/10/release/doc/share/xml/release.ent
===================================================================
--- stable/10/release/doc/share/xml/release.ent	(revision 271470)
+++ stable/10/release/doc/share/xml/release.ent	(revision 271471)
@@ -1,72 +1,75 @@
 <!-- -*- sgml -*-
 
      $FreeBSD$
 
      OS Release Information -->
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
 <!ENTITY release.current "10.0-STABLE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
      branchpoint. -->
 <!ENTITY release.prev "10.0-RELEASE">
 
 <!-- The previous stable release, useful for pointing user's at the
      release they SHOULD be running if they don't want the bleeding
      edge. -->
 <!ENTITY release.prev.stable "10.0-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
 <!ENTITY release.next "10.1-RELEASE">
 
 <!-- The name of this branch. -->
 <!ENTITY release.branch "10.0-STABLE">
 
 <!-- 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
      doc.relnotes.mk when updating this -->
 <!ENTITY release.type "snapshot">
 <!ENTITY % release.type.current  "INCLUDE">
 <!ENTITY % release.type.snapshot "IGNORE">
 <!ENTITY % release.type.release "IGNORE">
 
 <![%release.type.current;[
 <!ENTITY release '&release.current;'>
 ]]>
 <![%release.type.snapshot;[
 <!ENTITY release '&release.prev;'>
 ]]>
 <![%release.type.release;[
 <!ENTITY release '&release.current;'>
 ]]>
 <!ENTITY release ''>
 
 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">
 <!ENTITY release.manpath.xorg          "7.5.1">
 <!ENTITY release.manpath.netbsd        "5.1">
 <!ENTITY release.manpath.freebsd-ports "Ports">
 <!ENTITY release.manpath.freebsd       "10-stable">
 
 <!-- Text constants which probably don't need to be changed.-->
 
 <!-- Name of our OS.  This is almost certainly going to remain
      FreeBSD, but we might want to try to do some other formatting or
      other fancy markup on it in the future. -->
 <!ENTITY os "FreeBSD">
 
 <!-- Architecture names -->
 <!ENTITY arch.amd64 "amd64">
 <!ENTITY arch.arm "arm">
 <!ENTITY arch.i386 "i386">
 <!ENTITY arch.ia64 "ia64">
 <!ENTITY arch.mips "mips">
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
 <!ENTITY arch.sparc64 "sparc64">
Index: stable/10/release/doc/share/xml/release.xsl
===================================================================
--- stable/10/release/doc/share/xml/release.xsl	(revision 271470)
+++ stable/10/release/doc/share/xml/release.xsl	(revision 271471)
@@ -1,105 +1,106 @@
 <?xml version="1.0"?>
 <!-- $FreeBSD$ -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'
                 xmlns="http://www.w3.org/TR/xhtml1/transitional"
                 xmlns:db="http://docbook.org/ns/docbook"
                 exclude-result-prefixes="db">
 
   <xsl:import href="http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml.xsl"/>
 
   <xsl:import href="http://www.FreeBSD.org/release/XML/lang/share/xml/release.xsl"/>
 
   <xsl:param name="release.url"/>
   <xsl:param name="release.branch"/>
+  <xsl:param name="release.maillist"/>
 
   <xsl:template name="paragraph">
     <xsl:param name="class" select="''"/>
     <xsl:param name="content"/>
 
     <xsl:variable name="p">
       <p>
 	<xsl:choose>
           <xsl:when test="$class != ''">
             <xsl:call-template name="common.html.attributes">
               <xsl:with-param name="class" select="$class"/>
              </xsl:call-template>
            </xsl:when>
           <xsl:otherwise>
             <xsl:call-template name="locale.html.attributes"/>
            </xsl:otherwise>
 	 </xsl:choose>
 	<xsl:if test="@arch">
 	  <xsl:value-of select="concat('[', @arch, ']')"/>
 	  <xsl:value-of select='" "'/>
 	</xsl:if>
 	<xsl:copy-of select="$content"/>
 	<xsl:value-of select='" "'/>
 	<xsl:if test="@revision">
 	  <xsl:element name="a">
 	    <xsl:attribute name="href">
 	      <xsl:value-of select="concat('http://svn.freebsd.org/viewvc/base?view=revision&#38;revision=', @revision)"/>
 	    </xsl:attribute>
 	    <xsl:value-of select="concat('[r', @revision, ']')"/>
 	  </xsl:element>
 	</xsl:if>
 	<xsl:if test="@contrib">
 	  <xsl:element name="span">
 	    <xsl:attribute name="class">
 	      <xsl:value-of select="'contrib'"/>
 	    </xsl:attribute>
 	    <xsl:choose>
 	      <xsl:when test="@contrib = 'sponsor'">
 		<xsl:if test="@sponsor != ''">
 		  (Sponsored by
 		  <xsl:choose>
 		    <xsl:when test="@sponsorurl != ''">
 		      <xsl:element name="a">
 			<xsl:attribute name="href">
 			  <xsl:value-of select="@sponsorurl"/>
 			</xsl:attribute>
 			<xsl:value-of select="concat(@sponsor, ')')"/>
 		      </xsl:element>
 		    </xsl:when>
 		    <xsl:otherwise>
 		      <xsl:value-of select="concat(@sponsor, ')')"/>
 		    </xsl:otherwise>
 		  </xsl:choose>
 		</xsl:if>
 	      </xsl:when>
 	      <xsl:when test="@contrib = 'vendor'">
 		<xsl:if test="@vendor != ''">
 		  (Contributed / provided by
 		  <xsl:choose>
 		    <xsl:when test="@vendorurl != ''">
 		      <xsl:element name="a">
 			<xsl:attribute name="href">
 			  <xsl:value-of select="@vendorurl"/>
 			</xsl:attribute>
 			<xsl:value-of select="concat(@vendor, ')')"/>
 		      </xsl:element>
 		    </xsl:when>
 		    <xsl:otherwise>
 		      <xsl:value-of select="concat(@vendor, ')')"/>
 		    </xsl:otherwise>
 		  </xsl:choose>
 		</xsl:if>
 	      </xsl:when>
 	    </xsl:choose>
 	  </xsl:element>
 	</xsl:if>
        </p>
      </xsl:variable>
 
     <xsl:choose>
       <xsl:when test="$html.cleanup != 0">
 	<xsl:call-template name="unwrap.p">
           <xsl:with-param name="p" select="$p"/>
 	 </xsl:call-template>
        </xsl:when>
       <xsl:otherwise>
 	<xsl:copy-of select="$p"/>
        </xsl:otherwise>
      </xsl:choose>
    </xsl:template>
 </xsl:stylesheet>
Index: stable/10
===================================================================
--- stable/10	(revision 271470)
+++ stable/10	(revision 271471)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r271331