diff options
| -rw-r--r-- | docs/Makefile | 20 | ||||
| -rw-r--r-- | docs/Makefile.settings.in | 1 | ||||
| -rw-r--r-- | docs/configure.in | 4 | ||||
| -rw-r--r-- | docs/xslt/latex.xsl | 1 | ||||
| -rw-r--r-- | docs/xslt/upgrade.pl | 12 |
5 files changed, 6 insertions, 32 deletions
diff --git a/docs/Makefile b/docs/Makefile index b320920d5a..ee719ed0c3 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -9,7 +9,6 @@ include Makefile.settings # Docs to build MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml)) MANPAGES3 = $(wildcard $(MANPAGEDIR3)/*.?.xml) -MANPAGES4 = $(wildcard $(MANPAGEDIR4)/*.?.xml) # Lists of files to process LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf @@ -32,10 +31,10 @@ 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,dvi,ps,manpages{3,4},txt,pearson,fo,htmlhelp - Build specific output format" + @echo " pdf,tex,dvi,ps,manpages3,txt,pearson,fo,htmlhelp - Build specific output format" @echo " html - Build multi-file HTML versions" @echo " html-single - Build single-file HTML versions" - @echo " htmlman3,htmlman4 - Build HTML version of manpages" + @echo " htmlman3 - Build HTML version of manpages" @echo " undocumented - Output list of undocumented smb.conf options" @echo " samples - Extract examples" @@ -47,7 +46,7 @@ $(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard S # Pseudo targets all: $(TARGETS) -everything: manpages3 manpages4 pdf html-single html htmlman3 htmlman4 txt ps fo htmlhelp pearson +everything: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson release: manpages3 htmlman3 html pdf # Output format targets @@ -62,12 +61,10 @@ 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)) -manpages4: $(patsubst $(MANPAGEDIR4)/%.xml,$(OUTPUTDIR)/manpages-4/%,$(MANPAGES4)) 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 -htmlman4: $(patsubst $(MANPAGEDIR4)/%.xml,$(HTMLDIR)/manpages-4/%.html,$(MANPAGES4)) $(HTMLDIR)/manpages-4/index.html html-single: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)) html: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html htmlhelp: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS)) @@ -83,23 +80,12 @@ $(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl mkdir -p $(@D) $(XSLTPROC) --xinclude --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $< -$(DOCBOOKDIR)/manpages-4/%.xml: $(MANPAGEDIR4)/%.xml xslt/expand-sambadoc.xsl - mkdir -p $(@D) - $(XSLTPROC) --xinclude --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $< - $(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl mkdir -p $(@D) echo "<article><variablelist>" > $@ $(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES3) >> $@ echo "</variablelist></article>" >> $@ -$(DOCBOOKDIR)/manpages-4/index.xml: $(MANPAGES4) xslt/manpage-summary.xsl - mkdir -p $(@D) - echo "<article><variablelist>" > $@ - $(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES4) >> $@ - echo "</variablelist></article>" >> $@ - - # HTML docs $(HTMLDIR)/index.html: htmldocs.html diff --git a/docs/Makefile.settings.in b/docs/Makefile.settings.in index 6c66f5e056..c2b9d8aec6 100644 --- a/docs/Makefile.settings.in +++ b/docs/Makefile.settings.in @@ -30,7 +30,6 @@ TEXINFODIR = $(OUTPUTDIR)/texi SRCDIR = @SAMBASOURCEDIR@ EPSTOPDF = @EPSTOPDF@ MANPAGEDIR3 = manpages-3 -MANPAGEDIR4 = manpages-4 MAKEINDEX = @MAKEINDEX@ EXAMPLESDIR = $(OUTPUTDIR)/examples SMBDOTCONFDOC = smbdotconf diff --git a/docs/configure.in b/docs/configure.in index b958b4f28d..0014ce9583 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -87,8 +87,8 @@ DOCS_DEFINE_TARGET(PDF, LATEX, [PDF versions], [pdf]) DOCS_DEFINE_TARGET(PS, LATEX, [PostScript versions], [ps]) DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html]) DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp]) -DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman3 htmlman4]) -DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages3 manpages4]) +DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman3]) +DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages3]) DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson]) DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker]) DOCS_DEFINE_TARGET(VALIDATE, ALL, [validating docbook output], []) diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl index b7159b15fe..ac9d2fe423 100644 --- a/docs/xslt/latex.xsl +++ b/docs/xslt/latex.xsl @@ -2,6 +2,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'> <xsl:import href="../settings.xsl"/> <xsl:import href="http://db2latex.sourceforge.net/xsl/docbook.xsl"/> +<xsl:import href="strip-references.xsl"/> <xsl:param name="latex.mapping.xml" select="document('latex.overrides.xml')"/> diff --git a/docs/xslt/upgrade.pl b/docs/xslt/upgrade.pl deleted file mode 100644 index bcd9d2f6ec..0000000000 --- a/docs/xslt/upgrade.pl +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/perl -# Update documents to the Samba DTD V1.0 - -undef $/; - -while(<>) { - s/<smbconfoption><name>(.*?)<\/name><value>(.*?)<\/value><\/smbconfoption>/<smbconfoption name=\"\1\">\2<\/smbconfoption>/g; - s/<smbconfoption><name>(.*?)<\/name><\/smbconfoption>/<smbconfoption name=\"\1\"\/>/g; - s/<smbconfsection>(.*?)<\/smbconfsection>/<smbconfsection name=\"\1\"\/>/g; - s/xmlns:samba=\"http:\/\/samba.org\/common\"/xmlns:samba=\"http:\/\/www.samba.org\/samba\/DTD\/samba-doc\"/g; - print $_; -} |