From 75484f491140fb86eaee90dde1dc1c9d4ebe8a41 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Mon, 3 Sep 2012 21:49:25 +0200 Subject: [PATCH] docs: Rename manpages-3 -> manpages. This change was suggested by Andrew Bartlett on the samba-technical mailing list. Karolin Autobuild-User(master): Karolin Seeger Autobuild-Date(master): Mon Sep 3 23:35:38 CEST 2012 on sn-devel-104 --- docs-xml/Makefile | 24 ++-- docs-xml/Makefile.settings.in | 2 +- docs-xml/Samba3-HOWTO/manpages.xml | 120 +++++++++--------- docs-xml/configure.ac | 2 +- .../eventlogadm.8.xml | 0 .../{manpages-3 => manpages}/findsmb.1.xml | 0 .../{manpages-3 => manpages}/idmap_ad.8.xml | 0 .../idmap_autorid.8.xml | 0 .../{manpages-3 => manpages}/idmap_hash.8.xml | 0 .../{manpages-3 => manpages}/idmap_ldap.8.xml | 0 .../{manpages-3 => manpages}/idmap_nss.8.xml | 0 .../{manpages-3 => manpages}/idmap_rid.8.xml | 0 .../{manpages-3 => manpages}/idmap_tdb.8.xml | 0 .../{manpages-3 => manpages}/idmap_tdb2.8.xml | 0 docs-xml/{manpages-3 => manpages}/ldb.3.xml | 0 .../{manpages-3 => manpages}/ldbadd.1.xml | 0 .../{manpages-3 => manpages}/ldbdel.1.xml | 0 .../{manpages-3 => manpages}/ldbedit.1.xml | 0 .../{manpages-3 => manpages}/ldbmodify.1.xml | 0 .../{manpages-3 => manpages}/ldbrename.1.xml | 0 .../{manpages-3 => manpages}/ldbsearch.1.xml | 0 .../libsmbclient.7.xml | 0 .../{manpages-3 => manpages}/lmhosts.5.xml | 0 .../{manpages-3 => manpages}/log2pcap.1.xml | 0 docs-xml/{manpages-3 => manpages}/net.8.xml | 0 docs-xml/{manpages-3 => manpages}/nmbd.8.xml | 0 .../{manpages-3 => manpages}/nmblookup.1.xml | 0 .../{manpages-3 => manpages}/ntlm_auth.1.xml | 0 .../pam_winbind.8.xml | 0 .../pam_winbind.conf.5.xml | 0 .../{manpages-3 => manpages}/pdbedit.8.xml | 0 .../{manpages-3 => manpages}/profiles.1.xml | 0 .../{manpages-3 => manpages}/rpcclient.1.xml | 0 docs-xml/{manpages-3 => manpages}/samba.7.xml | 0 .../{manpages-3 => manpages}/sharesec.1.xml | 0 .../{manpages-3 => manpages}/smb.conf.5.xml | 0 .../{manpages-3 => manpages}/smbcacls.1.xml | 0 .../{manpages-3 => manpages}/smbclient.1.xml | 0 .../{manpages-3 => manpages}/smbcontrol.1.xml | 0 .../{manpages-3 => manpages}/smbcquotas.1.xml | 0 docs-xml/{manpages-3 => manpages}/smbd.8.xml | 0 .../{manpages-3 => manpages}/smbget.1.xml | 0 .../{manpages-3 => manpages}/smbgetrc.5.xml | 0 .../{manpages-3 => manpages}/smbpasswd.5.xml | 0 .../{manpages-3 => manpages}/smbpasswd.8.xml | 0 .../{manpages-3 => manpages}/smbspool.8.xml | 0 .../{manpages-3 => manpages}/smbstatus.1.xml | 0 .../{manpages-3 => manpages}/smbta-util.8.xml | 0 .../{manpages-3 => manpages}/smbtar.1.xml | 0 .../{manpages-3 => manpages}/smbtree.1.xml | 0 docs-xml/{manpages-3 => manpages}/swat.8.xml | 0 .../{manpages-3 => manpages}/tdbbackup.8.xml | 0 .../{manpages-3 => manpages}/tdbdump.8.xml | 0 .../{manpages-3 => manpages}/tdbtool.8.xml | 0 .../{manpages-3 => manpages}/testparm.1.xml | 0 .../vfs_acl_tdb.8.xml | 0 .../vfs_acl_xattr.8.xml | 0 .../vfs_aio_fork.8.xml | 0 .../vfs_aio_linux.8.xml | 0 .../vfs_aio_pthread.8.xml | 0 .../{manpages-3 => manpages}/vfs_audit.8.xml | 0 .../vfs_cacheprime.8.xml | 0 .../{manpages-3 => manpages}/vfs_cap.8.xml | 0 .../{manpages-3 => manpages}/vfs_catia.8.xml | 0 .../{manpages-3 => manpages}/vfs_commit.8.xml | 0 .../vfs_crossrename.8.xml | 0 .../vfs_default_quota.8.xml | 0 .../vfs_dirsort.8.xml | 0 .../vfs_extd_audit.8.xml | 0 .../vfs_fake_perms.8.xml | 0 .../{manpages-3 => manpages}/vfs_fileid.8.xml | 0 .../vfs_full_audit.8.xml | 0 .../{manpages-3 => manpages}/vfs_gpfs.8.xml | 0 .../vfs_media_harmony.8.xml | 0 .../vfs_netatalk.8.xml | 0 .../vfs_notify_fam.8.xml | 0 .../vfs_prealloc.8.xml | 0 .../vfs_preopen.8.xml | 0 .../vfs_readahead.8.xml | 0 .../vfs_readonly.8.xml | 0 .../vfs_recycle.8.xml | 0 .../vfs_scannedonly.8.xml | 0 .../vfs_shadow_copy.8.xml | 0 .../vfs_shadow_copy2.8.xml | 0 .../vfs_smb_traffic_analyzer.8.xml | 0 .../vfs_streams_depot.8.xml | 0 .../vfs_streams_xattr.8.xml | 0 .../vfs_time_audit.8.xml | 0 .../{manpages-3 => manpages}/vfs_tsmsm.8.xml | 0 .../vfs_xattr_tdb.8.xml | 0 .../{manpages-3 => manpages}/vfstest.1.xml | 0 .../{manpages-3 => manpages}/wbinfo.1.xml | 0 .../winbind_krb5_locator.7.xml | 0 .../{manpages-3 => manpages}/winbindd.8.xml | 0 docs-xml/scripts/find_missing_manpages.pl | 2 +- 95 files changed, 75 insertions(+), 75 deletions(-) rename docs-xml/{manpages-3 => manpages}/eventlogadm.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/findsmb.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/idmap_ad.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/idmap_autorid.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/idmap_hash.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/idmap_ldap.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/idmap_nss.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/idmap_rid.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/idmap_tdb.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/idmap_tdb2.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/ldb.3.xml (100%) rename docs-xml/{manpages-3 => manpages}/ldbadd.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/ldbdel.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/ldbedit.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/ldbmodify.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/ldbrename.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/ldbsearch.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/libsmbclient.7.xml (100%) rename docs-xml/{manpages-3 => manpages}/lmhosts.5.xml (100%) rename docs-xml/{manpages-3 => manpages}/log2pcap.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/net.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/nmbd.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/nmblookup.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/ntlm_auth.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/pam_winbind.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/pam_winbind.conf.5.xml (100%) rename docs-xml/{manpages-3 => manpages}/pdbedit.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/profiles.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/rpcclient.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/samba.7.xml (100%) rename docs-xml/{manpages-3 => manpages}/sharesec.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/smb.conf.5.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbcacls.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbclient.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbcontrol.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbcquotas.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbd.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbget.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbgetrc.5.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbpasswd.5.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbpasswd.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbspool.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbstatus.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbta-util.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbtar.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/smbtree.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/swat.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/tdbbackup.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/tdbdump.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/tdbtool.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/testparm.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_acl_tdb.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_acl_xattr.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_aio_fork.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_aio_linux.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_aio_pthread.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_audit.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_cacheprime.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_cap.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_catia.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_commit.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_crossrename.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_default_quota.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_dirsort.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_extd_audit.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_fake_perms.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_fileid.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_full_audit.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_gpfs.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_media_harmony.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_netatalk.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_notify_fam.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_prealloc.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_preopen.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_readahead.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_readonly.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_recycle.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_scannedonly.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_shadow_copy.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_shadow_copy2.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_smb_traffic_analyzer.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_streams_depot.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_streams_xattr.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_time_audit.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_tsmsm.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfs_xattr_tdb.8.xml (100%) rename docs-xml/{manpages-3 => manpages}/vfstest.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/wbinfo.1.xml (100%) rename docs-xml/{manpages-3 => manpages}/winbind_krb5_locator.7.xml (100%) rename docs-xml/{manpages-3 => manpages}/winbindd.8.xml (100%) 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 "
" > $@ - $(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES3) >> $@ + $(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES) >> $@ @echo "
" >> $@ # 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 the Samba Team. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 similarity index 100% rename from docs-xml/manpages-3/eventlogadm.8.xml rename to docs-xml/manpages/eventlogadm.8.xml diff --git a/docs-xml/manpages-3/findsmb.1.xml b/docs-xml/manpages/findsmb.1.xml similarity index 100% rename from docs-xml/manpages-3/findsmb.1.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/idmap_ad.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/idmap_autorid.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/idmap_hash.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/idmap_ldap.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/idmap_nss.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/idmap_rid.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/idmap_tdb.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/idmap_tdb2.8.xml rename to docs-xml/manpages/idmap_tdb2.8.xml diff --git a/docs-xml/manpages-3/ldb.3.xml b/docs-xml/manpages/ldb.3.xml similarity index 100% rename from docs-xml/manpages-3/ldb.3.xml rename to docs-xml/manpages/ldb.3.xml diff --git a/docs-xml/manpages-3/ldbadd.1.xml b/docs-xml/manpages/ldbadd.1.xml similarity index 100% rename from docs-xml/manpages-3/ldbadd.1.xml rename to docs-xml/manpages/ldbadd.1.xml diff --git a/docs-xml/manpages-3/ldbdel.1.xml b/docs-xml/manpages/ldbdel.1.xml similarity index 100% rename from docs-xml/manpages-3/ldbdel.1.xml rename to docs-xml/manpages/ldbdel.1.xml diff --git a/docs-xml/manpages-3/ldbedit.1.xml b/docs-xml/manpages/ldbedit.1.xml similarity index 100% rename from docs-xml/manpages-3/ldbedit.1.xml rename to docs-xml/manpages/ldbedit.1.xml diff --git a/docs-xml/manpages-3/ldbmodify.1.xml b/docs-xml/manpages/ldbmodify.1.xml similarity index 100% rename from docs-xml/manpages-3/ldbmodify.1.xml rename to docs-xml/manpages/ldbmodify.1.xml diff --git a/docs-xml/manpages-3/ldbrename.1.xml b/docs-xml/manpages/ldbrename.1.xml similarity index 100% rename from docs-xml/manpages-3/ldbrename.1.xml rename to docs-xml/manpages/ldbrename.1.xml diff --git a/docs-xml/manpages-3/ldbsearch.1.xml b/docs-xml/manpages/ldbsearch.1.xml similarity index 100% rename from docs-xml/manpages-3/ldbsearch.1.xml rename to docs-xml/manpages/ldbsearch.1.xml diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages/libsmbclient.7.xml similarity index 100% rename from docs-xml/manpages-3/libsmbclient.7.xml rename to docs-xml/manpages/libsmbclient.7.xml diff --git a/docs-xml/manpages-3/lmhosts.5.xml b/docs-xml/manpages/lmhosts.5.xml similarity index 100% rename from docs-xml/manpages-3/lmhosts.5.xml rename to docs-xml/manpages/lmhosts.5.xml diff --git a/docs-xml/manpages-3/log2pcap.1.xml b/docs-xml/manpages/log2pcap.1.xml similarity index 100% rename from docs-xml/manpages-3/log2pcap.1.xml rename to docs-xml/manpages/log2pcap.1.xml diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages/net.8.xml similarity index 100% rename from docs-xml/manpages-3/net.8.xml rename to docs-xml/manpages/net.8.xml diff --git a/docs-xml/manpages-3/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml similarity index 100% rename from docs-xml/manpages-3/nmbd.8.xml rename to docs-xml/manpages/nmbd.8.xml diff --git a/docs-xml/manpages-3/nmblookup.1.xml b/docs-xml/manpages/nmblookup.1.xml similarity index 100% rename from docs-xml/manpages-3/nmblookup.1.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/ntlm_auth.1.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/pam_winbind.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/pam_winbind.conf.5.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/pdbedit.8.xml rename to docs-xml/manpages/pdbedit.8.xml diff --git a/docs-xml/manpages-3/profiles.1.xml b/docs-xml/manpages/profiles.1.xml similarity index 100% rename from docs-xml/manpages-3/profiles.1.xml rename to docs-xml/manpages/profiles.1.xml diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml similarity index 100% rename from docs-xml/manpages-3/rpcclient.1.xml rename to docs-xml/manpages/rpcclient.1.xml diff --git a/docs-xml/manpages-3/samba.7.xml b/docs-xml/manpages/samba.7.xml similarity index 100% rename from docs-xml/manpages-3/samba.7.xml rename to docs-xml/manpages/samba.7.xml diff --git a/docs-xml/manpages-3/sharesec.1.xml b/docs-xml/manpages/sharesec.1.xml similarity index 100% rename from docs-xml/manpages-3/sharesec.1.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/smb.conf.5.xml rename to docs-xml/manpages/smb.conf.5.xml diff --git a/docs-xml/manpages-3/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml similarity index 100% rename from docs-xml/manpages-3/smbcacls.1.xml rename to docs-xml/manpages/smbcacls.1.xml diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml similarity index 100% rename from docs-xml/manpages-3/smbclient.1.xml rename to docs-xml/manpages/smbclient.1.xml diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages/smbcontrol.1.xml similarity index 100% rename from docs-xml/manpages-3/smbcontrol.1.xml rename to docs-xml/manpages/smbcontrol.1.xml diff --git a/docs-xml/manpages-3/smbcquotas.1.xml b/docs-xml/manpages/smbcquotas.1.xml similarity index 100% rename from docs-xml/manpages-3/smbcquotas.1.xml rename to docs-xml/manpages/smbcquotas.1.xml diff --git a/docs-xml/manpages-3/smbd.8.xml b/docs-xml/manpages/smbd.8.xml similarity index 100% rename from docs-xml/manpages-3/smbd.8.xml rename to docs-xml/manpages/smbd.8.xml diff --git a/docs-xml/manpages-3/smbget.1.xml b/docs-xml/manpages/smbget.1.xml similarity index 100% rename from docs-xml/manpages-3/smbget.1.xml rename to docs-xml/manpages/smbget.1.xml diff --git a/docs-xml/manpages-3/smbgetrc.5.xml b/docs-xml/manpages/smbgetrc.5.xml similarity index 100% rename from docs-xml/manpages-3/smbgetrc.5.xml rename to docs-xml/manpages/smbgetrc.5.xml diff --git a/docs-xml/manpages-3/smbpasswd.5.xml b/docs-xml/manpages/smbpasswd.5.xml similarity index 100% rename from docs-xml/manpages-3/smbpasswd.5.xml rename to docs-xml/manpages/smbpasswd.5.xml diff --git a/docs-xml/manpages-3/smbpasswd.8.xml b/docs-xml/manpages/smbpasswd.8.xml similarity index 100% rename from docs-xml/manpages-3/smbpasswd.8.xml rename to docs-xml/manpages/smbpasswd.8.xml diff --git a/docs-xml/manpages-3/smbspool.8.xml b/docs-xml/manpages/smbspool.8.xml similarity index 100% rename from docs-xml/manpages-3/smbspool.8.xml rename to docs-xml/manpages/smbspool.8.xml diff --git a/docs-xml/manpages-3/smbstatus.1.xml b/docs-xml/manpages/smbstatus.1.xml similarity index 100% rename from docs-xml/manpages-3/smbstatus.1.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/smbta-util.8.xml rename to docs-xml/manpages/smbta-util.8.xml diff --git a/docs-xml/manpages-3/smbtar.1.xml b/docs-xml/manpages/smbtar.1.xml similarity index 100% rename from docs-xml/manpages-3/smbtar.1.xml rename to docs-xml/manpages/smbtar.1.xml diff --git a/docs-xml/manpages-3/smbtree.1.xml b/docs-xml/manpages/smbtree.1.xml similarity index 100% rename from docs-xml/manpages-3/smbtree.1.xml rename to docs-xml/manpages/smbtree.1.xml diff --git a/docs-xml/manpages-3/swat.8.xml b/docs-xml/manpages/swat.8.xml similarity index 100% rename from docs-xml/manpages-3/swat.8.xml rename to docs-xml/manpages/swat.8.xml diff --git a/docs-xml/manpages-3/tdbbackup.8.xml b/docs-xml/manpages/tdbbackup.8.xml similarity index 100% rename from docs-xml/manpages-3/tdbbackup.8.xml rename to docs-xml/manpages/tdbbackup.8.xml diff --git a/docs-xml/manpages-3/tdbdump.8.xml b/docs-xml/manpages/tdbdump.8.xml similarity index 100% rename from docs-xml/manpages-3/tdbdump.8.xml rename to docs-xml/manpages/tdbdump.8.xml diff --git a/docs-xml/manpages-3/tdbtool.8.xml b/docs-xml/manpages/tdbtool.8.xml similarity index 100% rename from docs-xml/manpages-3/tdbtool.8.xml rename to docs-xml/manpages/tdbtool.8.xml diff --git a/docs-xml/manpages-3/testparm.1.xml b/docs-xml/manpages/testparm.1.xml similarity index 100% rename from docs-xml/manpages-3/testparm.1.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_acl_tdb.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_acl_xattr.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_aio_fork.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_aio_linux.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_aio_pthread.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_audit.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_cacheprime.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_cap.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_catia.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_commit.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_crossrename.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_default_quota.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_dirsort.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_extd_audit.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_fake_perms.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_fileid.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_full_audit.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_gpfs.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_media_harmony.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_netatalk.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_notify_fam.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_prealloc.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_preopen.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_readahead.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_readonly.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_recycle.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_scannedonly.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_shadow_copy.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_shadow_copy2.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_streams_depot.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_streams_xattr.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_time_audit.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_tsmsm.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfs_xattr_tdb.8.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/vfstest.1.xml rename to docs-xml/manpages/vfstest.1.xml diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml similarity index 100% rename from docs-xml/manpages-3/wbinfo.1.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/winbind_krb5_locator.7.xml rename to 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 similarity index 100% rename from docs-xml/manpages-3/winbindd.8.xml rename to 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) { -- 2.34.1