[PATCH] Autogenerate version for man pages

Karolin Seeger kseeger at samba.org
Tue Dec 12 10:59:28 UTC 2017


Hi,

please find attached a patchset to autogenerate a version string for
Samba man pages pair-programmed with Metze (please see bug #9531 for
details).

Please feel free to review and push.

Thanks!

Cheers,
Karo

-- 
Karolin Seeger			https://samba.org/~kseeger/
Release Manager Samba Team	https://samba.org
Team Lead Samba SerNet		https://sernet.de
-------------- next part --------------
From 638adc6e51b102d7b42b9952199bff577ed9ccc1 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger at samba.org>
Date: Tue, 12 Dec 2017 11:48:03 +0100
Subject: [PATCH 1/3] docs-xml/Makefile.settings.in: make sure we don't require
 network access

BUG: https://bugzilla.samba.org/show_bug.cgi?id=9531

Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Karolin Seeger <kseeger at samba.org>
---
 docs-xml/Makefile.settings.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in
index 2bf96d746bc..08c250cc93d 100644
--- a/docs-xml/Makefile.settings.in
+++ b/docs-xml/Makefile.settings.in
@@ -1,5 +1,5 @@
 # Programs
-XSLTPROC = @XSLTPROC@
+XSLTPROC = @XSLTPROC@ --nonet
 XMLLINT = @XMLLINT@
 PNGTOPNM = @PNGTOPNM@
 INKSCAPE = @INKSCAPE@
-- 
2.11.0


From fa824bba72562291ed7931ab2a6e28d85b7ced2d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Tue, 12 Dec 2017 11:01:51 +0100
Subject: [PATCH 2/3] docs-xml: autogenerate a doc.version XML entity.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=9531

Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Karolin Seeger <kseeger at samba.org>
---
 docs-xml/build/DTD/samba-doc              |  5 +++++
 docs-xml/build/DTD/samba.build.version.in |  1 +
 docs-xml/build/catalog.xml.in             |  4 ++++
 docs-xml/configure.ac                     | 10 +++++++++-
 wscript                                   |  2 +-
 wscript_build                             |  5 ++++-
 6 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 docs-xml/build/DTD/samba.build.version.in

diff --git a/docs-xml/build/DTD/samba-doc b/docs-xml/build/DTD/samba-doc
index afde3481dbe..9873aa03458 100644
--- a/docs-xml/build/DTD/samba-doc
+++ b/docs-xml/build/DTD/samba-doc
@@ -23,6 +23,11 @@
 	"samba.entities">
 %samba.entities;
 
+<!ENTITY % samba.build.version PUBLIC
+	"-//Samba-Team//VERSION Samba Build Version//EN"
+	"http://www.samba.org/samba/LOCAL.BUILDDIR.DTD/samba.build.version">
+%samba.build.version;
+
 <!-- smb.conf options -->
 
 <!ELEMENT smbconfblock ((smbconfoption|smbconfsection|smbconfcomment)*)>
diff --git a/docs-xml/build/DTD/samba.build.version.in b/docs-xml/build/DTD/samba.build.version.in
new file mode 100644
index 00000000000..775e08bb1ee
--- /dev/null
+++ b/docs-xml/build/DTD/samba.build.version.in
@@ -0,0 +1 @@
+<!ENTITY doc.version '@doc_version@'>
diff --git a/docs-xml/build/catalog.xml.in b/docs-xml/build/catalog.xml.in
index 56d13a6cd39..77bf87eeb7e 100644
--- a/docs-xml/build/catalog.xml.in
+++ b/docs-xml/build/catalog.xml.in
@@ -9,6 +9,10 @@
 			rewritePrefix="file://@abs_top_srcdir@/build/DTD/"/>
 
     <rewriteURI
+			uriStartString="http://www.samba.org/samba/LOCAL.BUILDDIR.DTD/"
+			rewritePrefix="file://@abs_top_builddir@/build/DTD/"/>
+
+    <rewriteURI
 			uriStartString="http://www.gnu.org/licenses/"
 			rewritePrefix="file://@abs_top_srcdir@/Samba3-ByExample/"/>
     <rewriteURI
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index fe889a2f33a..8c26692630b 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -55,4 +55,12 @@ fi
 
 AC_SUBST(TARGETS)
 
-AC_OUTPUT( Makefile.settings build/catalog.xml)
+if test x"$DOC_VERSION" = x; then
+	AC_MSG_ERROR([Please export DOC_VERSION variable])
+else
+	AC_MSG_RESULT([DOC_VERSION: ${DOC_VERSION}])
+fi
+
+doc_version="${DOC_VERSION}"
+AC_SUBST(doc_version)
+AC_OUTPUT( Makefile.settings build/catalog.xml build/DTD/samba.build.version)
diff --git a/wscript b/wscript
index 0ef5f6050a3..83eec709f9d 100644
--- a/wscript
+++ b/wscript
@@ -363,7 +363,7 @@ def dist():
     os.system("make -C ctdb manpages")
     samba_dist.DIST_FILES('ctdb/doc:ctdb/doc', extend=True)
 
-    os.system(srcdir + "/release-scripts/build-manpages-nogit")
+    os.system("DOC_VERSION='" + sambaversion.STRING + "' " + srcdir + "/release-scripts/build-manpages-nogit")
     samba_dist.DIST_FILES('bin/docs:docs', extend=True)
 
     if sambaversion.IS_SNAPSHOT:
diff --git a/wscript_build b/wscript_build
index 253f95f8bc0..e2b1f872017 100644
--- a/wscript_build
+++ b/wscript_build
@@ -23,7 +23,7 @@ bld.env.build_public_headers = 'include/public'
 # compilation, so they are safe
 bld.env.public_headers_skip = ['lib/param/param_proto.h', 'lib/param/param_functions.h']
 
