Changeset 86658 in vbox for trunk/doc/manual

Timestamp:

Oct 20, 2020 5:47:05 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. We no longer need User.xhtml. Reverting related changes

Location:

trunk/doc/manual

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (6 diffs)
• docbook-html-one-page-formatcfg.xsl (modified) (1 diff)

trunk/doc/manual/Config.kmk

@@ -272 +272 @@
                 '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/html/docbook.xsl"                              uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/html/docbook.xsl"/>' \
                 '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/html/chunk.xsl"                                uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/html/chunk.xsl"/>' \
-                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/xhtml/docbook.xsl"                              uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/xhtml/docbook.xsl"/>' \
                 '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/htmlhelp/htmlhelp.xsl"                         uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/htmlhelp/htmlhelp.xsl"/>' \
                 '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/manpages/docbook.xsl"                          uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/manpages/docbook.xsl"/>' \

trunk/doc/manual/Makefile.kmk

@@ -260 +260 @@
         $(notdir $(VBOX_MANUAL_TEX_UNICODE_FILES)) \
         $(addprefix HTMLHelp/,$(VBOX_MANUAL_PNG_FILES_$(lang))) \
-        html-single/UserManual.xhtml \
+        html-single/UserManual.html \
         html-single/UserManual.qhp \
         html-single/UserManual.qhcp \
@@ -785 +785 @@
 ##########################################################################################
 #
-#  UserManual.xhtml
+#  UserManual.html
 #
 ##########################################################################################
@@ -793 +793 @@
         $(VBOX_PATH_MANUAL_SRC)/common-html-formatcfg.xsl
 
-$(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.xhtml: \
+$(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html: \
                 $(addprefix $(VBOX_PATH_MANUAL_SRC)/en_US/,$(VBOX_MANUAL_XML_FILES)) \
                 $(VBOX_MANUAL_XML_FILES_COMMON) \
@@ -804 +804 @@
         $(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(firstword $(filter %.xml,$^)),$@)
         $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) \
-                --output $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.xhtml \
+                --output $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html \
                 $(VBOX_PATH_MANUAL_SRC)/docbook-html-one-page-formatcfg.xsl \
                 $<
@@ -830 +830 @@
 
 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip: \
-                $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.xhtml \
+                $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html \
                 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html \
         $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_PNG_FILES_en_US))
@@ -838 +838 @@
                 -9 -r $@ html-single html-chunks $(VBOX_MANUAL_PNG_FILES_en_US)
 
-html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.xhtml
+html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html
 html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html
 qhelp:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.qhc

trunk/doc/manual/docbook-html-one-page-formatcfg.xsl

@@ -3 +3 @@
 
 <!-- Single html file template -->
-<xsl:import href="xhtml/docbook.xsl"/>
+<xsl:import href="html/docbook.xsl"/>
 
 <xsl:import href="common-formatcfg.xsl"/>