diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-05-15 16:09:50 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:45:50 -0500 |
| commit | a1a6c5198a9f291ad2c774cdb0c8d9ced7c31cc7 (patch) | |
| tree | 31da354502b2ca564895fdc3768111e37409c3d7 /docs | |
| parent | e8bfde01af178db7ff721cc7a017b69a64607159 (diff) | |
| download | samba-a1a6c5198a9f291ad2c774cdb0c8d9ced7c31cc7.tar.gz samba-a1a6c5198a9f291ad2c774cdb0c8d9ced7c31cc7.tar.bz2 samba-a1a6c5198a9f291ad2c774cdb0c8d9ced7c31cc7.zip | |
Use html2text for generating text output instead of xmlto, which uses a combination of xsltproc and lynx
(This used to be commit dc303a8c08c60c81bf3b38708af115f660aa9e7d)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.in | 6 | ||||
| -rw-r--r-- | docs/configure.in | 4 | ||||
| -rw-r--r-- | docs/xslt/expand-sambadoc.xsl | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/docs/Makefile.in b/docs/Makefile.in index 94ae43ad05..e48be83ec7 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -19,7 +19,7 @@ PNGTOPNM = @PNGTOPNM@ EPSTOPNM = @EPSTOPNM@ PNMTOPNG = @PNMTOPNG@ PNMTOPS = @PNMTOPS@ -XMLTO = @XMLTO@ +HTML2TEXT = @HTML2TEXT@ PLUCKERBUILD = @PLUCKERBUILD@ PDFLATEX = TEXINPUTS=xslt/latex:.: @PDFLATEX@ LATEX = TEXINPUTS=xslt/latex:.: @LATEX@ @@ -161,8 +161,8 @@ clean: $(TXTDIR): mkdir $(TXTDIR) -$(TXTDIR)/%.txt: %.xml - $(XMLTO) txt -o $(TXTDIR) $< > $@ +$(TXTDIR)/%.txt: $(HTMLDIR)/%.html + $(HTML2TEXT) -nobs -style pretty -o $@ $< # Tex files %.tex: %.xml diff --git a/docs/configure.in b/docs/configure.in index 276a162761..380cb5aeea 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -40,7 +40,7 @@ DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS) DOCS_TARGET_REQUIRE_PROGRAM(LATEX, latex, PS) DOCS_TARGET_REQUIRE_PROGRAM(DVIPS, dvips, PS) DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER) -DOCS_TARGET_REQUIRE_PROGRAM(XMLTO, xmlto, TXT) +DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT) DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED) AC_MSG_RESULT([]) @@ -56,7 +56,7 @@ 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(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented]) -DOCS_DEFINE_TARGET(TXT, ALL, [text versions], [txt]) +DOCS_DEFINE_TARGET(TXT, HTML, [text versions], [txt]) if test x"$TARGETS" = x; then AC_MSG_ERROR([You won't be able to build any of the docs]) diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index 8bb765b7d9..8db39b56e8 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -87,7 +87,6 @@ <!-- This is needed to copy content unchanged --> <xsl:template match="@*|node()"> - <xsl:copy> <xsl:apply-templates select="@*|node()"/> </xsl:copy> |