diff --git a/CHANGES b/CHANGES index ae158e6068..fd75bd9540 100644 --- 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 d55acf425f..e4f4987819 100755 --- 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 6001e0aa18..59c7816222 100644 --- 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 fde5362ffa..f87b7c12cf 100644 --- a/doc/xsl/isc-docbook-chunk.xsl.in +++ b/doc/xsl/isc-docbook-chunk.xsl.in @@ -57,7 +57,7 @@ -

BIND Version @PACKAGE_VERSION@

+

@BIND9_VERSIONSTRING@

diff --git a/doc/xsl/isc-docbook-html.xsl.in b/doc/xsl/isc-docbook-html.xsl.in index b3324e5d2e..6efd5dd433 100644 --- a/doc/xsl/isc-docbook-html.xsl.in +++ b/doc/xsl/isc-docbook-html.xsl.in @@ -50,7 +50,7 @@ -

BIND Version @PACKAGE_VERSION@

+

@BIND9_VERSIONSTRING@

diff --git a/doc/xsl/isc-docbook-latex.xsl.in b/doc/xsl/isc-docbook-latex.xsl.in index 3cf7d1517d..236ff9fe1e 100644 --- a/doc/xsl/isc-docbook-latex.xsl.in +++ b/doc/xsl/isc-docbook-latex.xsl.in @@ -14,8 +14,6 @@ - PERFORMANCE OF THIS SOFTWARE. --> - - @@ -135,6 +133,22 @@ + + + + \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} + } + + +