Split up documents at chapter level, not at sect1 level

(This used to be commit f1710a46d0b51fbefc2a1b5230b76aa9ecbbcdab)

3 files changed, 90 insertions, 6 deletions

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index f1fb97d1e2..26cdc9a1bc 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -59,7 +59,8 @@ manpages: $(MANPAGES)
 pdf: ../Samba-HOWTO-Collection.pdf
 ps: ../Samba-HOWTO-Collection.ps
 txt: ../Samba-HOWTO-Collection.txt
-html: $(HTMLDIR)/samba-doc.html $(MANPAGES_HTML)
+html: $(MANPAGES_HTML)
+	$(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) $<
 html-single: ../Samba-HOWTO-Collection.html  ../Samba-Developers-Guide.html
 
 ../Samba-HOWTO-Collection.txt: $(SGMLDIR)/samba-doc.sgml
@@ -81,8 +82,6 @@ html-single: ../Samba-HOWTO-Collection.html  ../Samba-Developers-Guide.html
 	$(DOCBOOK2HTML) -u -o .. $<
 	mv ../dev-doc.html $@
 
-$(HTMLDIR)/samba-doc.html: $(SGMLDIR)/samba-doc.sgml
-	$(DOCBOOK2HTML) -o $(HTMLDIR) $<
 
 $(HTMLDIR)/%.html: $(MANSGMLDIR)/%.sgml
 	$(DOCBOOK2HTML) -o $(HTMLDIR) $<
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index a50389b7f0..75c5c379d3 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -18,9 +18,9 @@
 <!ENTITY SECURITY-LEVEL SYSTEM "security_level.sgml">
 <!ENTITY SPEED SYSTEM "Speed.sgml">
 <!ENTITY BROWSING SYSTEM "Browsing.sgml">
-<!ENTITY GROUP-MAPPING-HOWTO "GROUP-MAPPING-HOWTO.sgml">
-<!ENTITY Portability "Portability.sgml">
-<!ENTITY Other-Clients "Other-Clients.sgml">
+<!ENTITY GROUP-MAPPING-HOWTO SYSTEM "GROUP-MAPPING-HOWTO.sgml">
+<!ENTITY Portability SYSTEM "Portability.sgml">
+<!ENTITY Other-Clients SYSTEM "Other-Clients.sgml">
 ]>
 
 <book id="Samba-Project-Documentation">
diff --git a/docs/docbook/samba.dsl b/docs/docbook/samba.dsl
new file mode 100644
index 0000000000..75239c0f20
--- /dev/null
+++ b/docs/docbook/samba.dsl
@@ -0,0 +1,85 @@
+<!-- This file defines the DocBook-utils Style Sheet for DocBook
+     Eric Bischoff <eric@caldera.de>
+-->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+  <!ENTITY % html "IGNORE">
+  <![%html; [
+	<!ENTITY % print "IGNORE">
+	<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA dsssl>
+  ]]>
+  <!ENTITY % print "INCLUDE">
+  <![%print; [
+	<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA dsssl>
+  ]]>
+]>
+
+<STYLE-SHEET>
+
+  <STYLE-SPECIFICATION ID="UTILS" USE="DOCBOOK">
+    <STYLE-SPECIFICATION-BODY>
+;; ===================================================================
+;; Generic Parameters
+;; (Generic currently means: both print and html)
+(define (chunk-element-list)
+  (list (normalize "preface")
+	(normalize "chapter")
+	(normalize "appendix") 
+	(normalize "article")
+	(normalize "glossary")
+	(normalize "bibliography")
+	(normalize "index")
+	(normalize "colophon")
+	(normalize "setindex")
+	(normalize "reference")
+	(normalize "refentry")
+	(normalize "part")
+;	(normalize "sect1") 
+	(normalize "section") 
+	(normalize "book") ;; just in case nothing else matches...
+	(normalize "set")  ;; sets are definitely chunks...
+	))
+
+(define %chapter-autolabel% #t)
+(define %section-autolabel% #t)
+(define (toc-depth nd) 3)
+
+(define %root-filename% "index")	;; name for the root html file
+(define %html-ext% ".html")		;; default extension for html output files
+(define %html-prefix% "")               ;; prefix for all filenames generated (except root)
+(define %use-id-as-filename% #t)        ;; if #t uses ID value, if present, as filename
+                                        ;;   otherwise a code is used to indicate level
+                                        ;;   of chunk, and general element number
+                                        ;;   (nth element in the document)
+
+; === HTML settings ===
+(define %html-pubid% "-//W3C//DTD HTML 4.01 Transitional//EN") ;; Nearly true :-(
+(define %html40% #t)
+
+; === Media objects ===
+(define preferred-mediaobject-extensions  ;; this magic allows to use different graphical
+  (list "png" "jpg" "jpeg"))		;;   formats for printing and putting online
+(define acceptable-mediaobject-extensions
+  (list "bmp" "gif" "eps" "epsf" "avi" "mpg" "mpeg" "qt"))
+(define preferred-mediaobject-notations
+  (list "PNG" "JPG" "JPEG"))
+(define acceptable-mediaobject-notations
+  (list "EPS" "BMP" "GIF" "linespecific"))                                                                                                    
+; === Rendering ===
+(define %admon-graphics% #t)		;; use symbols for Caution|Important|Note|Tip|Warning
+
+; === Books only ===
+(define %generate-book-titlepage% #t)
+(define %generate-book-toc% #t)
+(define ($generate-chapter-toc$) #f)	;; never generate a chapter TOC in books
+
+; === Articles only ===
+(define %generate-article-titlepage% #t)
+(define %generate-article-toc% #t)      ;; make TOC
+
+    </STYLE-SPECIFICATION-BODY>
+  </STYLE-SPECIFICATION>
+
+  <EXTERNAL-SPECIFICATION ID="DOCBOOK" DOCUMENT="docbook.dsl">
+
+</STYLE-SHEET>