-samba_version.load_version(bld.env, is_install=bld.is_install)
+version=samba_version.load_version(bld.env, is_install=bld.is_install)
 bld.SAMBA_MKVERSION('version.h')
 
 # bld.ENABLE_MAGIC_ORDERING()
@@ -33,6 +33,9 @@ bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/bin/default/docs-xml'
 bld.CONFIGURE_FILE('docs-xml/build/catalog.xml',
                    ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR,
                    ABS_TOP_SRCDIR=bld.env.ABS_TOP_SRCDIR)
+bld.env.DOC_VERSION=version.STRING
+bld.CONFIGURE_FILE('docs-xml/build/DTD/samba.build.version',
+                   DOC_VERSION=bld.env.DOC_VERSION)
 bld.RECURSE('docs-xml')
 
 bld.RECURSE('lib/replace')
-- 
2.11.0


From 36fcb74de65146072db778dac7b6ce5dc4207c12 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger at samba.org>
Date: Tue, 12 Dec 2017 09:08:06 +0100
Subject: [PATCH 3/3] docs-xml/manpages: Use new doc.version XML entity.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=9531

Signed-off-by: Karolin Seeger <kseeger at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
---
 docs-xml/manpages/cifsdd.8.xml                | 2 +-
 docs-xml/manpages/dbwrap_tool.1.xml           | 4 ++--
 docs-xml/manpages/eventlogadm.8.xml           | 4 ++--
 docs-xml/manpages/findsmb.1.xml               | 4 ++--
 docs-xml/manpages/idmap_ad.8.xml              | 2 +-
 docs-xml/manpages/idmap_autorid.8.xml         | 2 +-
 docs-xml/manpages/idmap_hash.8.xml            | 2 +-
 docs-xml/manpages/idmap_ldap.8.xml            | 2 +-
 docs-xml/manpages/idmap_nss.8.xml             | 2 +-
 docs-xml/manpages/idmap_rfc2307.8.xml         | 2 +-
 docs-xml/manpages/idmap_rid.8.xml             | 2 +-
 docs-xml/manpages/idmap_script.8.xml          | 2 +-
 docs-xml/manpages/idmap_tdb.8.xml             | 2 +-
 docs-xml/manpages/idmap_tdb2.8.xml            | 2 +-
 docs-xml/manpages/libsmbclient.7.xml          | 4 ++--
 docs-xml/manpages/lmhosts.5.xml               | 4 ++--
 docs-xml/manpages/log2pcap.1.xml              | 4 ++--
 docs-xml/manpages/mvxattr.1.xml               | 4 ++--
 docs-xml/manpages/net.8.xml                   | 2 +-
 docs-xml/manpages/nmbd.8.xml                  | 4 ++--
 docs-xml/manpages/nmblookup.1.xml             | 4 ++--
 docs-xml/manpages/ntlm_auth.1.xml             | 4 ++--
 docs-xml/manpages/pam_winbind.8.xml           | 4 ++--
 docs-xml/manpages/pam_winbind.conf.5.xml      | 4 ++--
 docs-xml/manpages/pdbedit.8.xml               | 4 ++--
 docs-xml/manpages/profiles.1.xml              | 4 ++--
 docs-xml/manpages/rpcclient.1.xml             | 4 ++--
 docs-xml/manpages/samba-regedit.8.xml         | 4 ++--
 docs-xml/manpages/samba-tool.8.xml            | 4 ++--
 docs-xml/manpages/samba.7.xml                 | 4 ++--
 docs-xml/manpages/samba.8.xml                 | 4 ++--
 docs-xml/manpages/sharesec.1.xml              | 4 ++--
 docs-xml/manpages/smb.conf.5.xml              | 6 ++++--
 docs-xml/manpages/smbcacls.1.xml              | 4 ++--
 docs-xml/manpages/smbclient.1.xml             | 4 ++--
 docs-xml/manpages/smbcontrol.1.xml            | 4 ++--
 docs-xml/manpages/smbcquotas.1.xml            | 4 ++--
 docs-xml/manpages/smbd.8.xml                  | 4 ++--
 docs-xml/manpages/smbget.1.xml                | 4 ++--
 docs-xml/manpages/smbgetrc.5.xml              | 4 ++--
 docs-xml/manpages/smbpasswd.5.xml             | 4 ++--
 docs-xml/manpages/smbpasswd.8.xml             | 4 ++--
 docs-xml/manpages/smbspool.8.xml              | 4 ++--
 docs-xml/manpages/smbspool_krb5_wrapper.8.xml | 2 +-
 docs-xml/manpages/smbstatus.1.xml             | 4 ++--
 docs-xml/manpages/smbtar.1.xml                | 4 ++--
 docs-xml/manpages/smbtree.1.xml               | 4 ++--
 docs-xml/manpages/testparm.1.xml              | 4 ++--
 docs-xml/manpages/traffic_learner.7.xml       | 4 ++--
 docs-xml/manpages/traffic_replay.7.xml        | 4 ++--
 docs-xml/manpages/vfs_acl_tdb.8.xml           | 2 +-
 docs-xml/manpages/vfs_acl_xattr.8.xml         | 2 +-
 docs-xml/manpages/vfs_aio_fork.8.xml          | 4 ++--
 docs-xml/manpages/vfs_aio_pthread.8.xml       | 4 ++--
 docs-xml/manpages/vfs_audit.8.xml             | 4 ++--
 docs-xml/manpages/vfs_btrfs.8.xml             | 4 ++--
 docs-xml/manpages/vfs_cacheprime.8.xml        | 4 ++--
 docs-xml/manpages/vfs_cap.8.xml               | 4 ++--
 docs-xml/manpages/vfs_catia.8.xml             | 2 +-
 docs-xml/manpages/vfs_ceph.8.xml              | 4 ++--
 docs-xml/manpages/vfs_commit.8.xml            | 4 ++--
 docs-xml/manpages/vfs_crossrename.8.xml       | 4 ++--
 docs-xml/manpages/vfs_default_quota.8.xml     | 4 ++--
 docs-xml/manpages/vfs_dirsort.8.xml           | 4 ++--
 docs-xml/manpages/vfs_extd_audit.8.xml        | 4 ++--
 docs-xml/manpages/vfs_fake_perms.8.xml        | 4 ++--
 docs-xml/manpages/vfs_fileid.8.xml            | 4 ++--
 docs-xml/manpages/vfs_fruit.8.xml             | 2 +-
 docs-xml/manpages/vfs_full_audit.8.xml        | 4 ++--
 docs-xml/manpages/vfs_glusterfs.8.xml         | 4 ++--
 docs-xml/manpages/vfs_gpfs.8.xml              | 4 ++--
 docs-xml/manpages/vfs_linux_xfs_sgid.8.xml    | 4 ++--
 docs-xml/manpages/vfs_media_harmony.8.xml     | 4 ++--
 docs-xml/manpages/vfs_netatalk.8.xml          | 4 ++--
 docs-xml/manpages/vfs_nfs4acl_xattr.8.xml     | 2 +-
 docs-xml/manpages/vfs_offline.8.xml           | 4 ++--
 docs-xml/manpages/vfs_prealloc.8.xml          | 4 ++--
 docs-xml/manpages/vfs_preopen.8.xml           | 4 ++--
 docs-xml/manpages/vfs_readahead.8.xml         | 4 ++--
 docs-xml/manpages/vfs_readonly.8.xml          | 4 ++--
 docs-xml/manpages/vfs_recycle.8.xml           | 4 ++--
 docs-xml/manpages/vfs_shadow_copy.8.xml       | 4 ++--
 docs-xml/manpages/vfs_shadow_copy2.8.xml      | 4 ++--
 docs-xml/manpages/vfs_shell_snap.8.xml        | 4 ++--
 docs-xml/manpages/vfs_snapper.8.xml           | 4 ++--
 docs-xml/manpages/vfs_streams_depot.8.xml     | 2 +-
 docs-xml/manpages/vfs_streams_xattr.8.xml     | 2 +-
 docs-xml/manpages/vfs_syncops.8.xml           | 4 ++--
 docs-xml/manpages/vfs_time_audit.8.xml        | 4 ++--
 docs-xml/manpages/vfs_tsmsm.8.xml             | 4 ++--
 docs-xml/manpages/vfs_unityed_media.8.xml     | 4 ++--
 docs-xml/manpages/vfs_worm.8.xml              | 4 ++--
 docs-xml/manpages/vfs_xattr_tdb.8.xml         | 2 +-
 docs-xml/manpages/vfs_zfsacl.8.xml            | 4 ++--
 docs-xml/manpages/vfstest.1.xml               | 4 ++--
 docs-xml/manpages/wbinfo.1.xml                | 4 ++--
 docs-xml/manpages/winbind_krb5_locator.7.xml  | 4 ++--
 docs-xml/manpages/winbindd.8.xml              | 4 ++--
 98 files changed, 177 insertions(+), 175 deletions(-)

