Fix FAQ build

(This used to be commit 7c60a2a4394c9ce48c079c2c5233cd8002789e03)

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index eba98e6c667cd74f2c802f6d9f41b5c81d86f5ff..a43fa4cb7b0495c26aae1c83820f7a243533bc85 100644 (file)
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -66,7 +66,7 @@ manpages: $(MANDIR) $(MANPAGES)
 pdf: $(PDFDIR) $(PDFDIR)/Samba-HOWTO-Collection.pdf $(PDFDIR)/Samba-Developers-Guide.pdf
 htmlman: $(HTMLDIR) $(MANPAGES_HTML) CSS
 htmlfaq: $(HTMLDIR) CSS
-       @$(XSLTPROC) --output $(FAQDIR)/samba-faq.html xslt/html.xsl $(FAQPROJDOC)/sambafaq.xml
+       @$(XSLTPROC) --param base.dir "$(FAQDIR)" xslt/html-chunk.xsl $(FAQPROJDOC)/sambafaq.xml
 html-single: $(HTMLDIR) CSS $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html
 html: $(HTMLDIR) CSS
        @$(XSLTPROC) xslt/html-chunk.xsl $(PROJDOC)/samba-doc.xml

diff --git a/docs/docbook/devdoc/dev-doc.xml b/docs/docbook/devdoc/dev-doc.xml
index d9430311931e9f8c31675f427bc1fa5c7fb93e4e..26374f7f392e791d0cbf278f0e8c9be86079f3b5 100644 (file)
--- a/docs/docbook/devdoc/dev-doc.xml
+++ b/docs/docbook/devdoc/dev-doc.xml
@@ -56,6 +56,9 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 
 </dedication>
 
+<!-- Contents -->
+<toc/>
+
 <!-- Chapters -->
 &NetBIOS;
 &Architecture;

diff --git a/docs/docbook/faq/sambafaq.xml b/docs/docbook/faq/sambafaq.xml
index ddcadc0e8dcd1e8c09a03410e56d2313de343782..d5dc3ae40f222f5df973ce406ba1668e06e4f311 100644 (file)
--- a/docs/docbook/faq/sambafaq.xml
+++ b/docs/docbook/faq/sambafaq.xml
@@ -30,6 +30,8 @@ and the old samba text documents which were mostly written by John Terpstra.
 </para>
 </dedication>
 
+<toc/>
+
 &general;
 &install;
 &config;