summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/docbook/Makefile.in11
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml2
-rw-r--r--docs/docbook/samba.dsl7
3 files changed, 10 insertions, 10 deletions
diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index 26cdc9a1bc..b225eb9780 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -51,16 +51,18 @@ all:
@echo "ps - Build PostScript version of HOWTO Collection"
@echo "pdf - Build PDF version of HOWTO Collection"
@echo -n "html-single - Build single file HTML version of HOWTO Collection"
- @echo "and developers guide"
- @echo "html - Build HTML version of HOWTO Collection and manpages"
+ @echo " and developers guide"
+ @echo "html - Build HTML version of HOWTO Collection"
+ @echo "htmlman - Build html version of manpages"
@echo "txt - Build plain text version of HOWTO Collection"
manpages: $(MANPAGES)
pdf: ../Samba-HOWTO-Collection.pdf
ps: ../Samba-HOWTO-Collection.ps
txt: ../Samba-HOWTO-Collection.txt
-html: $(MANPAGES_HTML)
- $(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) $<
+htmlman: $(MANPAGES_HTML)
+html:
+ $(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) projdoc/samba-doc.sgml
html-single: ../Samba-HOWTO-Collection.html ../Samba-Developers-Guide.html
../Samba-HOWTO-Collection.txt: $(SGMLDIR)/samba-doc.sgml
@@ -85,6 +87,7 @@ html-single: ../Samba-HOWTO-Collection.html ../Samba-Developers-Guide.html
$(HTMLDIR)/%.html: $(MANSGMLDIR)/%.sgml
$(DOCBOOK2HTML) -o $(HTMLDIR) $<
+ mv $(HTMLDIR)/index.html $@
$(MANDIR)/%: $(MANSGMLDIR)/%.sgml
$(DOCBOOK2MAN) -o $(MANDIR) $<
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 251341dbb1..053c6c1c71 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -3467,7 +3467,7 @@
</para>
- <para>Default : <command>ldap filter = (&(uid=%u)(objectclass=sambaAccount))</command></para>
+ <para>Default : <command>ldap filter = (&amp;(uid=%u)(objectclass=sambaAccount))</command></para>
</listitem>
</varlistentry>
diff --git a/docs/docbook/samba.dsl b/docs/docbook/samba.dsl
index 75239c0f20..80197dfa77 100644
--- a/docs/docbook/samba.dsl
+++ b/docs/docbook/samba.dsl
@@ -44,13 +44,10 @@
(define %section-autolabel% #t)
(define (toc-depth nd) 3)
-(define %root-filename% "index") ;; name for the root html file
+(define %root-filename% "Samba-HOWTO") ;; 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)
+(define %use-id-as-filename% #t)
; === HTML settings ===
(define %html-pubid% "-//W3C//DTD HTML 4.01 Transitional//EN") ;; Nearly true :-(