Docs: bugref:10302. Merging the following changes from the docs. team:

 - Add ditaval markup to images,
 - Add alt elements for images, for OHC accessibility requirements,
 - Add desc elements for tables, for OHC accessibility requirements.



git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@99182 cfe28804-0f27-0410-a406-dd0f0b0b656f

42 files changed, 332 insertions, 61 deletions

diff --git a/doc/manual/en_US/dita/topics/Introduction.dita b/doc/manual/en_US/dita/topics/Introduction.dita
index 35a6b86c071..f9274f89507 100644
--- a/doc/manual/en_US/dita/topics/Introduction.dita
+++ b/doc/manual/en_US/dita/topics/Introduction.dita
@@ -33,7 +33,14 @@
   </p>
     <fig id="fig-win2016-intro">
       <title>Windows Server 2016 Virtual Machine, Displayed on a macOS Host</title>
-      <image href="images/vm-vista-running.png" width="12cm" placement="break"/>
+      <xref href="images/vm-vista-running.png" format="png" platform="htmlhelp">
+        <image href="images/vm-vista-running.png" width="14cm" placement="break">
+          <alt>Windows Server 2016 Virtual Machine, Displayed on a macOS Host</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/vm-vista-running.png" width="14cm" placement="break">
+        <alt>Windows Server 2016 Virtual Machine, Displayed on a macOS Host</alt>
+      </image>
     </fig>
     <p>
     In this User Manual, we will begin simply with a quick introduction
diff --git a/doc/manual/en_US/dita/topics/clone.dita b/doc/manual/en_US/dita/topics/clone.dita
index 86ef6e1bbd0..3a89dc0ff44 100644
--- a/doc/manual/en_US/dita/topics/clone.dita
+++ b/doc/manual/en_US/dita/topics/clone.dita
@@ -46,7 +46,14 @@
     </p>
     <fig id="fig-clone-wizard-name-path">
       <title>Clone Virtual Machine Wizard: New Machine Name and Path</title>
-      <image href="images/clone-vm-1.png" width="10cm" placement="break"/>
+      <xref href="images/clone-vm-1.png" format="png" platform="htmlhelp">
+        <image href="images/clone-vm-1.png" width="10cm" placement="break">
+          <alt>Clone Virtual Machine Wizard: New Machine Name and Path</alt>
+        </image>
+      </xref>
+        <image href="images/clone-vm-1.png" width="10cm" placement="break" platform="ohc">
+          <alt>Clone Virtual Machine Wizard: New Machine Name and Path</alt>
+        </image>
     </fig>
     <p>
       The following clone options are available:
@@ -94,9 +101,16 @@
       Click <b outputclass="bold">Next</b>. The
       <b outputclass="bold">Clone Type</b> page is displayed.
     </p>
-    <fig id="fig-clone-wizard-clone-type">
+    <fig id="fig-clone-type">
       <title>Clone Virtual Machine Wizard: Clone Type</title>
-      <image href="images/clone-vm-2.png" width="10cm" placement="break"/>
+      <xref href="images/clone-vm-2.png" format="png" platform="htmlhelp">
+        <image href="images/clone-vm-2.png" width="10cm" placement="break">
+          <alt>Clone Virtual Machine Wizard: Clone Type</alt>
+        </image>
+      </xref>
+      <image href="images/clone-vm-2.png" width="10cm" placement="break" platform="ohc">
+        <alt>Clone Virtual Machine Wizard: Clone Type</alt>
+      </image>
     </fig>
     <p>
       The <b outputclass="bold">Clone Type</b> option specifies
@@ -131,7 +145,14 @@
     </note>
     <fig id="fig-clone-wizard-snapshots">
       <title>Clone Virtual Machine Wizard: Snapshots</title>
-      <image href="images/clone-vm-3.png" width="10cm" placement="break"/>
+      <xref href="images/clone-vm-3.png" format="png" platform="htmlhelp">
+        <image href="images/clone-vm-3.png" width="10cm" placement="break">
+          <alt>Clone Virtual Machine Wizard: Snapshots</alt>
+        </image>
+      </xref>
+      <image href="images/clone-vm-3.png" width="10cm" placement="break" platform="ohc">
+        <alt>Clone Virtual Machine Wizard: Snapshots</alt>
+      </image>
     </fig>
     <p>
       You use this page to select which parts of the snapshot tree to
diff --git a/doc/manual/en_US/dita/topics/cloud-export-oci.dita b/doc/manual/en_US/dita/topics/cloud-export-oci.dita
index e904014df0b..f7ec049e1c2 100644
--- a/doc/manual/en_US/dita/topics/cloud-export-oci.dita
+++ b/doc/manual/en_US/dita/topics/cloud-export-oci.dita
@@ -44,7 +44,14 @@
           </p>
         <fig id="fig-export-appliance-oci">
           <title>Export Virtual Appliance Wizard: Format Settings</title>
-          <image href="images/export-appliance-oci.png" width="12cm" placement="break"/>
+          <xref href="images/export-appliance-oci.png" format="png" platform="htmlhelp">
+            <image href="images/export-appliance-oci.png" width="12cm" placement="break">
+              <alt>Export Virtual Appliance Wizard: Format Settings</alt>
+            </image>
+          </xref>
+          <image href="images/export-appliance-oci.png" width="12cm" placement="break" platform="ohc">
+            <alt>Export Virtual Appliance Wizard: Format Settings</alt>
+          </image>
         </fig>
         <p>
             In the <b outputclass="bold">Machine Creation</b>
diff --git a/doc/manual/en_US/dita/topics/cloud-import-oci.dita b/doc/manual/en_US/dita/topics/cloud-import-oci.dita
index 6b124d0acdb..5bccc96966b 100644
--- a/doc/manual/en_US/dita/topics/cloud-import-oci.dita
+++ b/doc/manual/en_US/dita/topics/cloud-import-oci.dita
@@ -43,7 +43,14 @@
           </p>
         <fig id="fig-import-instance-oci">
           <title>Import Cloud Instance Wizard: Appliance Settings</title>