diff --git a/docs-xml/manpages/cifsdd.8.xml b/docs-xml/manpages/cifsdd.8.xml
index 9137d85831c..d8d4bbcd74b 100644
--- a/docs-xml/manpages/cifsdd.8.xml
+++ b/docs-xml/manpages/cifsdd.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml
index 6d4d21df49b..91b49bb44aa 100644
--- a/docs-xml/manpages/dbwrap_tool.1.xml
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -169,7 +169,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/eventlogadm.8.xml b/docs-xml/manpages/eventlogadm.8.xml
index 3c12b267c1a..69e90c18dc9 100644
--- a/docs-xml/manpages/eventlogadm.8.xml
+++ b/docs-xml/manpages/eventlogadm.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -276,7 +276,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.0.25 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/findsmb.1.xml b/docs-xml/manpages/findsmb.1.xml
index 153908e816b..23278c5ffe9 100644
--- a/docs-xml/manpages/findsmb.1.xml
+++ b/docs-xml/manpages/findsmb.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -118,7 +118,7 @@ IP ADDR         NETBIOS NAME   WORKGROUP/OS/VERSION
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
index fa5ae722d5b..aea6f076461 100644
--- a/docs-xml/manpages/idmap_ad.8.xml
+++ b/docs-xml/manpages/idmap_ad.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/idmap_autorid.8.xml b/docs-xml/manpages/idmap_autorid.8.xml
index 32d53b4f79c..6c4da1cad8a 100644
--- a/docs-xml/manpages/idmap_autorid.8.xml
+++ b/docs-xml/manpages/idmap_autorid.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/idmap_hash.8.xml b/docs-xml/manpages/idmap_hash.8.xml
index 311319d806b..fd3a2d68240 100644
--- a/docs-xml/manpages/idmap_hash.8.xml
+++ b/docs-xml/manpages/idmap_hash.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/idmap_ldap.8.xml b/docs-xml/manpages/idmap_ldap.8.xml
index 872bb6d9e54..0601f6164cc 100644
--- a/docs-xml/manpages/idmap_ldap.8.xml
+++ b/docs-xml/manpages/idmap_ldap.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/idmap_nss.8.xml b/docs-xml/manpages/idmap_nss.8.xml
index 303a0f45775..b7c5977b757 100644
--- a/docs-xml/manpages/idmap_nss.8.xml
+++ b/docs-xml/manpages/idmap_nss.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/idmap_rfc2307.8.xml b/docs-xml/manpages/idmap_rfc2307.8.xml
index 57856628b39..1393b04d0ec 100644
--- a/docs-xml/manpages/idmap_rfc2307.8.xml
+++ b/docs-xml/manpages/idmap_rfc2307.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 <refnamediv>
diff --git a/docs-xml/manpages/idmap_rid.8.xml b/docs-xml/manpages/idmap_rid.8.xml
index 19d89ef97d8..ade4b78d44d 100644
--- a/docs-xml/manpages/idmap_rid.8.xml
+++ b/docs-xml/manpages/idmap_rid.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/idmap_script.8.xml b/docs-xml/manpages/idmap_script.8.xml
index d115486c0ab..95afde18693 100644
--- a/docs-xml/manpages/idmap_script.8.xml
+++ b/docs-xml/manpages/idmap_script.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/idmap_tdb.8.xml b/docs-xml/manpages/idmap_tdb.8.xml
index 04f383052c2..fccb8385722 100644
--- a/docs-xml/manpages/idmap_tdb.8.xml
+++ b/docs-xml/manpages/idmap_tdb.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/idmap_tdb2.8.xml b/docs-xml/manpages/idmap_tdb2.8.xml
index 5b4fe2ed7aa..253b016f246 100644
--- a/docs-xml/manpages/idmap_tdb2.8.xml
+++ b/docs-xml/manpages/idmap_tdb2.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/libsmbclient.7.xml b/docs-xml/manpages/libsmbclient.7.xml
index 41d06ee2ba8..9c33523f629 100644
--- a/docs-xml/manpages/libsmbclient.7.xml
+++ b/docs-xml/manpages/libsmbclient.7.xml
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">7</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -120,7 +120,7 @@
 	<title>VERSION</title>
 
 	<para>
