diff options
author | Gerald Combs <gerald@zing.org> | 2015-08-09 08:57:29 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-08-09 16:16:24 +0000 |
commit | 394773ccaef1a932b84438997eaff7476ac65215 (patch) | |
tree | d86bd0dfc6ed38fe1c62196444bdef8ab4198727 | |
parent | a8af51d613a8cd63ff30650400d7cd084c9ab38c (diff) |
Switch the guides back to html output.
DocBook's xhtml5 stylesheet output didn't render correctly in Firefox.
This reverts commit dc09d18e8ecdc55de2361d8ff6d2b0bf36345a70.
This reverts commit 62e56ad92a50c7dd58e83447207b8be0cc0bbb76.
This reverts commit 53a80334bcb3ca40a5aaef504e2aca0f04bcc9f3.
Change-Id: Iafcf18cfce25772146fc2e155728401fd105a44b
Reviewed-on: https://code.wireshark.org/review/9944
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 6 | ||||
-rw-r--r-- | docbook/Makefile.common | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index e7565eb9bc..16d8b1cdb4 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -79,11 +79,11 @@ MACRO(XML2HTML _target_dep _dir_pfx _mode _dbk_source _gfx_sources) IF(${_mode} STREQUAL "chunked") SET(_basedir ${_dir_pfx}_html_chunked) - SET(_STYLESHEET "http://docbook.sourceforge.net/release/xsl/current/xhtml5/chunk.xsl") - SET(_modeparams --stringparam html.ext .html --noout) + SET(_STYLESHEET "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl") + SET(_modeparams --noout) ELSE() # single-page SET(_basedir ${_dir_pfx}_html) - SET(_STYLESHEET "http://docbook.sourceforge.net/release/xsl/current/xhtml5/docbook.xsl") + SET(_STYLESHEET "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl") SET(_modeparams --output ${_basedir}/index.html) ENDIF() diff --git a/docbook/Makefile.common b/docbook/Makefile.common index 44e95c7702..a2edd2e393 100644 --- a/docbook/Makefile.common +++ b/docbook/Makefile.common @@ -297,11 +297,10 @@ WSDG_XSLTPROC_ARGS = \ --stringparam admon.graphics.path wsdg_graphics/ SINGLE_XSLTPROC_ARGS = \ - --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml5/docbook.xsl + --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl CHUNKED_XSLTPROC_ARGS = \ - --stringparam html.ext .html \ - --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml5/chunk.xsl + --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl HTMLHELP_XSLTPROC_ARGS = \ --nonet custom_layer_chm.xsl |