-          <image href="images/import-instance.png" width="12cm" placement="break"/>
+          <xref href="images/import-instance.png" format="png" platform="htmlhelp">
+            <image href="images/import-instance.png" width="12cm" placement="break">
+              <alt>Import Cloud Instance Wizard: Appliance Settings</alt>
+            </image>
+          </xref>
+          <image href="images/import-instance.png" width="12cm" placement="break" platform="ohc">
+            <alt>Import Cloud Instance Wizard: Appliance Settings</alt>
+          </image>
         </fig>
         <p>
             Click <b outputclass="bold">Finish</b> to import the
diff --git a/doc/manual/en_US/dita/topics/cloud-upload-public-key.dita b/doc/manual/en_US/dita/topics/cloud-upload-public-key.dita
index 6e4a207e573..94e5a382ab6 100644
--- a/doc/manual/en_US/dita/topics/cloud-upload-public-key.dita
+++ b/doc/manual/en_US/dita/topics/cloud-upload-public-key.dita
@@ -45,7 +45,14 @@
           </p>
         <fig id="fig-upload-key-oci">
           <title>Upload Public Key Dialog in Oracle Cloud Infrastructure Console</title>
-          <image href="images/upload-key.png" width="12cm" placement="break"/>
+          <xref href="images/upload-key.png" format="png" platform="htmlhelp">
+            <image href="images/upload-key.png" width="12cm" placement="break">
+              <alt>Upload Public Key Dialog in Oracle Cloud Infrastructure Console</alt>
+            </image>
+          </xref>
+          <image href="images/upload-key.png" width="12cm" placement="break" platform="ohc">
+            <alt>Upload Public Key Dialog in Oracle Cloud Infrastructure Console</alt>
+          </image>
         </fig>
         <p>
             Select one of the following options:
diff --git a/doc/manual/en_US/dita/topics/cloud-using-cloud-profile-manager.dita b/doc/manual/en_US/dita/topics/cloud-using-cloud-profile-manager.dita
index 270678ebafd..e9850e9368b 100644
--- a/doc/manual/en_US/dita/topics/cloud-using-cloud-profile-manager.dita
+++ b/doc/manual/en_US/dita/topics/cloud-using-cloud-profile-manager.dita
@@ -16,7 +16,14 @@
       </p>
     <fig id="fig-cloud-profile-manager">
       <title>The Cloud Profile Manager</title>
-      <image href="images/cloud-profile-manager.png" width="12cm" placement="break"/>
+      <xref href="images/cloud-profile-manager.png" format="png" platform="htmlhelp">
+        <image href="images/cloud-profile-manager.png" width="12cm" placement="break">
+          <alt>The Cloud Profile Manager</alt>
+        </image>
+      </xref>
+      <image href="images/cloud-profile-manager.png" width="12cm" placement="break" platform="ohc">
+        <alt>The Cloud Profile Manager</alt>
+      </image>
     </fig>
     <p>
         You can use the Cloud Profile Manager in the following ways:
diff --git a/doc/manual/en_US/dita/topics/cloud-vm-add.dita b/doc/manual/en_US/dita/topics/cloud-vm-add.dita
index 9e079056e78..40353a1e5ff 100644
--- a/doc/manual/en_US/dita/topics/cloud-vm-add.dita
+++ b/doc/manual/en_US/dita/topics/cloud-vm-add.dita
@@ -34,7 +34,14 @@
             </p>
         <fig id="fig-cloudvm-add">
           <title>Add Cloud Virtual Machine Wizard</title>
-          <image href="images/cloudvm-add.png" width="12cm" placement="break"/>
+          <xref href="images/cloudvm-add.png" format="png" platform="htmlhelp">
+            <image href="images/cloudvm-add.png" width="12cm" placement="break">
+              <alt>Add Cloud Virtual Machine Wizard</alt>
+            </image>
+          </xref>
+          <image href="images/cloudvm-add.png" width="12cm" placement="break" platform="ohc">
+            <alt>Add Cloud Virtual Machine Wizard</alt>
+          </image>
         </fig>
       </li>
       <li>
diff --git a/doc/manual/en_US/dita/topics/cloud-vm-new.dita b/doc/manual/en_US/dita/topics/cloud-vm-new.dita
index 1237612a406..4c26104b069 100644
--- a/doc/manual/en_US/dita/topics/cloud-vm-new.dita
+++ b/doc/manual/en_US/dita/topics/cloud-vm-new.dita
@@ -33,7 +33,14 @@
             </p>
         <fig id="fig-cloudvm-new">
           <title>Create Cloud Virtual Machine Wizard</title>
-          <image href="images/cloudvm-new.png" width="12cm" placement="break"/>
+          <xref href="images/cloudvm-new.png" format="png" platform="htmlhelp">
+            <image href="images/cloudvm-new.png" width="12cm" placement="break">
+              <alt>Create Cloud Virtual Machine Wizard</alt>
+            </image>
+          </xref>
+          <image href="images/cloudvm-new.png" width="12cm" placement="break" platform="ohc">
+            <alt>Create Cloud Virtual Machine Wizard</alt>
+          </image>
         </fig>
       </li>
       <li>
diff --git a/doc/manual/en_US/dita/topics/cloud-vm-oci-group.dita b/doc/manual/en_US/dita/topics/cloud-vm-oci-group.dita
index 31e15f367bd..a514d4d3ec0 100644
--- a/doc/manual/en_US/dita/topics/cloud-vm-oci-group.dita
+++ b/doc/manual/en_US/dita/topics/cloud-vm-oci-group.dita
@@ -18,7 +18,14 @@
         </p>
     <fig id="fig-cloud-vm-oci-group">
       <title>OCI Group, Containing Cloud VMs</title>