-	This man page is correct for version 3 of the Samba suite.
+	This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/lmhosts.5.xml b/docs-xml/manpages/lmhosts.5.xml
index 60b1f76830d..257d001bc91 100644
--- a/docs-xml/manpages/lmhosts.5.xml
+++ b/docs-xml/manpages/lmhosts.5.xml
@@ -7,7 +7,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -93,7 +93,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/log2pcap.1.xml b/docs-xml/manpages/log2pcap.1.xml
index 40f6e922eab..2cb7ed1fdc5 100644
--- a/docs-xml/manpages/log2pcap.1.xml
+++ b/docs-xml/manpages/log2pcap.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -103,7 +103,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/mvxattr.1.xml b/docs-xml/manpages/mvxattr.1.xml
index 034dc3adc70..977db9f98dd 100644
--- a/docs-xml/manpages/mvxattr.1.xml
+++ b/docs-xml/manpages/mvxattr.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -83,7 +83,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index a43a062d619..542dac53be4 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml
index eb193f6449c..79170d22e55 100644
--- a/docs-xml/manpages/nmbd.8.xml
+++ b/docs-xml/manpages/nmbd.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -258,7 +258,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/nmblookup.1.xml b/docs-xml/manpages/nmblookup.1.xml
index 4813c8af251..e56f05ae5c2 100644
--- a/docs-xml/manpages/nmblookup.1.xml
+++ b/docs-xml/manpages/nmblookup.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -190,7 +190,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml
index 6b35ce1c4a8..e84b08196b8 100644
--- a/docs-xml/manpages/ntlm_auth.1.xml
+++ b/docs-xml/manpages/ntlm_auth.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -450,7 +450,7 @@ auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic --require-m
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba 
+	<para>This man page is correct for version &doc.version; of the Samba
 	suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/pam_winbind.8.xml b/docs-xml/manpages/pam_winbind.8.xml
index c8f3250551f..fdda3335ff1 100644
--- a/docs-xml/manpages/pam_winbind.8.xml
+++ b/docs-xml/manpages/pam_winbind.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">8</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -253,7 +253,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of Samba.</para>
+	<para>This man page is correct for version &doc.version; of Samba.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/pam_winbind.conf.5.xml b/docs-xml/manpages/pam_winbind.conf.5.xml
index f1d616457e3..4ba9fe23f79 100644
--- a/docs-xml/manpages/pam_winbind.conf.5.xml
+++ b/docs-xml/manpages/pam_winbind.conf.5.xml
@@ -7,7 +7,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">5</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -201,7 +201,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of Samba.</para>
+	<para>This man page is correct for version &doc.version; of Samba.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/pdbedit.8.xml b/docs-xml/manpages/pdbedit.8.xml
index 5c9af668df2..8766bf01d96 100644
--- a/docs-xml/manpages/pdbedit.8.xml
+++ b/docs-xml/manpages/pdbedit.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -537,7 +537,7 @@ account policy value for bad lockout attempt is now 3
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/profiles.1.xml b/docs-xml/manpages/profiles.1.xml
index c7fab83956a..151d2f24c6b 100644
--- a/docs-xml/manpages/profiles.1.xml
+++ b/docs-xml/manpages/profiles.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -72,7 +72,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba 
+	<para>This man page is correct for version &doc.version; of the Samba
 	suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml
index dfe8907b5c0..b53b46ef07a 100644
--- a/docs-xml/manpages/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -534,7 +534,7 @@ Comma Separated list of Files
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba 
+	<para>This man page is correct for version &doc.version; of the Samba
 	suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/samba-regedit.8.xml b/docs-xml/manpages/samba-regedit.8.xml
