[master] [rt37398] version string in ARM page footers

3986.	[doc]		Add the BIND version number to page footers
			in the ARM. [RT #37398]

diff --git a/CHANGES b/CHANGES
index ae158e6068d3dfde83f459d16830cd3434e1c929..fd75bd95408a1d936b601836d856d8a645c41738 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3986.  [doc]           Add the BIND version number to page footers 
+                       in the ARM. [RT #37398]
+
 3985.  [doc]           Describe how +ndots and +search interact in dig.
                        [RT #37529]
 

diff --git a/configure b/configure
index d55acf425fb59794feba0987e7641ad2aaf1d801..e4f4987819f7c769643538063097cad35f29d25d 100755 (executable)
--- a/configure
+++ b/configure
@@ -667,6 +667,7 @@ SO_CFLAGS
 SO
 BIND9_CONFIGARGS
 BIND9_SRCID
+BIND9_VERSIONSTRING
 BIND9_MAJOR
 BIND9_VERSION
 BIND9_DESCRIPTION
@@ -20513,6 +20514,8 @@ BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASE
 
 BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
 
+BIND9_VERSIONSTRING="${PRODUCT} ${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}${EXTENSIONS}${DESCRIPTION:+ }${DESCRIPTION}"
+
 
 BIND9_SRCID="SRCID=unset"
 if test -f "${srcdir}/srcid"; then

diff --git a/configure.in b/configure.in
index 6001e0aa18af184b94b8da727d0e9fbb8d5ed91b..59c78162222f79354a21c2ce4a7d5ec303b89b01 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4134,6 +4134,8 @@ BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASE
 AC_SUBST(BIND9_VERSION)
 BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
 AC_SUBST(BIND9_MAJOR)
+BIND9_VERSIONSTRING="${PRODUCT} ${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}${EXTENSIONS}${DESCRIPTION:+ }${DESCRIPTION}"
+AC_SUBST(BIND9_VERSIONSTRING)
 
 BIND9_SRCID="SRCID=unset"
 if test -f "${srcdir}/srcid"; then

diff --git a/doc/xsl/isc-docbook-chunk.xsl.in b/doc/xsl/isc-docbook-chunk.xsl.in
index fde5362ffa0c6a525fa4b24eb43fd5dbeebdf808..f87b7c12cfa286f87f94523b74a0ed542a0c92da 100644 (file)
--- a/doc/xsl/isc-docbook-chunk.xsl.in
+++ b/doc/xsl/isc-docbook-chunk.xsl.in
@@ -57,7 +57,7 @@
   </xsl:template>
 
   <xsl:template name="user.footer.navigation">
-    <p style="text-align: center;">BIND Version @PACKAGE_VERSION@</p>
+    <p style="text-align: center;">@BIND9_VERSIONSTRING@</p>
   </xsl:template>
 
 </xsl:stylesheet>

diff --git a/doc/xsl/isc-docbook-html.xsl.in b/doc/xsl/isc-docbook-html.xsl.in
index b3324e5d2eaad874a6464994f1759482469062fe..6efd5dd433bb1924dbfeb7ecce3efbfd245a2a5e 100644 (file)
--- a/doc/xsl/isc-docbook-html.xsl.in
+++ b/doc/xsl/isc-docbook-html.xsl.in
@@ -50,7 +50,7 @@
   </xsl:template>
 
   <xsl:template name="user.footer.navigation">
-    <p style="text-align: center;">BIND Version @PACKAGE_VERSION@</p>
+    <p style="text-align: center;">@BIND9_VERSIONSTRING@</p>
   </xsl:template>
 
 </xsl:stylesheet>

diff --git a/doc/xsl/isc-docbook-latex.xsl.in b/doc/xsl/isc-docbook-latex.xsl.in
index 3cf7d1517d6f0eadd2b5c05037e1ff174bbb0eb8..236ff9fe1e02e941f147ba0dd80eab0acc206b12 100644 (file)
--- a/doc/xsl/isc-docbook-latex.xsl.in
+++ b/doc/xsl/isc-docbook-latex.xsl.in
@@ -14,8 +14,6 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: isc-docbook-latex.xsl.in,v 1.9 2010/04/20 23:51:12 tbox Exp $ -->
-
 <!-- ISC customizations for db2latex generator -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -135,6 +133,22 @@
     <xsl:text>&#10;</xsl:text>
   </xsl:param>
 
+  <!-- Add version in footer. -->
+  <xsl:param name="latex.book.preamble.post">
+    <xsl:text>
+      \pagestyle{fancy}
+      \fancyfoot[ce,co]{\thepage}
+      \fancyfoot[le,ro]{@BIND9_VERSIONSTRING@}
+      \renewcommand{\headrulewidth}{0.4 pt}
+      \fancypagestyle{plain}{%
+        \fancyhf{}%
+        \fancyfoot[ce,co]{\thepage}%
+        \fancyfoot[le,ro]{@BIND9_VERSIONSTRING@}%
+        \renewcommand{\headrulewidth}{0 pt}
+      }
+    </xsl:text>
+  </xsl:param>
+
   <!--
     - More front matter: copyright notice, CVS revision number, table
     - of contents.