-      <image href="images/cloudvm-oci-group.png" width="10cm" placement="break"/>
+      <xref href="images/cloudvm-oci-group.png" format="png" platform="htmlhelp">
+        <image href="images/cloudvm-oci-group.png" width="10cm" placement="break">
+          <alt>OCI Group, Containing Cloud VMs</alt>
+        </image>
+      </xref>
+      <image href="images/cloudvm-oci-group.png" width="10cm" placement="break" platform="ohc">
+        <alt>OCI Group, Containing Cloud VMs</alt>
+      </image>
     </fig>
     <p>
           All cloud profiles registered with Oracle VM VirtualBox are listed
diff --git a/doc/manual/en_US/dita/topics/cloud-vm.dita b/doc/manual/en_US/dita/topics/cloud-vm.dita
index 0ddfe55eed1..f1e802291aa 100644
--- a/doc/manual/en_US/dita/topics/cloud-vm.dita
+++ b/doc/manual/en_US/dita/topics/cloud-vm.dita
@@ -23,7 +23,14 @@
     </note>
     <fig id="fig-cloud-vm-overview">
       <title>Cloud VMs, Shown in VirtualBox Manager</title>
-      <image href="images/cloudvm-overview.png" width="12cm" placement="break"/>
+      <xref href="images/cloudvm-overview.png" format="png" platform="htmlhelp">
+        <image href="images/cloudvm-overview.png" width="12cm" placement="break">
+          <alt>Cloud VMs, Shown in VirtualBox Manager</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/cloudvm-overview.png" width="12cm" placement="break">
+        <alt>Cloud VMs, Shown in VirtualBox Manager</alt>
+      </image>
     </fig>
     <p>
         Cloud VMs can be used to do the following tasks in Oracle Cloud Infrastructure:
diff --git a/doc/manual/en_US/dita/topics/create-virtual-hard-disk-image.dita b/doc/manual/en_US/dita/topics/create-virtual-hard-disk-image.dita
index c484d5c3521..3dd5c26ad85 100644
--- a/doc/manual/en_US/dita/topics/create-virtual-hard-disk-image.dita
+++ b/doc/manual/en_US/dita/topics/create-virtual-hard-disk-image.dita
@@ -21,7 +21,14 @@
           </p>
         <fig id="fig-virtual-hard-disk-wizard">
           <title>Create Virtual Hard Disk Wizard</title>
-          <image href="images/virtual-hard-disk-wizard.png" width="12cm" placement="break"/>
+          <xref href="images/virtual-hard-disk-wizard.png" format="png" platform="htmlhelp">
+            <image href="images/virtual-hard-disk-wizard.png" width="12cm" placement="break">
+              <alt>Create Virtual Hard Disk Wizard</alt>
+            </image>
+          </xref>
+          <image platform="ohc" href="images/virtual-hard-disk-wizard.png" width="12cm" placement="break">
+            <alt>Create Virtual Hard Disk Wizard</alt>
+          </image>
         </fig>
       </li>
       <li>
diff --git a/doc/manual/en_US/dita/topics/create-vm-wizard-hardware.dita b/doc/manual/en_US/dita/topics/create-vm-wizard-hardware.dita
index 522c95fc596..b09d3218ae3 100644
--- a/doc/manual/en_US/dita/topics/create-vm-wizard-hardware.dita
+++ b/doc/manual/en_US/dita/topics/create-vm-wizard-hardware.dita
@@ -10,7 +10,14 @@
       </p>
     <fig id="fig-create-vm-hardware">
       <title>Creating a Virtual Machine: Hardware</title>
-      <image href="images/create-vm-3.png" width="10cm" placement="break"/>
+      <xref href="images/create-vm-3.png" format="png" platform="htmlhelp">
+        <image href="images/create-vm-3.png" width="10cm" placement="break">
+          <alt>Creating a Virtual Machine: Hardware</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/create-vm-3.png" width="10cm" placement="break">
+        <alt>Creating a Virtual Machine: Hardware</alt>
+      </image>
     </fig>
     <p>
         The following fields are available on this wizard page:
diff --git a/doc/manual/en_US/dita/topics/create-vm-wizard-name-os.dita b/doc/manual/en_US/dita/topics/create-vm-wizard-name-os.dita
index a453714e617..52f87a20f42 100644
--- a/doc/manual/en_US/dita/topics/create-vm-wizard-name-os.dita
+++ b/doc/manual/en_US/dita/topics/create-vm-wizard-name-os.dita
@@ -6,7 +6,14 @@
   <body>
     <fig id="fig-create-vm-name">
       <title>Creating a Virtual Machine: Name and Operating System</title>
-      <image href="images/create-vm-1.png" width="10cm" placement="break"/>
+      <xref href="images/create-vm-1.png" format="png" platform="htmlhelp">
+        <image href="images/create-vm-1.png" width="10cm" placement="break">
+          <alt>Creating a Virtual Machine: Name and Operating System</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/create-vm-1.png" width="10cm" placement="break">
+        <alt>Creating a Virtual Machine: Name and Operating System</alt>
+      </image>
     </fig>
     <p>
         Use this page to specify a name and operating system (OS) for
diff --git a/doc/manual/en_US/dita/topics/create-vm-wizard-unattended-install.dita b/doc/manual/en_US/dita/topics/create-vm-wizard-unattended-install.dita
index f58bd3bf49d..135abf0d4ff 100644
--- a/doc/manual/en_US/dita/topics/create-vm-wizard-unattended-install.dita
+++ b/doc/manual/en_US/dita/topics/create-vm-wizard-unattended-install.dita
@@ -24,7 +24,14 @@
       </p>
     <fig id="fig-create-vm-unattended-install">
       <title>Creating a Virtual Machine: Unattended Guest OS Installation</title>
-      <image href="images/create-vm-2.png" width="10cm" placement="break"/>
+      <xref href="images/create-vm-2.png" format="png" platform="htmlhelp">
+        <image href="images/create-vm-2.png" width="10cm" placement="break">
+          <alt>Creating a Virtual Machine: Unattended Guest OS Installation</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/create-vm-2.png" width="10cm" placement="break">
+        <alt>Creating a Virtual Machine: Unattended Guest OS Installation</alt>
+      </image>
     </fig>
     <p>
         The following fields are available on this wizard page:
diff --git a/doc/manual/en_US/dita/topics/create-vm-wizard-virtual-hard-disk.dita b/doc/manual/en_US/dita/topics/create-vm-wizard-virtual-hard-disk.dita
index c1025163ea8..d1dca38544a 100644
--- a/doc/manual/en_US/dita/topics/create-vm-wizard-virtual-hard-disk.dita
+++ b/doc/manual/en_US/dita/topics/create-vm-wizard-virtual-hard-disk.dita
@@ -19,7 +19,14 @@
       </p>
     <fig id="fig-create-vm-hard-disk">
       <title>Creating a New Virtual Machine: Virtual Hard Disk</title>
-      <image href="images/create-vm-4.png" width="10cm" placement="break"/>
+      <xref href="images/create-vm-4.png" format="png" platform="htmlhelp">
+        <image href="images/create-vm-4.png" width="10cm" placement="break">
+          <alt>Creating a New Virtual Machine: Virtual Hard Disk</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/create-vm-4.png" width="10cm" placement="break">
+        <alt>Creating a New Virtual Machine: Virtual Hard Disk</alt>
+      </image>
     </fig>
     <p>
         The following fields are available on this wizard page:
diff --git a/doc/manual/en_US/dita/topics/diffimages.dita b/doc/manual/en_US/dita/topics/diffimages.dita
index d35256a8f73..be12acc4c09 100644
--- a/doc/manual/en_US/dita/topics/diffimages.dita
+++ b/doc/manual/en_US/dita/topics/diffimages.dita
@@ -54,7 +54,14 @@
     </p>
     <fig id="fig-diff-images">
       <title>Differencing Images, Shown in Virtual Media Manager</title>
-      <image href="images/virtual-disk-manager-2.png" width="12cm" placement="break"/>
+      <xref href="images/virtual-disk-manager-2.png" format="png" platform="htmlhelp">
+        <image href="images/virtual-disk-manager-2.png" width="12cm" placement="break">
+          <alt>Differencing Images, Shown in Virtual Media Manager</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/virtual-disk-manager-2.png" width="12cm" placement="break">
+        <alt>Differencing Images, Shown in Virtual Media Manager</alt>
+      </image>
     </fig>
     <p>
       In all of these situations, from the point of view of the virtual
diff --git a/doc/manual/en_US/dita/topics/guestadd-dnd.dita b/doc/manual/en_US/dita/topics/guestadd-dnd.dita
index d830907db8b..19cbb329e4d 100644
--- a/doc/manual/en_US/dita/topics/guestadd-dnd.dita
+++ b/doc/manual/en_US/dita/topics/guestadd-dnd.dita
@@ -57,7 +57,14 @@
     </p>
     <fig id="fig-drag-drop-options">
       <title>Drag and Drop Menu Options</title>
-      <image href="images/dnd-modes.png" width="10cm" placement="break"/>
+      <xref href="images/dnd-modes.png" format="png" platform="htmlhelp">
+        <image href="images/dnd-modes.png" width="10cm" placement="break">
+          <alt>Drag and Drop Menu Options</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/dnd-modes.png" width="10cm" placement="break">
+        <alt>Drag and Drop Menu Options</alt>
+      </image>
     </fig>
     <p>
       The following drag and drop modes are available:
diff --git a/doc/manual/en_US/dita/topics/guestadd-gc-file-manager.dita b/doc/manual/en_US/dita/topics/guestadd-gc-file-manager.dita
index 55ff0d5314b..115f862efab 100644
--- a/doc/manual/en_US/dita/topics/guestadd-gc-file-manager.dita
+++ b/doc/manual/en_US/dita/topics/guestadd-gc-file-manager.dita
@@ -22,7 +22,14 @@
     </note>
     <fig id="fig-guest-control-fm">
       <title>Guest Control File Manager</title>
-      <image href="images/guest-fm.png" width="12cm" placement="break"/>
+      <xref href="images/guest-fm.png" format="png" platform="htmlhelp">
+        <image href="images/guest-fm.png" width="12cm" placement="break">
+          <alt>Guest Control File Manager</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/guest-fm.png" width="12cm" placement="break">
+        <alt>Guest Control File Manager</alt>
+      </image>
     </fig>
     <p>
       The Guest Control File Manager works by mounting the host file
diff --git a/doc/manual/en_US/dita/topics/guestossupport.dita b/doc/manual/en_US/dita/topics/guestossupport.dita
index 964faa72204..5983a86449c 100644
--- a/doc/manual/en_US/dita/topics/guestossupport.dita
+++ b/doc/manual/en_US/dita/topics/guestossupport.dita
@@ -31,6 +31,7 @@
     </ul>
     <table id="table-premier-support">
       <title>Guest Operating Systems With Full Support</title>
+      <desc>Guest Operating Systems With Full Support</desc>
       <tgroup cols="2">
         <thead>
           <row>
@@ -234,6 +235,7 @@
     </table>
     <table id="table-limited-support">
       <title>Legacy Guest Operating Systems With Limited Support</title>
+      <desc>Legacy Guest Operating Systems With Limited Support</desc>
       <tgroup cols="2">
         <thead>
           <row>
diff --git a/doc/manual/en_US/dita/topics/gui-details.dita b/doc/manual/en_US/dita/topics/gui-details.dita
index 7cc8157548d..285cb42265e 100644
--- a/doc/manual/en_US/dita/topics/gui-details.dita
+++ b/doc/manual/en_US/dita/topics/gui-details.dita
@@ -11,7 +11,14 @@
       </p>
     <fig id="fig-vbox-details-pane">
       <title>VirtualBox Manager Details Pane, Including Toolbar</title>
-      <image href="images/details-pane.png" width="12cm" placement="break"/>
+      <xref href="images/details-pane.png" format="png" platform="htmlhelp">
+        <image href="images/details-pane.png" width="12cm" placement="break">
+          <alt>VirtualBox Manager Details Pane, Including Toolbar</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/details-pane.png" width="12cm" placement="break">
+        <alt>VirtualBox Manager Details Pane, Including Toolbar</alt>
+      </image>
     </fig>
     <p>
         The Details pane includes the following:
diff --git a/doc/manual/en_US/dita/topics/gui-tools-global.dita b/doc/manual/en_US/dita/topics/gui-tools-global.dita
index c3e09825b2e..0f3d93225f6 100644
--- a/doc/manual/en_US/dita/topics/gui-tools-global.dita
+++ b/doc/manual/en_US/dita/topics/gui-tools-global.dita
@@ -13,7 +13,14 @@
         </p>
     <fig id="fig-global-tools-menu">
       <title>Global Tools Menu</title>
-      <image href="images/global-tools-menu.png" width="10cm" placement="break"/>
+      <xref href="images/global-tools-menu.png" format="png" platform="htmlhelp">
+        <image href="images/global-tools-menu.png" width="10cm" placement="break">
+          <alt>Global Tools Menu</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/global-tools-menu.png" width="10cm" placement="break">
+        <alt>Global Tools Menu</alt>
+      </image>
     </fig>
     <p>
           A drop-down list enables you to select from the following
diff --git a/doc/manual/en_US/dita/topics/gui-tools-machine.dita b/doc/manual/en_US/dita/topics/gui-tools-machine.dita
index f020a6c6c15..895b8688b9d 100644
--- a/doc/manual/en_US/dita/topics/gui-tools-machine.dita
+++ b/doc/manual/en_US/dita/topics/gui-tools-machine.dita
@@ -16,7 +16,14 @@
         </p>
     <fig id="fig-machine-tools-menu">
       <title>Machine Tools Menu</title>
-      <image href="images/machine-tools-menu.png" width="10cm" placement="break"/>
+      <xref href="images/machine-tools-menu.png" format="png" platform="htmlhelp">
+        <image href="images/machine-tools-menu.png" width="10cm" placement="break">
+          <alt>Machine Tools Menu</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/machine-tools-menu.png" width="10cm" placement="break">
+        <alt>Machine Tools Menu</alt>
+      </image>
     </fig>
     <p>
           A drop-down list enables you to select from the following
diff --git a/doc/manual/en_US/dita/topics/gui-virtualboxmanager.dita b/doc/manual/en_US/dita/topics/gui-virtualboxmanager.dita
index fbeb3916143..266b6837fc1 100644
--- a/doc/manual/en_US/dita/topics/gui-virtualboxmanager.dita
+++ b/doc/manual/en_US/dita/topics/gui-virtualboxmanager.dita
@@ -23,14 +23,28 @@
     </p>
     <fig id="fig-vbox-manager-initial">
       <title>VirtualBox Manager, Showing Welcome Screen After Initial Startup</title>
-      <image href="images/virtualbox-main-empty.png" width="12cm" placement="break"/>
+      <xref href="images/virtualbox-main-empty.png" format="png" platform="htmlhelp">
+        <image href="images/virtualbox-main-empty.png" width="12cm" placement="break">
+          <alt>VirtualBox Manager, Showing Welcome Screen After Initial Startup</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/virtualbox-main-empty.png" width="12cm" placement="break">
+        <alt>VirtualBox Manager, Showing Welcome Screen After Initial Startup</alt>
+      </image>
     </fig>
     <p><xref href="#gui-virtualboxmanager/fig-vbox-manager-populated"/> shows how VirtualBox Manager
       might look after you have created some virtual machines.
     </p>
     <fig id="fig-vbox-manager-populated">
       <title>VirtualBox Manager Window, After Creating Virtual Machines</title>
-      <image href="images/virtualbox-main.png" width="12cm" placement="break"/>
+      <xref href="images/virtualbox-main.png" format="png" platform="htmlhelp">
+        <image href="images/virtualbox-main.png" width="12cm" placement="break">
+          <alt>VirtualBox Manager Window, After Creating Virtual Machines</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/virtualbox-main.png" width="12cm" placement="break">
+        <alt>VirtualBox Manager Window, After Creating Virtual Machines</alt>
+      </image>
     </fig>
     <p>
       The main components of the VirtualBox Manager window are as follows:
diff --git a/doc/manual/en_US/dita/topics/gui-vmgroups.dita b/doc/manual/en_US/dita/topics/gui-vmgroups.dita
index 86020e3a861..81a9738bc20 100644
--- a/doc/manual/en_US/dita/topics/gui-vmgroups.dita
+++ b/doc/manual/en_US/dita/topics/gui-vmgroups.dita
@@ -15,7 +15,14 @@
     </p>
     <fig id="fig-vm-groups">
       <title>Groups of Virtual Machines</title>
-      <image href="images/vm-groups.png" width="10cm" placement="break"/>
+      <xref href="images/vm-groups.png" format="png" platform="htmlhelp">
+        <image href="images/vm-groups.png" width="10cm" placement="break">
+          <alt>Groups of Virtual Machines</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/vm-groups.png" width="10cm" placement="break">
+        <alt>Groups of Virtual Machines</alt>
+      </image>
     </fig>
     <p>
       The following features are available for groups:
diff --git a/doc/manual/en_US/dita/topics/host-key-customize.dita b/doc/manual/en_US/dita/topics/host-key-customize.dita
index a2db524ad8b..0685a14a6d1 100644
--- a/doc/manual/en_US/dita/topics/host-key-customize.dita
+++ b/doc/manual/en_US/dita/topics/host-key-customize.dita
@@ -21,6 +21,7 @@
       </p>
     <table id="table-host-key-customize">
       <title>Host Key Customization</title>
+      <desc>Host Key Customization</desc>
       <tgroup cols="3">
         <thead>
           <row>
diff --git a/doc/manual/en_US/dita/topics/intro-save-machine-state.dita b/doc/manual/en_US/dita/topics/intro-save-machine-state.dita
index 93f4f282721..15be78a36cb 100644
--- a/doc/manual/en_US/dita/topics/intro-save-machine-state.dita
+++ b/doc/manual/en_US/dita/topics/intro-save-machine-state.dita
@@ -14,7 +14,14 @@
       </p>
     <fig id="fig-vm-close">
       <title>Closing Down a Virtual Machine</title>