index de25e59ee09..8a81ee3bc7f 100644
--- a/docs-xml/manpages/samba-regedit.8.xml
+++ b/docs-xml/manpages/samba-regedit.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -71,7 +71,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/samba-tool.8.xml b/docs-xml/manpages/samba-tool.8.xml
index 1e5186f0f25..ed10d6103cc 100644
--- a/docs-xml/manpages/samba-tool.8.xml
+++ b/docs-xml/manpages/samba-tool.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -616,7 +616,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is complete for version 4 of the Samba
+	<para>This man page is complete for version &doc.version; of the Samba
 	suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml
index 6f0a83aa3b4..612bfd30b20 100644
--- a/docs-xml/manpages/samba.7.xml
+++ b/docs-xml/manpages/samba.7.xml
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">Miscellanea</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -296,7 +296,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4 of the
+	<para>This man page is correct for version &doc.version; of the
 	Samba suite. </para>
 </refsect1>
 
diff --git a/docs-xml/manpages/samba.8.xml b/docs-xml/manpages/samba.8.xml
index d4c556802cb..1013afd8f3a 100644
--- a/docs-xml/manpages/samba.8.xml
+++ b/docs-xml/manpages/samba.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -212,7 +212,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4 of	the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of	the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/sharesec.1.xml b/docs-xml/manpages/sharesec.1.xml
index d0ae9e9e2c6..7364ddb25ca 100644
--- a/docs-xml/manpages/sharesec.1.xml
+++ b/docs-xml/manpages/sharesec.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -237,7 +237,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index 49928134f09..7b891ad6379 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <refentry id="smb.conf.5" xmlns:xi="http://www.w3.org/2003/XInclude"
 	                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 	
@@ -6,7 +8,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -853,7 +855,7 @@ chmod 1770 /usr/local/samba/lib/usershares
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index cb198a7d722..e36733edc08 100644
--- a/docs-xml/manpages/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -287,7 +287,7 @@ ACL:<sid or name>:<type>/<flags>/<mask>
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml
index 1349a6719ac..cfb155d6cce 100644
--- a/docs-xml/manpages/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -1260,7 +1260,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.2 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 
diff --git a/docs-xml/manpages/smbcontrol.1.xml b/docs-xml/manpages/smbcontrol.1.xml
index 127e9197bdb..f8a00d6b51a 100644
--- a/docs-xml/manpages/smbcontrol.1.xml
+++ b/docs-xml/manpages/smbcontrol.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -323,7 +323,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/smbcquotas.1.xml b/docs-xml/manpages/smbcquotas.1.xml
index c1d2c41ad5a..6368d8aeecf 100644
--- a/docs-xml/manpages/smbcquotas.1.xml
+++ b/docs-xml/manpages/smbcquotas.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -180,7 +180,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml
index c874aca69f1..8e979aa4e31 100644
--- a/docs-xml/manpages/smbd.8.xml
+++ b/docs-xml/manpages/smbd.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -266,7 +266,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/smbget.1.xml b/docs-xml/manpages/smbget.1.xml
index c12b03d5cab..f5c2ebd5c84 100644
--- a/docs-xml/manpages/smbget.1.xml
+++ b/docs-xml/manpages/smbget.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -195,7 +195,7 @@ turned on).</para>
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/smbgetrc.5.xml b/docs-xml/manpages/smbgetrc.5.xml
index 85266af9e4f..ae1877cf4b2 100644
--- a/docs-xml/manpages/smbgetrc.5.xml
+++ b/docs-xml/manpages/smbgetrc.5.xml
@@ -7,7 +7,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -83,7 +83,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/smbpasswd.5.xml b/docs-xml/manpages/smbpasswd.5.xml
index a094c105dfb..223b80c2c8d 100644
--- a/docs-xml/manpages/smbpasswd.5.xml
+++ b/docs-xml/manpages/smbpasswd.5.xml
@@ -7,7 +7,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -178,7 +178,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/smbpasswd.8.xml b/docs-xml/manpages/smbpasswd.8.xml
index 884a0ebea55..d7042111cbf 100644
--- a/docs-xml/manpages/smbpasswd.8.xml
+++ b/docs-xml/manpages/smbpasswd.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -401,7 +401,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/smbspool.8.xml b/docs-xml/manpages/smbspool.8.xml
index 7c3ff24d73e..bded47a2018 100644
--- a/docs-xml/manpages/smbspool.8.xml
+++ b/docs-xml/manpages/smbspool.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -100,7 +100,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba suite.</para>
+	<para>This man page is correct for version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/smbspool_krb5_wrapper.8.xml b/docs-xml/manpages/smbspool_krb5_wrapper.8.xml
index bfebe07f598..3835719f63f 100644
--- a/docs-xml/manpages/smbspool_krb5_wrapper.8.xml
+++ b/docs-xml/manpages/smbspool_krb5_wrapper.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/smbstatus.1.xml b/docs-xml/manpages/smbstatus.1.xml
index 3bda33a32e3..78a817277b3 100644
--- a/docs-xml/manpages/smbstatus.1.xml
+++ b/docs-xml/manpages/smbstatus.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -143,7 +143,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/smbtar.1.xml b/docs-xml/manpages/smbtar.1.xml
index 7618cb60ea3..04136fbed76 100644
--- a/docs-xml/manpages/smbtar.1.xml
+++ b/docs-xml/manpages/smbtar.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -200,7 +200,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/smbtree.1.xml b/docs-xml/manpages/smbtree.1.xml
index 0a328dc6bf8..e8c66656c8b 100644
--- a/docs-xml/manpages/smbtree.1.xml
+++ b/docs-xml/manpages/smbtree.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -78,7 +78,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of the Samba 
+	<para>This man page is correct for version &doc.version; of the Samba
 	suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/testparm.1.xml b/docs-xml/manpages/testparm.1.xml
