95 files changed, 75 insertions, 75 deletions
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index d8423be800..25725ef863 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -8,10 +8,10 @@ include Makefile.settings
 
 # Docs to build
 MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml))
-MANPAGES3 = $(wildcard $(MANPAGEDIR3)/*.?.xml)
+MANPAGES = $(wildcard $(MANPAGEDIR)/*.?.xml)
 
 # Lists of files to process
-MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR3)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES3))
+MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES))
 DBLATEX_OPTIONS = -p xslt/latex.xsl -i xslt/latex
 
 DATETIME := $(shell date +%Y%m%d%H%M%S)
@@ -33,7 +33,7 @@ help:
 	@echo " release - Build the docs needed for a Samba release"
 	@echo " all - Build all docs that can be build using the utilities found by configure"
 	@echo " everything - Build all of the above"
-	@echo " pdf,tex,ps,manpages3,txt,pearson,htmlhelp - Build specific output format"
+	@echo " pdf,tex,ps,manpages,txt,pearson,htmlhelp - Build specific output format"
 	@echo " html - Build multi-file HTML versions"
 	@echo " html-single - Build single-file HTML versions"
 	@echo " htmlman3 - Build HTML version of manpages"
@@ -42,13 +42,13 @@ help:
 
 $(PDFDIR)/Samba3-ByExample.pdf $(PSDIR)/Samba3-ByExample.ps $(DOCBOOKDIR)/Samba3-ByExample.xml Samba3-ByExample.tex: $(wildcard Samba3-ByExample/*.xml)
 $(PDFDIR)/Samba3-HOWTO.pdf $(PSDIR)/Samba3-HOWTO.ps Samba3-HOWTO.tex $(DOCBOOKDIR)/Samba3-HOWTO.xml: $(wildcard Samba3-HOWTO/*.xml) Samba3-HOWTO-attributions.xml
-Samba3-HOWTO/manpages.xml: $(MANPAGEDIR3)/smb.conf.5.xml
+Samba3-HOWTO/manpages.xml: $(MANPAGEDIR)/smb.conf.5.xml
 $(PDFDIR)/Samba3-Developers-Guide.pdf $(PSDIR)/Samba3-Developers-Guide.ps $(DOCBOOKDIR)/Samba3-Developers-Guide.xml Samba3-Developers-Guide.tex: $(wildcard Samba3-Developers-Guide/*.xml) Samba3-Developers-Guide-attributions.xml
 
 # Pseudo targets 
 all:: $(TARGETS)
-everything:: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson 
-release:: manpages3 htmlman3 html pdf 
+everything:: manpages pdf html-single html htmlman3 txt ps fo htmlhelp pearson 
+release:: manpages htmlman3 html pdf 
 clean::
 	@echo "Cleaning up..." 
 	rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
@@ -71,11 +71,11 @@ txt:: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
 tex:: $(addsuffix .tex,$(MAIN_DOCS))
 texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
 texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
-manpages3:: $(patsubst $(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
+manpages:: $(patsubst $(MANPAGEDIR)/%.xml,$(OUTPUTDIR)/manpages/%,$(MANPAGES))
 pearson:: $(PEARSONDIR)/Samba3-HOWTO.xml
 pearson-verify:: $(PEARSONDIR)/Samba3-HOWTO.report.html
 plucker:: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
-htmlman3:: $(patsubst $(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3)) $(HTMLDIR)/manpages-3/index.html
+htmlman3:: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/manpages/%.html,$(MANPAGES)) $(HTMLDIR)/manpages/index.html
 html-single:: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
 html:: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
 htmlhelp:: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
@@ -93,14 +93,14 @@ $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
 	@mkdir -p $(@D)
 	@$(XSLTPROC) --stringparam latex.imagebasedir "$*/"  --stringparam noreference 0  --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
-$(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl
+$(DOCBOOKDIR)/manpages/%.xml: $(MANPAGEDIR)/%.xml xslt/expand-sambadoc.xsl
 	@mkdir -p $(@D)
 	$(XSLTPROC) --xinclude --stringparam noreference 0 --output $@ xslt/expand-sambadoc.xsl $<
 
-$(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl
+$(DOCBOOKDIR)/manpages/index.xml: $(MANPAGES) xslt/manpage-summary.xsl
 	@mkdir -p $(@D)
 	echo "<article><variablelist>" > $@
-	$(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES3) >> $@
+	$(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES) >> $@
 	@echo "</variablelist></article>" >> $@
 
 # HTML docs
@@ -211,7 +211,7 @@ $(TEXINFODIR)/%.info: $(TEXINFODIR)/%.texi
 	$(MAKEINFO) --no-validate --force -o $@ "$<"
 
 # Manpages
-$(MANPAGEDIR3)/smb.conf.5.xml: parameters
+$(MANPAGEDIR)/smb.conf.5.xml: parameters
 
 # The phony parameters target exists in order to always create the
 # the parameters xml files. Otherwise, when parameters.*.xml does not exist
diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in
index 86c7373739..e5d58a4279 100644
--- a/docs-xml/Makefile.settings.in
+++ b/docs-xml/Makefile.settings.in
@@ -17,7 +17,7 @@ OUTPUTDIR = output
 ARCHIVEDIR = archive
 TEXINFODIR = $(OUTPUTDIR)/texi
 SRCDIR = ../source3
-MANPAGEDIR3 = manpages-3
+MANPAGEDIR = manpages
 SMBDOTCONFDOC = smbdotconf
 DOCBOOKDIR = tmp
 PSDIR = $(OUTPUTDIR)
diff --git a/docs-xml/Samba3-HOWTO/manpages.xml b/docs-xml/Samba3-HOWTO/manpages.xml
index 944f842a49..577ac8bab9 100644
--- a/docs-xml/Samba3-HOWTO/manpages.xml
+++ b/docs-xml/Samba3-HOWTO/manpages.xml
@@ -7,65 +7,65 @@
 		All manual pages have been written by members of 
 		<ulink url="http://www.samba.org/samba/team.html">the Samba Team</ulink>.</para>
 
-	<xi:include href="../manpages-3/eventlogadm.8.xml"/>
-	<xi:include href="../manpages-3/findsmb.1.xml"/>
-	<xi:include href="../manpages-3/idmap_ad.8.xml"/>
-	<xi:include href="../manpages-3/idmap_ldap.8.xml"/>
-	<xi:include href="../manpages-3/idmap_nss.8.xml"/>
-	<xi:include href="../manpages-3/idmap_rid.8.xml"/>
-	<xi:include href="../manpages-3/idmap_tdb.8.xml"/>
-	<xi:include href="../manpages-3/libsmbclient.7.xml"/>
-	<xi:include href="../manpages-3/lmhosts.5.xml"/>
-	<xi:include href="../manpages-3/log2pcap.1.xml"/>
-	<xi:include href="../manpages-3/net.8.xml"/>
-	<xi:include href="../manpages-3/nmbd.8.xml"/>
-	<xi:include href="../manpages-3/nmblookup.1.xml"/>
-	<xi:include href="../manpages-3/ntlm_auth.1.xml"/>
-	<xi:include href="../manpages-3/pam_winbind.8.xml"/>
-	<xi:include href="../manpages-3/pdbedit.8.xml"/>
-	<xi:include href="../manpages-3/profiles.1.xml"/>
-	<xi:include href="../manpages-3/rpcclient.1.xml"/>
-	<xi:include href="../manpages-3/smbcacls.1.xml"/>
-	<xi:include href="../manpages-3/smbclient.1.xml"/>
-	<xi:include href="../manpages-3/smb.conf.5.xml"/>
-	<xi:include href="../manpages-3/smbcontrol.1.xml"/>
-	<xi:include href="../manpages-3/smbcquotas.1.xml"/>
-	<xi:include href="../manpages-3/smbd.8.xml"/>
-	<xi:include href="../manpages-3/smbget.1.xml"/>
-	<xi:include href="../manpages-3/smbgetrc.5.xml"/>
-	<xi:include href="../manpages-3/smbpasswd.5.xml"/>
-	<xi:include href="../manpages-3/smbpasswd.8.xml"/>
-	<xi:include href="../manpages-3/smbsh.1.xml"/>
-	<xi:include href="../manpages-3/smbstatus.1.xml"/>
-	<xi:include href="../manpages-3/smbtar.1.xml"/>
-	<xi:include href="../manpages-3/smbtree.1.xml"/>
-	<xi:include href="../manpages-3/smbumount.8.xml"/>
-	<xi:include href="../manpages-3/swat.8.xml"/>
-	<xi:include href="../manpages-3/tdbbackup.8.xml"/>
-	<xi:include href="../manpages-3/tdbdump.8.xml"/>
-	<xi:include href="../manpages-3/tdbtool.8.xml"/>
-	<xi:include href="../manpages-3/testparm.1.xml"/>
-	<xi:include href="../manpages-3/wbinfo.1.xml"/>
-	<xi:include href="../manpages-3/winbindd.8.xml"/>
-	<xi:include href="../manpages-3/vfs_audit.8.xml"/>
-	<xi:include href="../manpages-3/vfs_cacheprime.8.xml"/>
-	<xi:include href="../manpages-3/vfs_cap.8.xml"/>
-	<xi:include href="../manpages-3/vfs_catia.8.xml"/>
-	<xi:include href="../manpages-3/vfs_commit.8.xml"/>
-	<xi:include href="../manpages-3/vfs_default_quota.8.xml"/>
-	<xi:include href="../manpages-3/vfs_extd_audit.8.xml"/>
-	<xi:include href="../manpages-3/vfs_fake_perms.8.xml"/>
-	<xi:include href="../manpages-3/vfs_full_audit.8.xml"/>
-	<xi:include href="../manpages-3/vfs_gpfs.8.xml"/>
-	<xi:include href="../manpages-3/vfs_netatalk.8.xml"/>
-	<xi:include href="../manpages-3/vfs_notify_fam.8.xml"/>
-	<xi:include href="../manpages-3/vfs_prealloc.8.xml"/>
-	<xi:include href="../manpages-3/vfs_readahead.8.xml"/>
-	<xi:include href="../manpages-3/vfs_readonly.8.xml"/>
-	<xi:include href="../manpages-3/vfs_recycle.8.xml"/>
-	<xi:include href="../manpages-3/vfs_shadow_copy.8.xml"/>
-	<xi:include href="../manpages-3/vfstest.1.xml"/>
-	<xi:include href="../manpages-3/wbinfo.1.xml"/>
-	<xi:include href="../manpages-3/winbindd.8.xml"/>
+	<xi:include href="../manpages/eventlogadm.8.xml"/>
+	<xi:include href="../manpages/findsmb.1.xml"/>
+	<xi:include href="../manpages/idmap_ad.8.xml"/>
+	<xi:include href="../manpages/idmap_ldap.8.xml"/>
+	<xi:include href="../manpages/idmap_nss.8.xml"/>
+	<xi:include href="../manpages/idmap_rid.8.xml"/>
+	<xi:include href="../manpages/idmap_tdb.8.xml"/>
+	<xi:include href="../manpages/libsmbclient.7.xml"/>
+	<xi:include href="../manpages/lmhosts.5.xml"/>
+	<xi:include href="../manpages/log2pcap.1.xml"/>
+	<xi:include href="../manpages/net.8.xml"/>
+	<xi:include href="../manpages/nmbd.8.xml"/>
+	<xi:include href="../manpages/nmblookup.1.xml"/>
+	<xi:include href="../manpages/ntlm_auth.1.xml"/>
+	<xi:include href="../manpages/pam_winbind.8.xml"/>
+	<xi:include href="../manpages/pdbedit.8.xml"/>
+	<xi:include href="../manpages/profiles.1.xml"/>
+	<xi:include href="../manpages/rpcclient.1.xml"/>
+	<xi:include href="../manpages/smbcacls.1.xml"/>
+	<xi:include href="../manpages/smbclient.1.xml"/>
+	<xi:include href="../manpages/smb.conf.5.xml"/>
+	<xi:include href="../manpages/smbcontrol.1.xml"/>
+	<xi:include href="../manpages/smbcquotas.1.xml"/>
+	<xi:include href="../manpages/smbd.8.xml"/>
+	<xi:include href="../manpages/smbget.1.xml"/>
+	<xi:include href="../manpages/smbgetrc.5.xml"/>
+	<xi:include href="../manpages/smbpasswd.5.xml"/>
+	<xi:include href="../manpages/smbpasswd.8.xml"/>
+	<xi:include href="../manpages/smbsh.1.xml"/>
+	<xi:include href="../manpages/smbstatus.1.xml"/>
+	<xi:include href="../manpages/smbtar.1.xml"/>
+	<xi:include href="../manpages/smbtree.1.xml"/>
+	<xi:include href="../manpages/smbumount.8.xml"/>
+	<xi:include href="../manpages/swat.8.xml"/>
+	<xi:include href="../manpages/tdbbackup.8.xml"/>
+	<xi:include href="../manpages/tdbdump.8.xml"/>
+	<xi:include href="../manpages/tdbtool.8.xml"/>
+	<xi:include href="../manpages/testparm.1.xml"/>
+	<xi:include href="../manpages/wbinfo.1.xml"/>
+	<xi:include href="../manpages/winbindd.8.xml"/>
+	<xi:include href="../manpages/vfs_audit.8.xml"/>
+	<xi:include href="../manpages/vfs_cacheprime.8.xml"/>
+	<xi:include href="../manpages/vfs_cap.8.xml"/>
+	<xi:include href="../manpages/vfs_catia.8.xml"/>
+	<xi:include href="../manpages/vfs_commit.8.xml"/>
+	<xi:include href="../manpages/vfs_default_quota.8.xml"/>
+	<xi:include href="../manpages/vfs_extd_audit.8.xml"/>
+	<xi:include href="../manpages/vfs_fake_perms.8.xml"/>
+	<xi:include href="../manpages/vfs_full_audit.8.xml"/>
+	<xi:include href="../manpages/vfs_gpfs.8.xml"/>
+	<xi:include href="../manpages/vfs_netatalk.8.xml"/>
+	<xi:include href="../manpages/vfs_notify_fam.8.xml"/>
+	<xi:include href="../manpages/vfs_prealloc.8.xml"/>
+	<xi:include href="../manpages/vfs_readahead.8.xml"/>
+	<xi:include href="../manpages/vfs_readonly.8.xml"/>
+	<xi:include href="../manpages/vfs_recycle.8.xml"/>
+	<xi:include href="../manpages/vfs_shadow_copy.8.xml"/>
+	<xi:include href="../manpages/vfstest.1.xml"/>
+	<xi:include href="../manpages/wbinfo.1.xml"/>
+	<xi:include href="../manpages/winbindd.8.xml"/>
 
 </reference>
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 16a9aaad2a..4339c00fab 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -38,7 +38,7 @@ DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex ps pdf])
 DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html])
 DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp])
 DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman3])
-DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages3])
+DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages])
 DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson])
 DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
 DOCS_DEFINE_TARGET(VALIDATE, ALL, [validating docbook output], [])
diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages/eventlogadm.8.xml
index 4a6a68e185..4a6a68e185 100644
--- a/docs-xml/manpages-3/eventlogadm.8.xml
+++ b/docs-xml/manpages/eventlogadm.8.xml
diff --git a/docs-xml/manpages-3/findsmb.1.xml b/docs-xml/manpages/findsmb.1.xml
index 92bcbbefb6..92bcbbefb6 100644
--- a/docs-xml/manpages-3/findsmb.1.xml
+++ b/docs-xml/manpages/findsmb.1.xml
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
index 7319f9199f..7319f9199f 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages/idmap_ad.8.xml
diff --git a/docs-xml/manpages-3/idmap_autorid.8.xml b/docs-xml/manpages/idmap_autorid.8.xml
index 498ef68fb3..498ef68fb3 100644
--- a/docs-xml/manpages-3/idmap_autorid.8.xml
+++ b/docs-xml/manpages/idmap_autorid.8.xml
diff --git a/docs-xml/manpages-3/idmap_hash.8.xml b/docs-xml/manpages/idmap_hash.8.xml
index f3ec6a7bc2..f3ec6a7bc2 100644
--- a/docs-xml/manpages-3/idmap_hash.8.xml
+++ b/docs-xml/manpages/idmap_hash.8.xml
diff --git a/docs-xml/manpages-3/idmap_ldap.8.xml b/docs-xml/manpages/idmap_ldap.8.xml
index 2c0fcfd17c..2c0fcfd17c 100644
--- a/docs-xml/manpages-3/idmap_ldap.8.xml
+++ b/docs-xml/manpages/idmap_ldap.8.xml
diff --git a/docs-xml/manpages-3/idmap_nss.8.xml b/docs-xml/manpages/idmap_nss.8.xml
index 565019cd3d..565019cd3d 100644
--- a/docs-xml/manpages-3/idmap_nss.8.xml
+++ b/docs-xml/manpages/idmap_nss.8.xml
diff --git a/docs-xml/manpages-3/idmap_rid.8.xml b/docs-xml/manpages/idmap_rid.8.xml
index 3f8735288c..3f8735288c 100644
--- a/docs-xml/manpages-3/idmap_rid.8.xml
+++ b/docs-xml/manpages/idmap_rid.8.xml
diff --git a/docs-xml/manpages-3/idmap_tdb.8.xml b/docs-xml/manpages/idmap_tdb.8.xml
index c67d6cb9bc..c67d6cb9bc 100644
--- a/docs-xml/manpages-3/idmap_tdb.8.xml
+++ b/docs-xml/manpages/idmap_tdb.8.xml
diff --git a/docs-xml/manpages-3/idmap_tdb2.8.xml b/docs-xml/manpages/idmap_tdb2.8.xml
index 1faf59085f..1faf59085f 100644
--- a/docs-xml/manpages-3/idmap_tdb2.8.xml
+++ b/docs-xml/manpages/idmap_tdb2.8.xml
diff --git a/docs-xml/manpages-3/ldb.3.xml b/docs-xml/manpages/ldb.3.xml
index 715fd8002f..715fd8002f 100644
--- a/docs-xml/manpages-3/ldb.3.xml
+++ b/docs-xml/manpages/ldb.3.xml
diff --git a/docs-xml/manpages-3/ldbadd.1.xml b/docs-xml/manpages/ldbadd.1.xml
index b0c25e74c7..b0c25e74c7 100644
--- a/docs-xml/manpages-3/ldbadd.1.xml
+++ b/docs-xml/manpages/ldbadd.1.xml
diff --git a/docs-xml/manpages-3/ldbdel.1.xml b/docs-xml/manpages/ldbdel.1.xml
index c7e33a839f..c7e33a839f 100644
--- a/docs-xml/manpages-3/ldbdel.1.xml
+++ b/docs-xml/manpages/ldbdel.1.xml
diff --git a/docs-xml/manpages-3/ldbedit.1.xml b/docs-xml/manpages/ldbedit.1.xml
index bbca0d2309..bbca0d2309 100644
--- a/docs-xml/manpages-3/ldbedit.1.xml
+++ b/docs-xml/manpages/ldbedit.1.xml
diff --git a/docs-xml/manpages-3/ldbmodify.1.xml b/docs-xml/manpages/ldbmodify.1.xml
index 0c91f75599..0c91f75599 100644
--- a/docs-xml/manpages-3/ldbmodify.1.xml
+++ b/docs-xml/manpages/ldbmodify.1.xml
diff --git a/docs-xml/manpages-3/ldbrename.1.xml b/docs-xml/manpages/ldbrename.1.xml
index 394cff74ef..394cff74ef 100644
--- a/docs-xml/manpages-3/ldbrename.1.xml
+++ b/docs-xml/manpages/ldbrename.1.xml
diff --git a/docs-xml/manpages-3/ldbsearch.1.xml b/docs-xml/manpages/ldbsearch.1.xml
index 6882c56bfe..6882c56bfe 100644
--- a/docs-xml/manpages-3/ldbsearch.1.xml
+++ b/docs-xml/manpages/ldbsearch.1.xml
diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages/libsmbclient.7.xml
index 277caf3618..277caf3618 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages/libsmbclient.7.xml
diff --git a/docs-xml/manpages-3/lmhosts.5.xml b/docs-xml/manpages/lmhosts.5.xml
index de6bc4d1a9..de6bc4d1a9 100644
--- a/docs-xml/manpages-3/lmhosts.5.xml
+++ b/docs-xml/manpages/lmhosts.5.xml
diff --git a/docs-xml/manpages-3/log2pcap.1.xml b/docs-xml/manpages/log2pcap.1.xml
index 5e449b8252..5e449b8252 100644
--- a/docs-xml/manpages-3/log2pcap.1.xml
+++ b/docs-xml/manpages/log2pcap.1.xml
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages/net.8.xml
index 7a7ca6d1b6..7a7ca6d1b6 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
diff --git a/docs-xml/manpages-3/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml
index 43a367fe6f..43a367fe6f 100644
--- a/docs-xml/manpages-3/nmbd.8.xml
+++ b/docs-xml/manpages/nmbd.8.xml
diff --git a/docs-xml/manpages-3/nmblookup.1.xml b/docs-xml/manpages/nmblookup.1.xml
index 465bba04db..465bba04db 100644
--- a/docs-xml/manpages-3/nmblookup.1.xml
+++ b/docs-xml/manpages/nmblookup.1.xml
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml
index dcf9b42503..dcf9b42503 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages/ntlm_auth.1.xml
diff --git a/docs-xml/manpages-3/pam_winbind.8.xml b/docs-xml/manpages/pam_winbind.8.xml
index 14f4e70648..14f4e70648 100644
--- a/docs-xml/manpages-3/pam_winbind.8.xml
+++ b/docs-xml/manpages/pam_winbind.8.xml
diff --git a/docs-xml/manpages-3/pam_winbind.conf.5.xml b/docs-xml/manpages/pam_winbind.conf.5.xml
index 113515ce84..113515ce84 100644
--- a/docs-xml/manpages-3/pam_winbind.conf.5.xml
+++ b/docs-xml/manpages/pam_winbind.conf.5.xml
diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages/pdbedit.8.xml
index 1d0752e234..1d0752e234 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages/pdbedit.8.xml
diff --git a/docs-xml/manpages-3/profiles.1.xml b/docs-xml/manpages/profiles.1.xml
index fb33217148..fb33217148 100644
--- a/docs-xml/manpages-3/profiles.1.xml
+++ b/docs-xml/manpages/profiles.1.xml
diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml
index 4e3d30c097..4e3d30c097 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
diff --git a/docs-xml/manpages-3/samba.7.xml b/docs-xml/manpages/samba.7.xml
index 1e1d71d121..1e1d71d121 100644
--- a/docs-xml/manpages-3/samba.7.xml
+++ b/docs-xml/manpages/samba.7.xml
diff --git a/docs-xml/manpages-3/sharesec.1.xml b/docs-xml/manpages/sharesec.1.xml
index 6618c027e5..6618c027e5 100644
--- a/docs-xml/manpages-3/sharesec.1.xml
+++ b/docs-xml/manpages/sharesec.1.xml
diff --git a/docs-xml/manpages-3/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index becea22531..becea22531 100644
--- a/docs-xml/manpages-3/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
diff --git a/docs-xml/manpages-3/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index 8674ecf1f4..8674ecf1f4 100644
--- a/docs-xml/manpages-3/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml
index d815dcd6da..d815dcd6da 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages/smbcontrol.1.xml
index fbed772039..fbed772039 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages/smbcontrol.1.xml
diff --git a/docs-xml/manpages-3/smbcquotas.1.xml b/docs-xml/manpages/smbcquotas.1.xml
index de43878ca7..de43878ca7 100644
--- a/docs-xml/manpages-3/smbcquotas.1.xml
+++ b/docs-xml/manpages/smbcquotas.1.xml
diff --git a/docs-xml/manpages-3/smbd.8.xml b/docs-xml/manpages/smbd.8.xml
index 618ff821f4..618ff821f4 100644
--- a/docs-xml/manpages-3/smbd.8.xml
+++ b/docs-xml/manpages/smbd.8.xml
diff --git a/docs-xml/manpages-3/smbget.1.xml b/docs-xml/manpages/smbget.1.xml
index 99ff5c69c0..99ff5c69c0 100644
--- a/docs-xml/manpages-3/smbget.1.xml
+++ b/docs-xml/manpages/smbget.1.xml
diff --git a/docs-xml/manpages-3/smbgetrc.5.xml b/docs-xml/manpages/smbgetrc.5.xml
index d4749f2bac..d4749f2bac 100644
--- a/docs-xml/manpages-3/smbgetrc.5.xml
+++ b/docs-xml/manpages/smbgetrc.5.xml
diff --git a/docs-xml/manpages-3/smbpasswd.5.xml b/docs-xml/manpages/smbpasswd.5.xml
index 34676f64ee..34676f64ee 100644
--- a/docs-xml/manpages-3/smbpasswd.5.xml
+++ b/docs-xml/manpages/smbpasswd.5.xml
diff --git a/docs-xml/manpages-3/smbpasswd.8.xml b/docs-xml/manpages/smbpasswd.8.xml
index 7477f07f71..7477f07f71 100644
--- a/docs-xml/manpages-3/smbpasswd.8.xml
+++ b/docs-xml/manpages/smbpasswd.8.xml
diff --git a/docs-xml/manpages-3/smbspool.8.xml b/docs-xml/manpages/smbspool.8.xml
index ee5cc0d173..ee5cc0d173 100644
--- a/docs-xml/manpages-3/smbspool.8.xml
+++ b/docs-xml/manpages/smbspool.8.xml
diff --git a/docs-xml/manpages-3/smbstatus.1.xml b/docs-xml/manpages/smbstatus.1.xml
index e3bc251924..e3bc251924 100644
--- a/docs-xml/manpages-3/smbstatus.1.xml
+++ b/docs-xml/manpages/smbstatus.1.xml
diff --git a/docs-xml/manpages-3/smbta-util.8.xml b/docs-xml/manpages/smbta-util.8.xml
index 6e53aaab0a..6e53aaab0a 100644
--- a/docs-xml/manpages-3/smbta-util.8.xml
+++ b/docs-xml/manpages/smbta-util.8.xml
diff --git a/docs-xml/manpages-3/smbtar.1.xml b/docs-xml/manpages/smbtar.1.xml
index 7ce564c8dc..7ce564c8dc 100644
--- a/docs-xml/manpages-3/smbtar.1.xml
+++ b/docs-xml/manpages/smbtar.1.xml
diff --git a/docs-xml/manpages-3/smbtree.1.xml b/docs-xml/manpages/smbtree.1.xml
index d69aef13ba..d69aef13ba 100644
--- a/docs-xml/manpages-3/smbtree.1.xml
+++ b/docs-xml/manpages/smbtree.1.xml
diff --git a/docs-xml/manpages-3/swat.8.xml b/docs-xml/manpages/swat.8.xml
index ec102130b4..ec102130b4 100644
--- a/docs-xml/manpages-3/swat.8.xml
+++ b/docs-xml/manpages/swat.8.xml
diff --git a/docs-xml/manpages-3/tdbbackup.8.xml b/docs-xml/manpages/tdbbackup.8.xml
index 93f773feb8..93f773feb8 100644
--- a/docs-xml/manpages-3/tdbbackup.8.xml
+++ b/docs-xml/manpages/tdbbackup.8.xml
diff --git a/docs-xml/manpages-3/tdbdump.8.xml b/docs-xml/manpages/tdbdump.8.xml
index 90465e53e8..90465e53e8 100644
--- a/docs-xml/manpages-3/tdbdump.8.xml
+++ b/docs-xml/manpages/tdbdump.8.xml
diff --git a/docs-xml/manpages-3/tdbtool.8.xml b/docs-xml/manpages/tdbtool.8.xml
index 51fc540fc9..51fc540fc9 100644
--- a/docs-xml/manpages-3/tdbtool.8.xml
+++ b/docs-xml/manpages/tdbtool.8.xml
diff --git a/docs-xml/manpages-3/testparm.1.xml b/docs-xml/manpages/testparm.1.xml
index 8d7cc22204..8d7cc22204 100644
--- a/docs-xml/manpages-3/testparm.1.xml
+++ b/docs-xml/manpages/testparm.1.xml
diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages/vfs_acl_tdb.8.xml
index 7c22dec5de..7c22dec5de 100644
--- a/docs-xml/manpages-3/vfs_acl_tdb.8.xml
+++ b/docs-xml/manpages/vfs_acl_tdb.8.xml
diff --git a/docs-xml/manpages-3/vfs_acl_xattr.8.xml b/docs-xml/manpages/vfs_acl_xattr.8.xml
index 41a8a9750a..41a8a9750a 100644
--- a/docs-xml/manpages-3/vfs_acl_xattr.8.xml
+++ b/docs-xml/manpages/vfs_acl_xattr.8.xml
diff --git a/docs-xml/manpages-3/vfs_aio_fork.8.xml b/docs-xml/manpages/vfs_aio_fork.8.xml
index af69d9ab0d..af69d9ab0d 100644
--- a/docs-xml/manpages-3/vfs_aio_fork.8.xml
+++ b/docs-xml/manpages/vfs_aio_fork.8.xml
diff --git a/docs-xml/manpages-3/vfs_aio_linux.8.xml b/docs-xml/manpages/vfs_aio_linux.8.xml
index dac94a5794..dac94a5794 100644
--- a/docs-xml/manpages-3/vfs_aio_linux.8.xml
+++ b/docs-xml/manpages/vfs_aio_linux.8.xml
diff --git a/docs-xml/manpages-3/vfs_aio_pthread.8.xml b/docs-xml/manpages/vfs_aio_pthread.8.xml
index 3e41ee9e18..3e41ee9e18 100644
--- a/docs-xml/manpages-3/vfs_aio_pthread.8.xml
+++ b/docs-xml/manpages/vfs_aio_pthread.8.xml
diff --git a/docs-xml/manpages-3/vfs_audit.8.xml b/docs-xml/manpages/vfs_audit.8.xml
index 48936fcc08..48936fcc08 100644
--- a/docs-xml/manpages-3/vfs_audit.8.xml
+++ b/docs-xml/manpages/vfs_audit.8.xml
diff --git a/docs-xml/manpages-3/vfs_cacheprime.8.xml b/docs-xml/manpages/vfs_cacheprime.8.xml
index 533919a59f..533919a59f 100644
--- a/docs-xml/manpages-3/vfs_cacheprime.8.xml
+++ b/docs-xml/manpages/vfs_cacheprime.8.xml
diff --git a/docs-xml/manpages-3/vfs_cap.8.xml b/docs-xml/manpages/vfs_cap.8.xml
index 6b625e0f03..6b625e0f03 100644
--- a/docs-xml/manpages-3/vfs_cap.8.xml
+++ b/docs-xml/manpages/vfs_cap.8.xml
diff --git a/docs-xml/manpages-3/vfs_catia.8.xml b/docs-xml/manpages/vfs_catia.8.xml
index f1368a02c6..f1368a02c6 100644
--- a/docs-xml/manpages-3/vfs_catia.8.xml
+++ b/docs-xml/manpages/vfs_catia.8.xml
diff --git a/docs-xml/manpages-3/vfs_commit.8.xml b/docs-xml/manpages/vfs_commit.8.xml
index 395c3de09b..395c3de09b 100644
--- a/docs-xml/manpages-3/vfs_commit.8.xml
+++ b/docs-xml/manpages/vfs_commit.8.xml
diff --git a/docs-xml/manpages-3/vfs_crossrename.8.xml b/docs-xml/manpages/vfs_crossrename.8.xml
index ba7c7c8419..ba7c7c8419 100644
--- a/docs-xml/manpages-3/vfs_crossrename.8.xml
+++ b/docs-xml/manpages/vfs_crossrename.8.xml
diff --git a/docs-xml/manpages-3/vfs_default_quota.8.xml b/docs-xml/manpages/vfs_default_quota.8.xml
index c173c36320..c173c36320 100644
--- a/docs-xml/manpages-3/vfs_default_quota.8.xml
+++ b/docs-xml/manpages/vfs_default_quota.8.xml
diff --git a/docs-xml/manpages-3/vfs_dirsort.8.xml b/docs-xml/manpages/vfs_dirsort.8.xml
index d833c4aafe..d833c4aafe 100644
--- a/docs-xml/manpages-3/vfs_dirsort.8.xml
+++ b/docs-xml/manpages/vfs_dirsort.8.xml
diff --git a/docs-xml/manpages-3/vfs_extd_audit.8.xml b/docs-xml/manpages/vfs_extd_audit.8.xml
index bb1ad95c3f..bb1ad95c3f 100644
--- a/docs-xml/manpages-3/vfs_extd_audit.8.xml
+++ b/docs-xml/manpages/vfs_extd_audit.8.xml
diff --git a/docs-xml/manpages-3/vfs_fake_perms.8.xml b/docs-xml/manpages/vfs_fake_perms.8.xml
index 8b58f8dea2..8b58f8dea2 100644
--- a/docs-xml/manpages-3/vfs_fake_perms.8.xml
+++ b/docs-xml/manpages/vfs_fake_perms.8.xml
diff --git a/docs-xml/manpages-3/vfs_fileid.8.xml b/docs-xml/manpages/vfs_fileid.8.xml
index e4f40ee917..e4f40ee917 100644
--- a/docs-xml/manpages-3/vfs_fileid.8.xml
+++ b/docs-xml/manpages/vfs_fileid.8.xml
diff --git a/docs-xml/manpages-3/vfs_full_audit.8.xml b/docs-xml/manpages/vfs_full_audit.8.xml
index f773a086a8..f773a086a8 100644
--- a/docs-xml/manpages-3/vfs_full_audit.8.xml
+++ b/docs-xml/manpages/vfs_full_audit.8.xml
diff --git a/docs-xml/manpages-3/vfs_gpfs.8.xml b/docs-xml/manpages/vfs_gpfs.8.xml
index 526d86d0d0..526d86d0d0 100644
--- a/docs-xml/manpages-3/vfs_gpfs.8.xml
+++ b/docs-xml/manpages/vfs_gpfs.8.xml
diff --git a/docs-xml/manpages-3/vfs_media_harmony.8.xml b/docs-xml/manpages/vfs_media_harmony.8.xml
index f24e700dc4..f24e700dc4 100644
--- a/docs-xml/manpages-3/vfs_media_harmony.8.xml
+++ b/docs-xml/manpages/vfs_media_harmony.8.xml
diff --git a/docs-xml/manpages-3/vfs_netatalk.8.xml b/docs-xml/manpages/vfs_netatalk.8.xml
index c543edadba..c543edadba 100644
--- a/docs-xml/manpages-3/vfs_netatalk.8.xml
+++ b/docs-xml/manpages/vfs_netatalk.8.xml
diff --git a/docs-xml/manpages-3/vfs_notify_fam.8.xml b/docs-xml/manpages/vfs_notify_fam.8.xml
index 76e7654ee6..76e7654ee6 100644
--- a/docs-xml/manpages-3/vfs_notify_fam.8.xml
+++ b/docs-xml/manpages/vfs_notify_fam.8.xml
diff --git a/docs-xml/manpages-3/vfs_prealloc.8.xml b/docs-xml/manpages/vfs_prealloc.8.xml
index 5aa25b688d..5aa25b688d 100644
--- a/docs-xml/manpages-3/vfs_prealloc.8.xml
+++ b/docs-xml/manpages/vfs_prealloc.8.xml
diff --git a/docs-xml/manpages-3/vfs_preopen.8.xml b/docs-xml/manpages/vfs_preopen.8.xml
index 27b9567d61..27b9567d61 100644
--- a/docs-xml/manpages-3/vfs_preopen.8.xml
+++ b/docs-xml/manpages/vfs_preopen.8.xml
diff --git a/docs-xml/manpages-3/vfs_readahead.8.xml b/docs-xml/manpages/vfs_readahead.8.xml
index 8857cf8557..8857cf8557 100644
--- a/docs-xml/manpages-3/vfs_readahead.8.xml
+++ b/docs-xml/manpages/vfs_readahead.8.xml
diff --git a/docs-xml/manpages-3/vfs_readonly.8.xml b/docs-xml/manpages/vfs_readonly.8.xml
index fee947b53e..fee947b53e 100644
--- a/docs-xml/manpages-3/vfs_readonly.8.xml
+++ b/docs-xml/manpages/vfs_readonly.8.xml
diff --git a/docs-xml/manpages-3/vfs_recycle.8.xml b/docs-xml/manpages/vfs_recycle.8.xml
index f0fb80042b..f0fb80042b 100644
--- a/docs-xml/manpages-3/vfs_recycle.8.xml
+++ b/docs-xml/manpages/vfs_recycle.8.xml
diff --git a/docs-xml/manpages-3/vfs_scannedonly.8.xml b/docs-xml/manpages/vfs_scannedonly.8.xml
index 1f72e93ba4..1f72e93ba4 100644
--- a/docs-xml/manpages-3/vfs_scannedonly.8.xml
+++ b/docs-xml/manpages/vfs_scannedonly.8.xml
diff --git a/docs-xml/manpages-3/vfs_shadow_copy.8.xml b/docs-xml/manpages/vfs_shadow_copy.8.xml
index 4152b6199e..4152b6199e 100644
--- a/docs-xml/manpages-3/vfs_shadow_copy.8.xml
+++ b/docs-xml/manpages/vfs_shadow_copy.8.xml
diff --git a/docs-xml/manpages-3/vfs_shadow_copy2.8.xml b/docs-xml/manpages/vfs_shadow_copy2.8.xml
index e5171bbaa4..e5171bbaa4 100644
--- a/docs-xml/manpages-3/vfs_shadow_copy2.8.xml
+++ b/docs-xml/manpages/vfs_shadow_copy2.8.xml
diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
index 86ae3f3b7c..86ae3f3b7c 100644
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
diff --git a/docs-xml/manpages-3/vfs_streams_depot.8.xml b/docs-xml/manpages/vfs_streams_depot.8.xml
index 3a6f99490f..3a6f99490f 100644
--- a/docs-xml/manpages-3/vfs_streams_depot.8.xml
+++ b/docs-xml/manpages/vfs_streams_depot.8.xml
diff --git a/docs-xml/manpages-3/vfs_streams_xattr.8.xml b/docs-xml/manpages/vfs_streams_xattr.8.xml
index 0d67273c3c..0d67273c3c 100644
--- a/docs-xml/manpages-3/vfs_streams_xattr.8.xml
+++ b/docs-xml/manpages/vfs_streams_xattr.8.xml
diff --git a/docs-xml/manpages-3/vfs_time_audit.8.xml b/docs-xml/manpages/vfs_time_audit.8.xml
index d79acc8600..d79acc8600 100644
--- a/docs-xml/manpages-3/vfs_time_audit.8.xml
+++ b/docs-xml/manpages/vfs_time_audit.8.xml
diff --git a/docs-xml/manpages-3/vfs_tsmsm.8.xml b/docs-xml/manpages/vfs_tsmsm.8.xml
index eac17d31eb..eac17d31eb 100644
--- a/docs-xml/manpages-3/vfs_tsmsm.8.xml
+++ b/docs-xml/manpages/vfs_tsmsm.8.xml
diff --git a/docs-xml/manpages-3/vfs_xattr_tdb.8.xml b/docs-xml/manpages/vfs_xattr_tdb.8.xml
index 47c75038a8..47c75038a8 100644
--- a/docs-xml/manpages-3/vfs_xattr_tdb.8.xml
+++ b/docs-xml/manpages/vfs_xattr_tdb.8.xml
diff --git a/docs-xml/manpages-3/vfstest.1.xml b/docs-xml/manpages/vfstest.1.xml
index 675d766550..675d766550 100644
--- a/docs-xml/manpages-3/vfstest.1.xml
+++ b/docs-xml/manpages/vfstest.1.xml
diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml
index 93fc0abbed..93fc0abbed 100644
--- a/docs-xml/manpages-3/wbinfo.1.xml
+++ b/docs-xml/manpages/wbinfo.1.xml
diff --git a/docs-xml/manpages-3/winbind_krb5_locator.7.xml b/docs-xml/manpages/winbind_krb5_locator.7.xml
index 4f63e15aa4..4f63e15aa4 100644
--- a/docs-xml/manpages-3/winbind_krb5_locator.7.xml
+++ b/docs-xml/manpages/winbind_krb5_locator.7.xml
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml
index 71829fb124..71829fb124 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages/winbindd.8.xml
diff --git a/docs-xml/scripts/find_missing_manpages.pl b/docs-xml/scripts/find_missing_manpages.pl
index 0d66280a5a..cd8ed87596 100755
--- a/docs-xml/scripts/find_missing_manpages.pl
+++ b/docs-xml/scripts/find_missing_manpages.pl
@@ -30,7 +30,7 @@ foreach(split(/bin\//, $progs)) {
 	$found = 0;
 
 	for($i = 0; $i < 9; $i++) {
-		if(-e "manpages-3/$f.$i.xml") { $found = 1; }
+		if(-e "manpages/$f.$i.xml") { $found = 1; }
 	}
 
 	if(!$found) {