-      <image href="images/vm-close.png" width="10cm" placement="break"/>
+      <xref href="images/vm-close.png" format="png" platform="htmlhelp">
+        <image href="images/vm-close.png" width="10cm" placement="break">
+          <alt>Closing Down a Virtual Machine</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/vm-close.png" width="10cm" placement="break">
+        <alt>Closing Down a Virtual Machine</alt>
+      </image>
     </fig>
     <p>
         The difference between the three options is crucial. They mean
diff --git a/doc/manual/en_US/dita/topics/keyb_mouse_normal.dita b/doc/manual/en_US/dita/topics/keyb_mouse_normal.dita
index 38a88a606e2..6a1dc9be866 100644
--- a/doc/manual/en_US/dita/topics/keyb_mouse_normal.dita
+++ b/doc/manual/en_US/dita/topics/keyb_mouse_normal.dita
@@ -43,7 +43,14 @@
       </p>
     <fig id="fig-host-key">
       <title>Host Key Setting on the Virtual Machine Taskbar</title>
-      <image href="images/vm-hostkey.png" width="7cm" placement="break"/>
+      <xref href="images/vm-hostkey.png" format="png" platform="htmlhelp">
+        <image href="images/vm-hostkey.png" width="7cm" placement="break">
+          <alt>Host Key Setting on the Virtual Machine Taskbar</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/vm-hostkey.png" width="7cm" placement="break">
+        <alt>Host Key Setting on the Virtual Machine Taskbar</alt>
+      </image>
     </fig>
     <p>
         This means the following:
diff --git a/doc/manual/en_US/dita/topics/log-viewer.dita b/doc/manual/en_US/dita/topics/log-viewer.dita
index a9dbc486681..4fcb11070dc 100644
--- a/doc/manual/en_US/dita/topics/log-viewer.dita
+++ b/doc/manual/en_US/dita/topics/log-viewer.dita
@@ -12,7 +12,14 @@
     </p>
     <fig id="fig-log-viewer-tool">
       <title>Log Viewer Tool, Showing System Events</title>
-      <image href="images/log-viewer.png" width="10cm" placement="break"/>
+      <xref href="images/log-viewer.png" format="png" platform="htmlhelp">
+        <image href="images/log-viewer.png" width="10cm" placement="break">
+          <alt>Log Viewer Tool, Showing System Events</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/log-viewer.png" width="10cm" placement="break">
+        <alt>Log Viewer Tool, Showing System Events</alt>
+      </image>
     </fig>
     <p>
       To display the Log Viewer, do either of the following:
diff --git a/doc/manual/en_US/dita/topics/networkingmodes.dita b/doc/manual/en_US/dita/topics/networkingmodes.dita
index e6a0a9ff9a9..10a8382f9dd 100644
--- a/doc/manual/en_US/dita/topics/networkingmodes.dita
+++ b/doc/manual/en_US/dita/topics/networkingmodes.dita
@@ -102,6 +102,7 @@
     </p>
     <table id="table-networking-modes">
       <title>Overview of Networking Modes</title>
+      <desc>Overview of Networking Modes</desc>
       <tgroup cols="6">
         <colspec align="left"/>
         <colspec align="center"/>
diff --git a/doc/manual/en_US/dita/topics/ovf-import-appliance.dita b/doc/manual/en_US/dita/topics/ovf-import-appliance.dita
index 2785682422e..4768e9917e0 100644
--- a/doc/manual/en_US/dita/topics/ovf-import-appliance.dita
+++ b/doc/manual/en_US/dita/topics/ovf-import-appliance.dita
@@ -24,7 +24,14 @@
           </p>
         <fig id="fig-import-appliance">
           <title>Import Virtual Appliance Wizard: Appliance Settings</title>
-          <image href="images/ovf-import.png" width="12cm" placement="break"/>
+          <xref href="images/ovf-import.png" format="png" platform="htmlhelp">
+            <image href="images/ovf-import.png" width="12cm" placement="break">
+              <alt>Import Virtual Appliance Wizard: Appliance Settings</alt>
+            </image>
+          </xref>
+          <image platform="ohc" href="images/ovf-import.png" width="12cm" placement="break">
+            <alt>Import Virtual Appliance Wizard: Appliance Settings</alt>
+          </image>
         </fig>
       </li>
       <li>
diff --git a/doc/manual/en_US/dita/topics/pcspeaker_passthrough.dita b/doc/manual/en_US/dita/topics/pcspeaker_passthrough.dita
index bd81c07d0af..5a52b6ea54a 100644
--- a/doc/manual/en_US/dita/topics/pcspeaker_passthrough.dita
+++ b/doc/manual/en_US/dita/topics/pcspeaker_passthrough.dita
@@ -26,6 +26,7 @@
     </p>
     <table id="table-pcspeaker-config">
       <title>PC Speaker Configuration Options</title>
+      <desc>PC Speaker Configuration Options</desc>
       <tgroup cols="3">      
         <thead>
           <row>
diff --git a/doc/manual/en_US/dita/topics/seamlesswindows.dita b/doc/manual/en_US/dita/topics/seamlesswindows.dita
index f59dfe56b2e..9b95bcb3779 100644
--- a/doc/manual/en_US/dita/topics/seamlesswindows.dita
+++ b/doc/manual/en_US/dita/topics/seamlesswindows.dita
@@ -32,7 +32,14 @@
     </p>
     <fig id="fig-seamless-windows">
       <title>Seamless Windows on a Host Desktop</title>
-      <image href="images/seamless.png" width="14cm" placement="break"/>
+      <xref href="images/seamless.png" format="png" platform="htmlhelp">
+        <image href="images/seamless.png" width="14cm" placement="break">
+          <alt>Seamless Windows on a Host Desktop</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/seamless.png" width="14cm" placement="break">
+        <alt>Seamless Windows on a Host Desktop</alt>
+      </image>
     </fig>
     <p>
       To enable seamless mode, after starting the virtual machine, press