index 6cbe780ba60..056aca62355 100644
--- a/docs-xml/manpages/testparm.1.xml
+++ b/docs-xml/manpages/testparm.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -177,7 +177,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of 
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/traffic_learner.7.xml b/docs-xml/manpages/traffic_learner.7.xml
index 4082ce0dae9..6fd7975393d 100644
--- a/docs-xml/manpages/traffic_learner.7.xml
+++ b/docs-xml/manpages/traffic_learner.7.xml
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -170,7 +170,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is complete for version 4 of the Samba
+	<para>This man page is complete for version &doc.version; of the Samba
 	suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/traffic_replay.7.xml b/docs-xml/manpages/traffic_replay.7.xml
index 7fdb7905bb0..d7d09a24ba9 100644
--- a/docs-xml/manpages/traffic_replay.7.xml
+++ b/docs-xml/manpages/traffic_replay.7.xml
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -536,7 +536,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is complete for version 4 of the Samba
+	<para>This man page is complete for version &doc.version; of the Samba
 	suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_acl_tdb.8.xml b/docs-xml/manpages/vfs_acl_tdb.8.xml
index 58cc0914c22..5f3c6ba045e 100644
--- a/docs-xml/manpages/vfs_acl_tdb.8.xml
+++ b/docs-xml/manpages/vfs_acl_tdb.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/vfs_acl_xattr.8.xml b/docs-xml/manpages/vfs_acl_xattr.8.xml
index f70e17c6ffe..9937076d9bc 100644
--- a/docs-xml/manpages/vfs_acl_xattr.8.xml
+++ b/docs-xml/manpages/vfs_acl_xattr.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/vfs_aio_fork.8.xml b/docs-xml/manpages/vfs_aio_fork.8.xml
index bb81c64d3d9..65ffad22877 100644
--- a/docs-xml/manpages/vfs_aio_fork.8.xml
+++ b/docs-xml/manpages/vfs_aio_fork.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -69,7 +69,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4.0.0 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.0.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_aio_pthread.8.xml b/docs-xml/manpages/vfs_aio_pthread.8.xml
index 5bcb544ba04..ec9d495f0eb 100644
--- a/docs-xml/manpages/vfs_aio_pthread.8.xml
+++ b/docs-xml/manpages/vfs_aio_pthread.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -103,7 +103,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4.0 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_audit.8.xml b/docs-xml/manpages/vfs_audit.8.xml
index c4cad76ca59..222d862f576 100644
--- a/docs-xml/manpages/vfs_audit.8.xml
+++ b/docs-xml/manpages/vfs_audit.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -105,7 +105,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_btrfs.8.xml b/docs-xml/manpages/vfs_btrfs.8.xml
index 85603bc3620..24d7a18cd9e 100644
--- a/docs-xml/manpages/vfs_btrfs.8.xml
+++ b/docs-xml/manpages/vfs_btrfs.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -121,7 +121,7 @@
 	<title>VERSION</title>
 
 	<para>
-		This man page is correct for version 4.3.0 of the Samba suite.
+		This man page is correct for version &doc.version;.3.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_cacheprime.8.xml b/docs-xml/manpages/vfs_cacheprime.8.xml
index 278e54930b0..0fd29bab12d 100644
--- a/docs-xml/manpages/vfs_cacheprime.8.xml
+++ b/docs-xml/manpages/vfs_cacheprime.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -93,7 +93,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_cap.8.xml b/docs-xml/manpages/vfs_cap.8.xml
index f5524cd1db1..7aa05e616a1 100644
--- a/docs-xml/manpages/vfs_cap.8.xml
+++ b/docs-xml/manpages/vfs_cap.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -61,7 +61,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_catia.8.xml b/docs-xml/manpages/vfs_catia.8.xml
index d8dac835a8a..e8566161b75 100644
--- a/docs-xml/manpages/vfs_catia.8.xml
+++ b/docs-xml/manpages/vfs_catia.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/vfs_ceph.8.xml b/docs-xml/manpages/vfs_ceph.8.xml
index c492d31979d..88c84c60192 100644
--- a/docs-xml/manpages/vfs_ceph.8.xml
+++ b/docs-xml/manpages/vfs_ceph.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -105,7 +105,7 @@
 	<title>VERSION</title>
 
 	<para>
