The branch, master has been updated
via 75484f4 docs: Rename manpages-3 -> manpages.
via 9c44e2e s4-docs: Remove empty s4 HOWTO Collection.
from 18c0d87 build: skip shipping the alpha13 provision in the release
tarballs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 75484f491140fb86eaee90dde1dc1c9d4ebe8a41
Author: Karolin Seeger <ksee...@samba.org>
Date: Mon Sep 3 21:49:25 2012 +0200
docs: Rename manpages-3 -> manpages.
This change was suggested by Andrew Bartlett on the samba-technical mailing
list.
Karolin
Autobuild-User(master): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(master): Mon Sep 3 23:35:38 CEST 2012 on sn-devel-104
commit 9c44e2e5392926773c9966e8bda924d1e6c9b591
Author: Karolin Seeger <ksee...@samba.org>
Date: Mon Sep 3 21:05:22 2012 +0200
s4-docs: Remove empty s4 HOWTO Collection.
This change was proposed by Andrew Bartlett on the samba-technical mailing
list.
Karolin
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 25 ++--
docs-xml/Makefile.settings.in | 2 +-
docs-xml/Samba3-HOWTO/manpages.xml | 120 ++++++------
docs-xml/Samba4-HOWTO/ad-dc.xml | 4 -
docs-xml/Samba4-HOWTO/ad-member.xml | 4 -
docs-xml/Samba4-HOWTO/auth.xml | 4 -
docs-xml/Samba4-HOWTO/cifsfs.xml | 4 -
docs-xml/Samba4-HOWTO/compiling.xml | 24 ---
docs-xml/Samba4-HOWTO/config.xml | 5 -
docs-xml/Samba4-HOWTO/domain-bdc.xml | 4 -
docs-xml/Samba4-HOWTO/domain-member.xml | 3 -
docs-xml/Samba4-HOWTO/domain-pdc.xml | 4 -
docs-xml/Samba4-HOWTO/gui-clients.xml | 4 -
docs-xml/Samba4-HOWTO/index.xml | 137 -------------
docs-xml/Samba4-HOWTO/ldb.xml | 4 -
docs-xml/Samba4-HOWTO/printing.xml | 11 -
docs-xml/Samba4-HOWTO/protocol.xml | 204 --------------------
docs-xml/Samba4-HOWTO/registry.xml | 4 -
docs-xml/Samba4-HOWTO/samba.xml | 48 -----
docs-xml/Samba4-HOWTO/security=share.xml | 8 -
docs-xml/Samba4-HOWTO/security=user.xml | 6 -
docs-xml/Samba4-HOWTO/shares.xml | 3 -
docs-xml/Samba4-HOWTO/smbclient.xml | 4 -
docs-xml/configure.ac | 2 +-
.../{manpages-3 => manpages}/eventlogadm.8.xml | 0
docs-xml/{manpages-3 => manpages}/findsmb.1.xml | 0
docs-xml/{manpages-3 => manpages}/idmap_ad.8.xml | 0
.../{manpages-3 => manpages}/idmap_autorid.8.xml | 0
docs-xml/{manpages-3 => manpages}/idmap_hash.8.xml | 0
docs-xml/{manpages-3 => manpages}/idmap_ldap.8.xml | 0
docs-xml/{manpages-3 => manpages}/idmap_nss.8.xml | 0
docs-xml/{manpages-3 => manpages}/idmap_rid.8.xml | 0
docs-xml/{manpages-3 => manpages}/idmap_tdb.8.xml | 0
docs-xml/{manpages-3 => manpages}/idmap_tdb2.8.xml | 0
docs-xml/{manpages-3 => manpages}/ldb.3.xml | 0
docs-xml/{manpages-3 => manpages}/ldbadd.1.xml | 0
docs-xml/{manpages-3 => manpages}/ldbdel.1.xml | 0
docs-xml/{manpages-3 => manpages}/ldbedit.1.xml | 0
docs-xml/{manpages-3 => manpages}/ldbmodify.1.xml | 0
docs-xml/{manpages-3 => manpages}/ldbrename.1.xml | 0
docs-xml/{manpages-3 => manpages}/ldbsearch.1.xml | 0
.../{manpages-3 => manpages}/libsmbclient.7.xml | 0
docs-xml/{manpages-3 => manpages}/lmhosts.5.xml | 0
docs-xml/{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
docs-xml/{manpages-3 => manpages}/nmblookup.1.xml | 0
docs-xml/{manpages-3 => manpages}/ntlm_auth.1.xml | 0
.../{manpages-3 => manpages}/pam_winbind.8.xml | 0
.../pam_winbind.conf.5.xml | 0
docs-xml/{manpages-3 => manpages}/pdbedit.8.xml | 0
docs-xml/{manpages-3 => manpages}/profiles.1.xml | 0
docs-xml/{manpages-3 => manpages}/rpcclient.1.xml | 0
docs-xml/{manpages-3 => manpages}/samba.7.xml | 0
docs-xml/{manpages-3 => manpages}/sharesec.1.xml | 0
docs-xml/{manpages-3 => manpages}/smb.conf.5.xml | 0
docs-xml/{manpages-3 => manpages}/smbcacls.1.xml | 0
docs-xml/{manpages-3 => manpages}/smbclient.1.xml | 0
docs-xml/{manpages-3 => manpages}/smbcontrol.1.xml | 0
docs-xml/{manpages-3 => manpages}/smbcquotas.1.xml | 0
docs-xml/{manpages-3 => manpages}/smbd.8.xml | 0
docs-xml/{manpages-3 => manpages}/smbget.1.xml | 0
docs-xml/{manpages-3 => manpages}/smbgetrc.5.xml | 0
docs-xml/{manpages-3 => manpages}/smbpasswd.5.xml | 0
docs-xml/{manpages-3 => manpages}/smbpasswd.8.xml | 0
docs-xml/{manpages-3 => manpages}/smbspool.8.xml | 0
docs-xml/{manpages-3 => manpages}/smbstatus.1.xml | 0
docs-xml/{manpages-3 => manpages}/smbta-util.8.xml | 0
docs-xml/{manpages-3 => manpages}/smbtar.1.xml | 0
docs-xml/{manpages-3 => manpages}/smbtree.1.xml | 0
docs-xml/{manpages-3 => manpages}/swat.8.xml | 0
docs-xml/{manpages-3 => manpages}/tdbbackup.8.xml | 0
docs-xml/{manpages-3 => manpages}/tdbdump.8.xml | 0
docs-xml/{manpages-3 => manpages}/tdbtool.8.xml | 0
docs-xml/{manpages-3 => manpages}/testparm.1.xml | 0
.../{manpages-3 => manpages}/vfs_acl_tdb.8.xml | 0
.../{manpages-3 => manpages}/vfs_acl_xattr.8.xml | 0
.../{manpages-3 => manpages}/vfs_aio_fork.8.xml | 0
.../{manpages-3 => manpages}/vfs_aio_linux.8.xml | 0
.../{manpages-3 => manpages}/vfs_aio_pthread.8.xml | 0
docs-xml/{manpages-3 => manpages}/vfs_audit.8.xml | 0
.../{manpages-3 => manpages}/vfs_cacheprime.8.xml | 0
docs-xml/{manpages-3 => manpages}/vfs_cap.8.xml | 0
docs-xml/{manpages-3 => manpages}/vfs_catia.8.xml | 0
docs-xml/{manpages-3 => manpages}/vfs_commit.8.xml | 0
.../{manpages-3 => manpages}/vfs_crossrename.8.xml | 0
.../vfs_default_quota.8.xml | 0
.../{manpages-3 => manpages}/vfs_dirsort.8.xml | 0
.../{manpages-3 => manpages}/vfs_extd_audit.8.xml | 0
.../{manpages-3 => manpages}/vfs_fake_perms.8.xml | 0
docs-xml/{manpages-3 => manpages}/vfs_fileid.8.xml | 0
.../{manpages-3 => manpages}/vfs_full_audit.8.xml | 0
docs-xml/{manpages-3 => manpages}/vfs_gpfs.8.xml | 0
.../vfs_media_harmony.8.xml | 0
.../{manpages-3 => manpages}/vfs_netatalk.8.xml | 0
.../{manpages-3 => manpages}/vfs_notify_fam.8.xml | 0
.../{manpages-3 => manpages}/vfs_prealloc.8.xml | 0
.../{manpages-3 => manpages}/vfs_preopen.8.xml | 0
.../{manpages-3 => manpages}/vfs_readahead.8.xml | 0
.../{manpages-3 => manpages}/vfs_readonly.8.xml | 0
.../{manpages-3 => manpages}/vfs_recycle.8.xml | 0
.../{manpages-3 => manpages}/vfs_scannedonly.8.xml | 0
.../{manpages-3 => manpages}/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
.../{manpages-3 => manpages}/vfs_time_audit.8.xml | 0
docs-xml/{manpages-3 => manpages}/vfs_tsmsm.8.xml | 0
.../{manpages-3 => manpages}/vfs_xattr_tdb.8.xml | 0
docs-xml/{manpages-3 => manpages}/vfstest.1.xml | 0
docs-xml/{manpages-3 => manpages}/wbinfo.1.xml | 0
.../winbind_krb5_locator.7.xml | 0
docs-xml/{manpages-3 => manpages}/winbindd.8.xml | 0
docs-xml/scripts/find_missing_manpages.pl | 2 +-
115 files changed, 75 insertions(+), 565 deletions(-)
delete mode 100644 docs-xml/Samba4-HOWTO/ad-dc.xml
delete mode 100644 docs-xml/Samba4-HOWTO/ad-member.xml
delete mode 100644 docs-xml/Samba4-HOWTO/auth.xml
delete mode 100644 docs-xml/Samba4-HOWTO/cifsfs.xml
delete mode 100644 docs-xml/Samba4-HOWTO/compiling.xml
delete mode 100644 docs-xml/Samba4-HOWTO/config.xml
delete mode 100644 docs-xml/Samba4-HOWTO/domain-bdc.xml
delete mode 100644 docs-xml/Samba4-HOWTO/domain-member.xml
delete mode 100644 docs-xml/Samba4-HOWTO/domain-pdc.xml
delete mode 100644 docs-xml/Samba4-HOWTO/gui-clients.xml
delete mode 100644 docs-xml/Samba4-HOWTO/history.xml
delete mode 100644 docs-xml/Samba4-HOWTO/index.xml
delete mode 100644 docs-xml/Samba4-HOWTO/ldb.xml
delete mode 100644 docs-xml/Samba4-HOWTO/printing.xml
delete mode 100644 docs-xml/Samba4-HOWTO/protocol.xml
delete mode 100644 docs-xml/Samba4-HOWTO/registry.xml
delete mode 100644 docs-xml/Samba4-HOWTO/samba.xml
delete mode 100644 docs-xml/Samba4-HOWTO/security=share.xml
delete mode 100644 docs-xml/Samba4-HOWTO/security=user.xml
delete mode 100644 docs-xml/Samba4-HOWTO/shares.xml
delete mode 100644 docs-xml/Samba4-HOWTO/smbclient.xml
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%)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 8cf05f7..25725ef 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,14 +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
-$(PDFDIR)/Samba4-HOWTO.pdf $(PSDIR)/Samba4-HOWTO.ps Samba4-HOWTO.tex
$(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard
Samba4-HOWTO/*.xml)) Samba4-HOWTO-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)
@@ -72,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))
@@ -94,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
@@ -212,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 86c7373..e5d58a4 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 944f842..577ac8b 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/Samba4-HOWTO/ad-dc.xml b/docs-xml/Samba4-HOWTO/ad-dc.xml
deleted file mode 100644
index cdfc358..0000000
--- a/docs-xml/Samba4-HOWTO/ad-dc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<chapter id="ad-dc">
- <title>Active Directory - Domain Controller</title>
-
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/ad-member.xml
b/docs-xml/Samba4-HOWTO/ad-member.xml
deleted file mode 100644
index b46d99b..0000000
--- a/docs-xml/Samba4-HOWTO/ad-member.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<chapter id="ad-member">
- <title>Active Directory - Member</title>
-
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/auth.xml b/docs-xml/Samba4-HOWTO/auth.xml
deleted file mode 100644
index 58b25f4..0000000
--- a/docs-xml/Samba4-HOWTO/auth.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<chapter id="authentication">
- <title>Authentication</title>
-
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/cifsfs.xml b/docs-xml/Samba4-HOWTO/cifsfs.xml
deleted file mode 100644
index 190c384..0000000
--- a/docs-xml/Samba4-HOWTO/cifsfs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<chapter id="cifsfs">
- <title>CIFSFS</title>
-
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/compiling.xml
b/docs-xml/Samba4-HOWTO/compiling.xml
deleted file mode 100644
index 048a0f4..0000000
--- a/docs-xml/Samba4-HOWTO/compiling.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<chapter id="compiling">
- <title>Compiling</title>
-
- <sect1>
- <title>Downloading the source - Tar Ball</title>
-
- </sect1>
-
- <sect1>
- <title>Downloading the source - Subversion</title>
-
- </sect1>
-
- <sect1>
- <title>Compiling the source</title>
-
- </sect1>
-
- <sect1>
- <title>Installing</title>
-
- </sect1>
-
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/config.xml b/docs-xml/Samba4-HOWTO/config.xml
deleted file mode 100644
index e251c69..0000000
--- a/docs-xml/Samba4-HOWTO/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<chapter id="config">
- <title>Configuration</title>
-
- <para>Chapter describing Samba's configuration in detail.</para>
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/domain-bdc.xml
b/docs-xml/Samba4-HOWTO/domain-bdc.xml
deleted file mode 100644
index 61c420f..0000000
--- a/docs-xml/Samba4-HOWTO/domain-bdc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<chapter id="bdc">
- <title>Backup Domain Controller</title>
-
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/domain-member.xml
b/docs-xml/Samba4-HOWTO/domain-member.xml
deleted file mode 100644
index 864e000..0000000
--- a/docs-xml/Samba4-HOWTO/domain-member.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<chapter id="domain-member">
- <title>Domain Member</title>
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/domain-pdc.xml
b/docs-xml/Samba4-HOWTO/domain-pdc.xml
deleted file mode 100644
index 7ad5637..0000000
--- a/docs-xml/Samba4-HOWTO/domain-pdc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<chapter id="domain-pdc">
- <title>Domain DC</title>
-
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/gui-clients.xml
b/docs-xml/Samba4-HOWTO/gui-clients.xml
deleted file mode 100644
index 8c158d9..0000000
--- a/docs-xml/Samba4-HOWTO/gui-clients.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<chapter id="gui-clients">
- <title>GUI Clients</title>
-
-</chapter>
diff --git a/docs-xml/Samba4-HOWTO/history.xml
b/docs-xml/Samba4-HOWTO/history.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/docs-xml/Samba4-HOWTO/index.xml b/docs-xml/Samba4-HOWTO/index.xml
deleted file mode 100644
index 6562a7e..0000000
--- a/docs-xml/Samba4-HOWTO/index.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?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";>
-
-<book id="Samba-HOWTO"
- xmlns:xi="http://www.w3.org/2003/XInclude";>
-<title>The Official Samba-4 HOWTO</title>
-
-<bookinfo>
- <authorgroup>
- <editor>&person.jelmer;</editor>
- </authorgroup>
- <pubdate><?latex \today ?></pubdate>
-
-</bookinfo>
-
-<?latex \setcounter{page}{5} ?>
-
-<preface>
- <title>Attribution</title>
- <para>
- <xi:include href="../Samba4-HOWTO-attributions.xml"/>
- </para>
-</preface>
-
-<?latex \cleardoublepage ?>
-
-<!-- Contents -->
-<toc/>
-<?latex \cleardoublepage ?>
-
-<part>
- <title>Introduction to SMB networks</title>
-
- <para>Not everybody is already familiar with SMB networks and the
jargon
- used in such networks. This part describes the evolution of
SMB,
- how the protocol is structured and what Samba can be used for.
</para>
-
- <para>NT admins, already familiar with SMB networks, are probably only
- interested in the chapter about Samba itself.</para>
-
- <xi:include href="protocol.xml"/>
- <xi:include href="samba.xml"/>
-
-</part>
-
-<part>
- <title>Samba 4 Basics</title>
-
- <para>FIXME</para>
-
- <xi:include href="config.xml"/>
- <xi:include href="ldb.xml"/>
-</part>
-
-<part>
- <title>Network model</title>
-
- <para>
- A SMB server is used in a certain network type
- (workgroup, domain, active directory) with a specific
- role (stand-alone, primary domain controller, backup domain
controller, etc) in that network. Samba has to be configured according to that
role.
- Each of the chapters in this part describes how to configure
Samba
- for a specific role.
- </para>
-
-</part>
-
-<part>
- <title>Network Model: Share-based security</title>
-
- <xi:include href="security=share.xml"/>
-</part>
-
-<part>
- <title>Network Model: User-based security</title>
- <xi:include href="security=user.xml"/>
-</part>
-
-<part id="domain">
- <title>Network Model: NT4-style domains</title>
-
- <xi:include href="domain-pdc.xml"/>
- <xi:include href="domain-bdc.xml"/>
- <xi:include href="domain-member.xml"/>
-</part>
-
-<part id="ad">
- <title>Network Model - Active Directory</title>
-
- <xi:include href="ad-dc.xml"/>
- <xi:include href="ad-member.xml"/>
-</part>
-
-<part>
- <title>Common services</title>
-
- <para>
- Independent of the role the server has, it can provide
services.
- Examples of services are printing, user management,
authentication, etc.
- </para>
-
- <xi:include href="shares.xml"/>
- <xi:include href="printing.xml"/>
- <xi:include href="auth.xml"/>
- <xi:include href="registry.xml"/>
-</part>
-
-<part>
- <title>Clients</title>
-
- <para>Samba includes a number of different clients for accessing
- SMB file, print and other services. Pretty much every service can
- be access using a command-line utility, though there are several
- GUI clients available as well.</para>
-
- <xi:include href="smbclient.xml"/>
- <xi:include href="cifsfs.xml"/>
- <xi:include href="gui-clients.xml"/>
-</part>
-
-<part>
- <title>Appendices</title>
-
- <xi:include href="compiling.xml"/>
-
-</part>
-
-<lot/>
-
-<?latex \include{gpl}?>
-
-<!--<xi:include href="../Samba-HOWTO-Collection/glossary.xml"/>-->
-
-<?latex \chaptermark{Subject index} ?>
-<index/>
-
-</book>
diff --git a/docs-xml/Samba4-HOWTO/ldb.xml b/docs-xml/Samba4-HOWTO/ldb.xml
deleted file mode 100644
index 340cc71..0000000
--- a/docs-xml/Samba4-HOWTO/ldb.xml
+++ /dev/null
@@ -1,4 +0,0 @@
--
Samba Shared Repository