diff --git a/doc/manual/en_US/dita/topics/settings-storage.dita b/doc/manual/en_US/dita/topics/settings-storage.dita
index beaa30b1242..19e9dfcbda8 100644
--- a/doc/manual/en_US/dita/topics/settings-storage.dita
+++ b/doc/manual/en_US/dita/topics/settings-storage.dita
@@ -31,7 +31,14 @@
     </p>
     <fig id="fig-storage-settings">
       <title>Storage Settings for a Virtual Machine</title>
-      <image href="images/vm-settings-harddisk.png" width="10cm" placement="break"/>
+      <xref href="images/vm-settings-harddisk.png" format="png" platform="htmlhelp">
+        <image href="images/vm-settings-harddisk.png" width="10cm" placement="break">
+          <alt>Storage Settings for a Virtual Machine</alt>
+        </image>
+      </xref>
+      <image platform="ohc" href="images/vm-settings-harddisk.png" width="10cm" placement="break">
+        <alt>Storage Settings for a Virtual Machine</alt>
+      </image>
     </fig>
     <p>
       Depending on the guest OS type that you selected when you created
diff --git a/doc/manual/en_US/dita/topics/snapshots-take-restore-delete.dita b/doc/manual/en_US/dita/topics/snapshots-take-restore-delete.dita
index d21c8acef8a..f299358078c 100644
--- a/doc/manual/en_US/dita/topics/snapshots-take-restore-delete.dita
+++ b/doc/manual/en_US/dita/topics/snapshots-take-restore-delete.dita
@@ -77,10 +77,17 @@
             and that each subsequent snapshot is derived from an earlier
             one.
           </p>
-                        <fig id="fig-snapshots-list">
-                           <title>Snapshots List For a Virtual Machine</title>
-                           <image href="images/snapshots-2.png" width="10cm" placement="break"/>
-                        </fig>
+                       <fig id="fig-snapshots-list">
+                         <title>Snapshots List For a Virtual Machine</title>
+                         <xref href="images/snapshots-2.png" format="png" platform="htmlhelp">
+                           <image href="images/snapshots-2.png" width="10cm" placement="break">
+                             <alt>Snapshots List For a Virtual Machine</alt>
+                           </image>
+                         </xref>
+                         <image platform="ohc" href="images/snapshots-2.png" width="10cm" placement="break">
+                           <alt>Snapshots List For a Virtual Machine</alt>
+                         </image>
+                       </fig>
                         <p>
             Oracle VM VirtualBox imposes no limits on the number of snapshots
             you can take. The only practical limitation is disk space on
@@ -161,4 +168,4 @@
                   </ol>
                </body>
                
-            </topic>
+            </topic>
\ No newline at end of file
diff --git a/doc/manual/en_US/dita/topics/snapshots.dita b/doc/manual/en_US/dita/topics/snapshots.dita
index 59ccb9b7e9e..a8f97f44c7a 100644
--- a/doc/manual/en_US/dita/topics/snapshots.dita
+++ b/doc/manual/en_US/dita/topics/snapshots.dita
@@ -19,10 +19,17 @@
       <b outputclass="bold">Snapshots</b>. The Snapshots tool is
       displayed.
     </p>
-               <fig id="fig-snapshots-tool">
-                  <title>Snapshots Tool, Showing Snapshot Properties</title>
-                  <image href="images/snapshots-1.png" width="10cm" placement="break"/>
-               </fig>
+              <fig id="fig-snapshots-tool">
+                <title>Snapshots Tool, Showing Snapshot Properties</title>
+                <xref href="images/snapshots-1.png" format="png" platform="htmlhelp">
+                  <image href="images/snapshots-1.png" width="10cm" placement="break">
+                    <alt>Snapshots Tool, Showing Snapshot Properties</alt>
+                  </image>
+                </xref>
+                <image platform="ohc" href="images/snapshots-1.png" width="10cm" placement="break">
+                  <alt>Snapshots Tool, Showing Snapshot Properties</alt>
+                </image>
+              </fig>
                <p>
       If you select multiple VMs in the machine list, all snapshots are
       listed for each VM.
@@ -103,4 +110,4 @@
             </body>
             
             
-         </topic>
+         </topic>
\ No newline at end of file
diff --git a/doc/manual/en_US/dita/topics/soft-keyb.dita b/doc/manual/en_US/dita/topics/soft-keyb.dita
index 73e0de992c9..30a1555f094 100644
--- a/doc/manual/en_US/dita/topics/soft-keyb.dita
+++ b/doc/manual/en_US/dita/topics/soft-keyb.dita
@@ -26,9 +26,13 @@
     <fig id="fig-soft-keyb">
       <title>Soft Keyboard in a Guest Virtual Machine</title>
       <xref href="images/softkeybd.png" format="png" platform="htmlhelp">
-        <image href="images/softkeybd.png" width="14cm" placement="break" id="image_u5k_f4r_wwb"/>
+        <image href="images/softkeybd.png" width="14cm" placement="break">
+          <alt>Soft Keyboard in a Guest Virtual Machine</alt>
+        </image>
       </xref>
-      <image platform="ohc" href="images/softkeybd.png" width="14cm" placement="break" id="image_u5k_f4r_wwb"/>
+      <image platform="ohc" href="images/softkeybd.png" width="14cm" placement="break">
+        <alt>Soft Keyboard in a Guest Virtual Machine</alt>
+      </image>
     </fig>
     <p>
       The soft keyboard can be used in the following scenarios:
diff --git a/doc/manual/en_US/dita/topics/vboxconfigdata-summary-locations.dita b/doc/manual/en_US/dita/topics/vboxconfigdata-summary-locations.dita
index a4975f53d30..49b634b7f67 100644
--- a/doc/manual/en_US/dita/topics/vboxconfigdata-summary-locations.dita
+++ b/doc/manual/en_US/dita/topics/vboxconfigdata-summary-locations.dita
@@ -10,6 +10,7 @@
       </p>
     <table id="table-config-summary">
       <title>Configuration File Locations</title>