-		This man page is correct for version 4.2.0 of the Samba suite.
+		This man page is correct for version &doc.version;.2.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_commit.8.xml b/docs-xml/manpages/vfs_commit.8.xml
index 204dcd72064..aca4d763f83 100644
--- a/docs-xml/manpages/vfs_commit.8.xml
+++ b/docs-xml/manpages/vfs_commit.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -93,7 +93,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_crossrename.8.xml b/docs-xml/manpages/vfs_crossrename.8.xml
index a9d7e6b0199..70308e81e2a 100644
--- a/docs-xml/manpages/vfs_crossrename.8.xml
+++ b/docs-xml/manpages/vfs_crossrename.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -101,7 +101,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 4.0.0 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.0.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_default_quota.8.xml b/docs-xml/manpages/vfs_default_quota.8.xml
index e96124681bb..087543235fd 100644
--- a/docs-xml/manpages/vfs_default_quota.8.xml
+++ b/docs-xml/manpages/vfs_default_quota.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -119,7 +119,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_dirsort.8.xml b/docs-xml/manpages/vfs_dirsort.8.xml
index 758696ef3be..917ae9129bb 100644
--- a/docs-xml/manpages/vfs_dirsort.8.xml
+++ b/docs-xml/manpages/vfs_dirsort.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -52,7 +52,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.3 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_extd_audit.8.xml b/docs-xml/manpages/vfs_extd_audit.8.xml
index 09dd92e76f2..22b78e3bd2c 100644
--- a/docs-xml/manpages/vfs_extd_audit.8.xml
+++ b/docs-xml/manpages/vfs_extd_audit.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -51,7 +51,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_fake_perms.8.xml b/docs-xml/manpages/vfs_fake_perms.8.xml
index ebe5d532326..f157cca6696 100644
--- a/docs-xml/manpages/vfs_fake_perms.8.xml
+++ b/docs-xml/manpages/vfs_fake_perms.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -56,7 +56,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_fileid.8.xml b/docs-xml/manpages/vfs_fileid.8.xml
index fc2e8341267..5a3a70e9b95 100644
--- a/docs-xml/manpages/vfs_fileid.8.xml
+++ b/docs-xml/manpages/vfs_fileid.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -95,7 +95,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.2 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml
index 48c3acd3cb9..fcaf1737ce8 100644
--- a/docs-xml/manpages/vfs_fruit.8.xml
+++ b/docs-xml/manpages/vfs_fruit.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/vfs_full_audit.8.xml b/docs-xml/manpages/vfs_full_audit.8.xml
index cefe66d8b6f..44be1a06379 100644
--- a/docs-xml/manpages/vfs_full_audit.8.xml
+++ b/docs-xml/manpages/vfs_full_audit.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -249,7 +249,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml b/docs-xml/manpages/vfs_glusterfs.8.xml
index 61ad9f435db..b88c2ce8f56 100644
--- a/docs-xml/manpages/vfs_glusterfs.8.xml
+++ b/docs-xml/manpages/vfs_glusterfs.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -165,7 +165,7 @@
 	<title>VERSION</title>
 
 	<para>
-		This man page is correct for version 4.6.0 of the Samba suite.
+		This man page is correct for version &doc.version;.6.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_gpfs.8.xml b/docs-xml/manpages/vfs_gpfs.8.xml
index 8c41df51f16..fe39a7d4c2d 100644
--- a/docs-xml/manpages/vfs_gpfs.8.xml
+++ b/docs-xml/manpages/vfs_gpfs.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -478,7 +478,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
index ae096e6a279..d97986ef82e 100644
--- a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
+++ b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -57,7 +57,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4.1.0 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.1.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_media_harmony.8.xml b/docs-xml/manpages/vfs_media_harmony.8.xml
index 082e98d63a2..f6b2b378af9 100644
--- a/docs-xml/manpages/vfs_media_harmony.8.xml
+++ b/docs-xml/manpages/vfs_media_harmony.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -125,7 +125,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.2.7 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_netatalk.8.xml b/docs-xml/manpages/vfs_netatalk.8.xml
index 3290616841b..35d42375109 100644
--- a/docs-xml/manpages/vfs_netatalk.8.xml
+++ b/docs-xml/manpages/vfs_netatalk.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -60,7 +60,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_nfs4acl_xattr.8.xml b/docs-xml/manpages/vfs_nfs4acl_xattr.8.xml
index 16737349b71..c8780388184 100644
--- a/docs-xml/manpages/vfs_nfs4acl_xattr.8.xml
+++ b/docs-xml/manpages/vfs_nfs4acl_xattr.8.xml
@@ -7,7 +7,7 @@
     <manvolnum>8</manvolnum>
     <refmiscinfo class="source">Samba</refmiscinfo>
     <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-    <refmiscinfo class="version">4.7</refmiscinfo>
+    <refmiscinfo class="version">&doc.version;</refmiscinfo>
   </refmeta>
 
 
diff --git a/docs-xml/manpages/vfs_offline.8.xml b/docs-xml/manpages/vfs_offline.8.xml
index 593b2c6b8b2..5a6a51ba046 100644
--- a/docs-xml/manpages/vfs_offline.8.xml
+++ b/docs-xml/manpages/vfs_offline.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -55,7 +55,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4.4 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.4 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_prealloc.8.xml b/docs-xml/manpages/vfs_prealloc.8.xml
index 1be6c1f5d29..61729214757 100644
--- a/docs-xml/manpages/vfs_prealloc.8.xml
+++ b/docs-xml/manpages/vfs_prealloc.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -90,7 +90,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_preopen.8.xml b/docs-xml/manpages/vfs_preopen.8.xml
index 1dc8da1e936..d6b61d790e7 100644
--- a/docs-xml/manpages/vfs_preopen.8.xml
+++ b/docs-xml/manpages/vfs_preopen.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 <refnamediv>
@@ -95,7 +95,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.3 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_readahead.8.xml b/docs-xml/manpages/vfs_readahead.8.xml
index d7575852d24..cb8161e8d58 100644
--- a/docs-xml/manpages/vfs_readahead.8.xml
+++ b/docs-xml/manpages/vfs_readahead.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -98,7 +98,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_readonly.8.xml b/docs-xml/manpages/vfs_readonly.8.xml
index ed3eb805951..2b721742149 100644
--- a/docs-xml/manpages/vfs_readonly.8.xml
+++ b/docs-xml/manpages/vfs_readonly.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -84,7 +84,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_recycle.8.xml b/docs-xml/manpages/vfs_recycle.8.xml
index 30a921065ef..3f387441820 100644
--- a/docs-xml/manpages/vfs_recycle.8.xml
+++ b/docs-xml/manpages/vfs_recycle.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -203,7 +203,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_shadow_copy.8.xml b/docs-xml/manpages/vfs_shadow_copy.8.xml
index 4710cd6cce5..8bbda88d026 100644
--- a/docs-xml/manpages/vfs_shadow_copy.8.xml
+++ b/docs-xml/manpages/vfs_shadow_copy.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -104,7 +104,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_shadow_copy2.8.xml b/docs-xml/manpages/vfs_shadow_copy2.8.xml
index ad69cff19b9..478824e0414 100644
--- a/docs-xml/manpages/vfs_shadow_copy2.8.xml
+++ b/docs-xml/manpages/vfs_shadow_copy2.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -477,7 +477,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4.0 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_shell_snap.8.xml b/docs-xml/manpages/vfs_shell_snap.8.xml
index f69fcff5b41..a0a4885531c 100644
--- a/docs-xml/manpages/vfs_shell_snap.8.xml
+++ b/docs-xml/manpages/vfs_shell_snap.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -138,7 +138,7 @@
 	<title>VERSION</title>
 
 	<para>
