Changeset 96835 in vbox for trunk/doc/manual

Timestamp:

Sep 22, 2022 8:47:59 PM (2 years ago)

Author:

vboxsync

Message:

doc/manual: Prepare for next doc drop integration by reducing the number of tweaks specific to the copy in the VirtualBox build system.

Location:

trunk/doc/manual

Files:

• Config.kmk (modified) (3 diffs)
• en_US/oracle-accessibility-en.xml (deleted)
• en_US/oracle-accessibility-ohc-en.xml (added)
• en_US/user_Preface.xml (modified) (2 diffs)

trunk/doc/manual/Config.kmk

@@ -120 +120 @@
         user_PrivacyPolicy.xml \
         user_Glossary.xml \
-        oracle-accessibility-en.xml \
+        oracle-accessibility-ohc-en.xml \
         oracle-diversity.xml \
         oracle-support-en.xml
@@ -319 +319 @@
                 '<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">' \
                 '<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">' \
-                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/common/oracle-accessibility-en.xml"            uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_SRC)/en_US/oracle-accessibility-en.xml"/>' \
-                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/common/oracle-diversity.xml"                                       uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_SRC)/en_US/oracle-diversity.xml"/>' \
-                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/common/oracle-support-en.xml"                  uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_SRC)/en_US/oracle-support-en.xml"/>' \
+                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/common/oracle-accessibility-ohc-en.xml"            uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_SRC)/en_US/oracle-accessibility-ohc-en.xml"/>' \
+                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/common/oracle-legal-notices/oracle-diversity.xml"                                  uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_SRC)/en_US/oracle-diversity.xml"/>' \
+                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/common/oracle-legal-notices/oracle-support-en.xml"                  uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_SRC)/en_US/oracle-support-en.xml"/>' \
                 '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/en_US/user_ChangeLogImpl.xml"                  uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_SRC)/user_ChangeLogImpl.xml"/>' \
                 '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/titlepage-htmlhelp.xsl"                        uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_OUTBASE)/titlepage-htmlhelp.xsl"/>' \
@@ -345 +345 @@
                 '<!ENTITY product-version "$(VBOX_VERSION_STRING)">' \
                 '<!ENTITY product-name "Oracle VM VirtualBox">' \
+                '<!ENTITY vbox-mgr "VirtualBox Manager">' \
                 '<!ENTITY oci "Oracle Cloud Infrastructure">' \
                 '' \

trunk/doc/manual/en_US/user_Preface.xml

@@ -27 +27 @@
   %all.entities;
 ]>
-<preface id="user-preface" role="frontmatter">
+<preface id="user-preface">
 
   <title>Preface</title>
@@ -104 +104 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/oracle-accessibility-en.xml" />
+    href="../common/oracle-accessibility-ohc-en.xml" />
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/oracle-support-en.xml" />
+    href="../common/oracle-legal-notices/oracle-support-en.xml" />
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/oracle-diversity.xml" />
+    href="../common/oracle-legal-notices/oracle-diversity.xml" />
 
 </preface>