summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-05-20 20:33:00 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:45:51 -0500
commit0e4d73b9e00c7ba12379dcbc4738ff85501ccdfd (patch)
treeff8bbfe17364d3c56a2ee459852db2b703766139 /docs
parentef9b7ebe9f88d856df76c6da112b23495319f564 (diff)
downloadsamba-0e4d73b9e00c7ba12379dcbc4738ff85501ccdfd.tar.gz
samba-0e4d73b9e00c7ba12379dcbc4738ff85501ccdfd.tar.bz2
samba-0e4d73b9e00c7ba12379dcbc4738ff85501ccdfd.zip
- Support validating against the DocBook DTD
- Fix typo in printcapcachetime (This used to be commit 1f6ec86c55b36143b7e232a3853a09e546ecddda)
Diffstat (limited to 'docs')
-rw-r--r--docs/Makefile.in10
-rw-r--r--docs/configure.in2
-rw-r--r--docs/smbdotconf/printing/printcapcachetime.xml2
3 files changed, 12 insertions, 2 deletions
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 6d5568e5b7..d3993e44ae 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -14,6 +14,7 @@
# Programs
WGET = @WGET@
XSLTPROC = @XSLTPROC@
+XMLLINT = @XMLLINT@
DVIPS = @DVIPS@
PNGTOPNM = @PNGTOPNM@
EPSTOPNM = @EPSTOPNM@
@@ -48,6 +49,7 @@ SMBDOTCONFDOC = $(TOPDIR)/smbdotconf
PSDIR = $(OUTPUTDIR)
PDFDIR = $(OUTPUTDIR)
DVIDIR = $(OUTPUTDIR)
+VALIDATEDIR = $(OUTPUTDIR)/validate
TXTDIR = $(OUTPUTDIR)/textdocs
HTMLDIR=$(OUTPUTDIR)/htmldocs
PLUCKERDIR=$(OUTPUTDIR)/plucker
@@ -267,6 +269,14 @@ $(MANDIR):
$(MANDIR)/%: %.xml
$(XSLTPROC) --output $@ xslt/man.xsl $<
+$(VALIDATEDIR):
+ mkdir $@
+
+$(VALIDATEDIR)/%.report.html: %.xml
+ $(XMLLINT) --valid --noout --htmlout $< 2> $@
+
+verify: $(VALIDATEDIR) $(VALIDATEDIR)/Samba-HOWTO-Collection.report.html $(VALIDATEDIR)/Samba-Developers-Guide.report.html $(VALIDATEDIR)/Samba-Guide.report.html
+
# Find undocumented parameters
undocumented: $(SMBDOTCONFDOC)/parameters.all.xml
diff --git a/docs/configure.in b/docs/configure.in
index c47ca5d3ee..2008d92a57 100644
--- a/docs/configure.in
+++ b/docs/configure.in
@@ -47,6 +47,7 @@ DOCS_TARGET_REQUIRE_PROGRAM(DVIPS, dvips, PS)
DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER)
DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT)
DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
+DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VERIFY)
DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR ..], [source/configure.in], SAMBASOURCEDIR, UNDOCUMENTED)
AC_MSG_RESULT([])
@@ -60,6 +61,7 @@ DOCS_DEFINE_TARGET(PS, LATEX, [PostScript versions], [ps])
DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html])
DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages])
DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
+DOCS_DEFINE_TARGET(VERIFY, ALL, [verifying docbook output], [verify])
DOCS_DEFINE_TARGET(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented])
DOCS_DEFINE_TARGET(TXT, HTML, [text versions], [txt])
diff --git a/docs/smbdotconf/printing/printcapcachetime.xml b/docs/smbdotconf/printing/printcapcachetime.xml
index 1059d575a2..c81e1ca72c 100644
--- a/docs/smbdotconf/printing/printcapcachetime.xml
+++ b/docs/smbdotconf/printing/printcapcachetime.xml
@@ -19,5 +19,3 @@
<value type="default">0</value>
<value type="example">600</value>
</samba:parameter>
-
-+