-		This man page is correct for version 4.2.0 of the Samba suite.
+		This man page is correct for version &doc.version;.2.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_snapper.8.xml b/docs-xml/manpages/vfs_snapper.8.xml
index bc045c32996..9709e201e9b 100644
--- a/docs-xml/manpages/vfs_snapper.8.xml
+++ b/docs-xml/manpages/vfs_snapper.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -107,7 +107,7 @@
 	<title>VERSION</title>
 
 	<para>
-		This man page is correct for version 4.3.0 of the Samba suite.
+		This man page is correct for version &doc.version;.3.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_streams_depot.8.xml b/docs-xml/manpages/vfs_streams_depot.8.xml
index 7f0ad84826a..88a27668687 100644
--- a/docs-xml/manpages/vfs_streams_depot.8.xml
+++ b/docs-xml/manpages/vfs_streams_depot.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/vfs_streams_xattr.8.xml b/docs-xml/manpages/vfs_streams_xattr.8.xml
index 0f9dab4c1b7..6645928c016 100644
--- a/docs-xml/manpages/vfs_streams_xattr.8.xml
+++ b/docs-xml/manpages/vfs_streams_xattr.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/vfs_syncops.8.xml b/docs-xml/manpages/vfs_syncops.8.xml
index 2efc711a82f..5d98b609bb7 100644
--- a/docs-xml/manpages/vfs_syncops.8.xml
+++ b/docs-xml/manpages/vfs_syncops.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -82,7 +82,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4.1.0 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.1.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_time_audit.8.xml b/docs-xml/manpages/vfs_time_audit.8.xml
index 179f67dfa5c..5b68380a320 100644
--- a/docs-xml/manpages/vfs_time_audit.8.xml
+++ b/docs-xml/manpages/vfs_time_audit.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -81,7 +81,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 4.0.0 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.0.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_tsmsm.8.xml b/docs-xml/manpages/vfs_tsmsm.8.xml
index 72dc3eb499a..41e711805e0 100644
--- a/docs-xml/manpages/vfs_tsmsm.8.xml
+++ b/docs-xml/manpages/vfs_tsmsm.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -119,7 +119,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 4.0 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_unityed_media.8.xml b/docs-xml/manpages/vfs_unityed_media.8.xml
index cb5e8afeaaf..071e438a6a1 100644
--- a/docs-xml/manpages/vfs_unityed_media.8.xml
+++ b/docs-xml/manpages/vfs_unityed_media.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -98,7 +98,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4.2 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.2 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_worm.8.xml b/docs-xml/manpages/vfs_worm.8.xml
index 594d51d796d..9b2a81c96ec 100644
--- a/docs-xml/manpages/vfs_worm.8.xml
+++ b/docs-xml/manpages/vfs_worm.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -76,7 +76,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 4.2 of the Samba suite.
+	<para>This man page is correct for version &doc.version;.2 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfs_xattr_tdb.8.xml b/docs-xml/manpages/vfs_xattr_tdb.8.xml
index 3dc83de7eae..1238806286d 100644
--- a/docs-xml/manpages/vfs_xattr_tdb.8.xml
+++ b/docs-xml/manpages/vfs_xattr_tdb.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages/vfs_zfsacl.8.xml b/docs-xml/manpages/vfs_zfsacl.8.xml
index a4a4821c9bc..6803befdf3e 100644
--- a/docs-xml/manpages/vfs_zfsacl.8.xml
+++ b/docs-xml/manpages/vfs_zfsacl.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -144,7 +144,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 4.0.x of the Samba suite.
+	<para>This man page is correct for version &doc.version;.0.x of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/vfstest.1.xml b/docs-xml/manpages/vfstest.1.xml
index 3f71330587a..8c224beac63 100644
--- a/docs-xml/manpages/vfstest.1.xml
+++ b/docs-xml/manpages/vfstest.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -154,7 +154,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 and 4 of the Samba
+	<para>This man page is correct for version &doc.version; of the Samba
 	suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml
index 0a02b870fa9..cb4fe8d34db 100644
--- a/docs-xml/manpages/wbinfo.1.xml
+++ b/docs-xml/manpages/wbinfo.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -577,7 +577,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of
+	<para>This man page is correct for version &doc.version; of
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/winbind_krb5_locator.7.xml b/docs-xml/manpages/winbind_krb5_locator.7.xml
index 65a888673d3..aa8de7c1a46 100644
--- a/docs-xml/manpages/winbind_krb5_locator.7.xml
+++ b/docs-xml/manpages/winbind_krb5_locator.7.xml
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">7</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -74,7 +74,7 @@
 	<title>VERSION</title>
 
 	<para>
-	This man page is correct for version 3 of the Samba suite.
+	This man page is correct for version &doc.version; of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml
index 95a9cdba7c5..56d451d40a1 100644
--- a/docs-xml/manpages/winbindd.8.xml
+++ b/docs-xml/manpages/winbindd.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.7</refmiscinfo>
+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -467,7 +467,7 @@ auth  required    /lib/security/pam_unix.so \
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of
+	<para>This man page is correct for version &doc.version; of
         the Samba suite.</para>
 </refsect1>
 
-- 
2.11.0



More information about the samba-technical mailing list