+      <desc>Configuration File Locations</desc>
       <tgroup cols="2">
         <thead>
           <row>
diff --git a/doc/manual/en_US/dita/topics/vboxwatchdog-linux.dita b/doc/manual/en_US/dita/topics/vboxwatchdog-linux.dita
index eda5f385152..72a675dbb45 100644
--- a/doc/manual/en_US/dita/topics/vboxwatchdog-linux.dita
+++ b/doc/manual/en_US/dita/topics/vboxwatchdog-linux.dita
@@ -23,6 +23,7 @@
       </p>
     <table id="table-vboxwatchdog-config-params">
       <title>Oracle VM VirtualBox Watchdog Configuration Parameters</title>
+      <desc>Oracle VM VirtualBox Watchdog Configuration Parameters</desc>
       <tgroup cols="3">       
         <thead>
           <row>
diff --git a/doc/manual/en_US/dita/topics/vboxwebsrv-linux.dita b/doc/manual/en_US/dita/topics/vboxwebsrv-linux.dita
index b591d1e2172..01d07dde406 100644
--- a/doc/manual/en_US/dita/topics/vboxwebsrv-linux.dita
+++ b/doc/manual/en_US/dita/topics/vboxwebsrv-linux.dita
@@ -17,6 +17,7 @@
       </p>
     <table id="table-websrv-config-params">
       <title>Web Service Configuration Parameters</title>
+      <desc>Web Service Configuration Parameters</desc>
       <tgroup cols="3">       
         <thead>
           <row>
diff --git a/doc/manual/en_US/dita/topics/virtual-media-manager.dita b/doc/manual/en_US/dita/topics/virtual-media-manager.dita
index 07de5988802..a6b51e79bcf 100644
--- a/doc/manual/en_US/dita/topics/virtual-media-manager.dita
+++ b/doc/manual/en_US/dita/topics/virtual-media-manager.dita
@@ -31,10 +31,17 @@
       the global <b outputclass="bold">Tools</b> menu in
       VirtualBox Manager.
     </p>
-               <fig id="fig-virtual-media-manager">
-                  <title>The Virtual Media Manager, Showing Hard Disk Images</title>
-                  <image href="images/virtual-disk-manager.png" width="12cm" placement="break"/>
-               </fig>
+              <fig id="fig-virtual-media-manager">
+                <title>The Virtual Media Manager, Showing Hard Disk Images</title>
+                <xref href="images/virtual-disk-manager.png" format="png" platform="htmlhelp">
+                  <image href="images/virtual-disk-manager.png" width="12cm" placement="break">
+                    <alt>The Virtual Media Manager, Showing Hard Disk Images</alt>
+                  </image>
+                </xref>
+                <image platform="ohc" href="images/virtual-disk-manager.png" width="12cm" placement="break">
+                  <alt>The Virtual Media Manager, Showing Hard Disk Images</alt>
+                </image>
+              </fig>
                <p>
       The known media are conveniently grouped in separate tabs for the
       supported formats. These formats are:
@@ -266,4 +273,4 @@
             
             
             
-         </topic>
+         </topic>
\ No newline at end of file
diff --git a/doc/manual/en_US/dita/topics/vm-activity-overview.dita b/doc/manual/en_US/dita/topics/vm-activity-overview.dita
index 39ea636a99b..86faf3b6632 100644
--- a/doc/manual/en_US/dita/topics/vm-activity-overview.dita
+++ b/doc/manual/en_US/dita/topics/vm-activity-overview.dita
@@ -19,11 +19,18 @@
         click <b outputclass="bold">Activities</b>. The
         <b outputclass="bold">VM Activity Overview</b> window is
         shown.
-      </p>
-                  <fig id="fig-vm-activity-overview-widget">
-                     <title>VM Activity Overview Tool</title>
-                     <image href="images/vm-activity-overview.png" width="12cm" placement="break"/>
-                  </fig>
+      </p>   
+                 <fig id="fig-vm-activity-overview-widget">
+                   <title>VM Activity Overview Tool</title>
+                   <xref href="images/vm-activity-overview.png" format="png" platform="htmlhelp">
+                     <image href="images/vm-activity-overview.png" width="12cm" placement="break">
+                       <alt>VM Activity Overview Tool</alt>
+                     </image>
+                   </xref>
+                   <image platform="ohc" href="images/vm-activity-overview.png" width="12cm" placement="break">
+                     <alt>VM Activity Overview Tool</alt>
+                   </image>
+                 </fig>
                   <p>
         To show metrics for <i>all</i> virtual machines,
         including those that are not running, right-click on the list of
@@ -45,4 +52,4 @@
       </p>
                </body>
                
-            </topic>
+            </topic>
\ No newline at end of file
diff --git a/doc/manual/en_US/dita/topics/vm-activity-session-information.dita b/doc/manual/en_US/dita/topics/vm-activity-session-information.dita
index 4523e6d95fb..bc83ee0d1e1 100644
--- a/doc/manual/en_US/dita/topics/vm-activity-session-information.dita
+++ b/doc/manual/en_US/dita/topics/vm-activity-session-information.dita
@@ -51,10 +51,17 @@
         <b outputclass="bold">Session Information</b> in the
         guest VM.
       </p>
-                  <fig id="fig-vm-session-information">
-                     <title>Session Information Dialog, Showing VM Activity Tab</title>
-                     <image href="images/session-information.png" width="12cm" placement="break"/>
-                  </fig>
+                 <fig id="fig-vm-session-information">
+                   <title>Session Information Dialog, Showing VM Activity Tab</title>
+                   <xref href="images/session-information.png" format="png" platform="htmlhelp">
+                     <image href="images/session-information.png" width="12cm" placement="break">
+                       <alt>Session Information Dialog, Showing VM Activity Tab</alt>
+                     </image>
+                   </xref>
+                   <image platform="ohc" href="images/session-information.png" width="12cm" placement="break">
+                     <alt>Session Information Dialog, Showing VM Activity Tab</alt>
+                   </image>
+                 </fig>
                </body>
                
-            </topic>
+            </topic>
\ No newline at end of file