[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Wed Dec 13 16:23:02 UTC 2017


The branch, master has been updated
       via  fcaeffd docs-xml/manpages: Use new doc.version XML entity.
       via  2abb55b docs-xml: autogenerate a doc.version XML entity.
       via  00d3019 docs-xml/Makefile.settings.in: make sure we don't require network access
      from  9f4eda9 selftest: Fix copyright header on samba.dsdb_lock

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fcaeffde4eaa1c45b69b2a62b8cad8642cc18220
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Dec 12 09:08:06 2017 +0100

    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>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Dec 13 17:22:01 CET 2017 on sn-devel-144

commit 2abb55b73522ccd8f08847d26c06769ec2eecc27
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Dec 12 11:01:51 2017 +0100

    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>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 00d3019262544a730929fab2d525b23efe226906
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Dec 12 11:48:03 2017 +0100

    docs-xml/Makefile.settings.in: make sure we don't require network access
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=9531
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/Makefile.settings.in                 |  2 +-
 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 +++++++++-
 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 ++--
 wscript                                       |  2 +-
 wscript_build                                 |  5 ++++-
 105 files changed, 202 insertions(+), 179 deletions(-)
 create mode 100644 docs-xml/build/DTD/samba.build.version.in


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in
index 2bf96d7..08c250c 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@
diff --git a/docs-xml/build/DTD/samba-doc b/docs-xml/build/DTD/samba-doc
index afde348..9873aa0 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 0000000..775e08b
--- /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 56d13a6..77bf87e 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 fe889a2..8c26692 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/docs-xml/manpages/cifsdd.8.xml b/docs-xml/manpages/cifsdd.8.xml
index 9137d85..d8d4bbc 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 6d4d21d..91b49bb 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 3c12b26..69e90c1 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 153908e..23278c5 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 fa5ae72..aea6f07 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 32d53b4..6c4da1c 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 311319d..fd3a2d6 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 872bb6d..0601f61 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 303a0f4..b7c5977 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 5785662..1393b04 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 19d89ef..ade4b78 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 d115486..95afde1 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 04f38305..fccb838 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 5b4fe2e..253b016 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 41d06ee..9c33523 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 60b1f76..257d001 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 40f6e92..2cb7ed1 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 034dc3a..977db9f 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 a43a062..542dac5 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 eb193f6..79170d2 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 4813c8a..e56f05a 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 6b35ce1..e84b081 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 c8f3250..fdda333 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 f1d6164..4ba9fe2 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 5c9af66..8766bf0 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>
 
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list