summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2007-06-06 13:43:17 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:33 -0500
commitea6023b254946fbeebfb707b6b79811c7e394385 (patch)
tree84b4969c38fcf08c74cf56cc4bd19be7b77854bd
parenta2108af1c4e06b7806a4962ee9d9b465ac8aec82 (diff)
downloadsamba-ea6023b254946fbeebfb707b6b79811c7e394385.tar.gz
samba-ea6023b254946fbeebfb707b6b79811c7e394385.tar.bz2
samba-ea6023b254946fbeebfb707b6b79811c7e394385.zip
Fix Samba documentation build for manpages
(This used to be commit 075e0065f39480a2046bf65ffedcdbf36889d4c5)
-rw-r--r--docs/Makefile25
-rw-r--r--docs/Samba3-Developers-Guide/index.xml2
-rw-r--r--docs/manpages-3/smb.conf.5.xml2
-rw-r--r--docs/templates/attributions.xml5
-rw-r--r--docs/xslt/man.xsl6
5 files changed, 26 insertions, 14 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 33c6425d1b..68fdaadfd1 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -53,6 +53,18 @@ $(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard S
all: $(TARGETS)
everything: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson
release: manpages3 htmlman3 html pdf
+clean:
+ @echo "Cleaning up..."
+ rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
+ rm -f $(patsubst %.dia,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
+ $(patsubst %.dia,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
+ $(patsubst %.dia,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia)))
+ rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
+ rm -f *-images-html*
+ rm -f *-images-latex-* latexfigures
+ rm -f xslt/figures/*pdf
+ rm -f $(SMBDOTCONFDOC)/parameters.*.xml
+ rm -f $(addsuffix .*,$(MAIN_DOCS))
# Output format targets
pdf: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
@@ -115,6 +127,7 @@ $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl
# Attributions
%-attributions.xml:
@echo "Generating attributions file $@ from $*/"
+ @cp -f templates/attributions.xml $@
$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl $*/index.xml
# Text files
@@ -302,18 +315,6 @@ xslt/pearson.xsl:
distclean clobber: clean
rm Makefile.settings config.status config.log configure
-clean:
- @echo "Cleaning up..."
- rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
- rm -f $(patsubst %.dia,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
- $(patsubst %.dia,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
- $(patsubst %.dia,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia)))
- rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
- rm -f *-images-html*
- rm -f *-images-latex-* latexfigures
- rm -f xslt/figures/*pdf
- rm -f $(SMBDOTCONFDOC)/parameters.*.xml
- rm -f $(addsuffix .*,$(MAIN_DOCS))
# Always keep intermediate files if we can
.SECONDARY:
diff --git a/docs/Samba3-Developers-Guide/index.xml b/docs/Samba3-Developers-Guide/index.xml
index 0e3eb10b3b..74a7048386 100644
--- a/docs/Samba3-Developers-Guide/index.xml
+++ b/docs/Samba3-Developers-Guide/index.xml
@@ -44,7 +44,7 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
</bookinfo>
-<xi:include href="../Samba-Developers-Guide-attributions.xml">
+<xi:include href="../Samba3-Developers-Guide-attributions.xml">
<xi:fallback/>
</xi:include>
diff --git a/docs/manpages-3/smb.conf.5.xml b/docs/manpages-3/smb.conf.5.xml
index 13743debf1..52780a04be 100644
--- a/docs/manpages-3/smb.conf.5.xml
+++ b/docs/manpages-3/smb.conf.5.xml
@@ -55,7 +55,7 @@
</para>
<para>
- Any line ending in a <quote>\</quote> is continued on the next line in the customary UNIX fashion.
+ Any line ending in a <quote>\\</quote> is continued on the next line in the customary UNIX fashion.
</para>
<para>
diff --git a/docs/templates/attributions.xml b/docs/templates/attributions.xml
new file mode 100644
index 0000000000..281a9e51ea
--- /dev/null
+++ b/docs/templates/attributions.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<preface>
+</preface>
+
diff --git a/docs/xslt/man.xsl b/docs/xslt/man.xsl
index 9387c04e43..38d99f9840 100644
--- a/docs/xslt/man.xsl
+++ b/docs/xslt/man.xsl
@@ -132,6 +132,12 @@
<xsl:text>\fR</xsl:text>
</xsl:template>
+<xsl:template match="//quote">
+ <xsl:text>\fB</xsl:text>
+ <xsl:apply-templates/>
+ <xsl:text>\fR</xsl:text>
+</xsl:template>
+
<xsl:template match="para|simpara|remark" mode="list">
<xsl:variable name="foo">
<xsl:apply-templates/>