Index: trunk/doc/manual/en_US/UserManual.xml
===================================================================
--- trunk/doc/manual/en_US/UserManual.xml	(revision 75946)
+++ trunk/doc/manual/en_US/UserManual.xml	(revision 76078)
@@ -9,6 +9,6 @@
 <!-- VBox bookinfo section -->
 
-  <bookinfo>
-
+<bookinfo>
+    
     <title>&VBOX_PRODUCT;</title>
 
@@ -16,9 +16,9 @@
 
     <edition>Version
-    &VBOX_VERSION_STRING;</edition>
+   &VBOX_VERSION_STRING;</edition>
 
-    <corpauthor>Oracle Corporation</corpauthor>
+    <corpauthor>&VBOX_VENDOR;</corpauthor>
 
-    <address>https://www.virtualbox.org</address>
+    <address>http://www.virtualbox.org</address>
 
     <copyright>
@@ -26,9 +26,13 @@
       <year>2004-&VBOX_C_YEAR;</year>
 
-      <holder>Oracle Corporation</holder>
+      <holder>&VBOX_VENDOR;</holder>
 
     </copyright>
 
   </bookinfo>
+
+
+  <xi:include href="user_Preface.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="user_Introduction.xml"
Index: trunk/doc/manual/en_US/oracle-accessibility-en.xml
===================================================================
--- trunk/doc/manual/en_US/oracle-accessibility-en.xml	(revision 76078)
+++ trunk/doc/manual/en_US/oracle-accessibility-en.xml	(revision 76078)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE simplesect PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+[
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
+%all.entities;
+]>
+<simplesect>
+
+<!-- 
+    Include this statement in the document Preface ONLY if your product 
+    and/or documentation has been tested for accessibility, is determined 
+    to be accessible, and has a VPAT.
+  -->
+
+  <title>Documentation Accessibility</title>
+
+  <para>
+    For information about Oracle's commitment to accessibility, visit
+    the Oracle Accessibility Program website at
+
+<?fo-linebreak?>
+
+    <ulink url="http://www.oracle.com/pls/topic/lookup?ctx=acc&amp;id=docacc">http://www.oracle.com/pls/topic/lookup?ctx=acc&amp;id=docacc</ulink>.
+  </para>
+
+</simplesect>
Index: trunk/doc/manual/en_US/oracle-support-en.xml
===================================================================
--- trunk/doc/manual/en_US/oracle-support-en.xml	(revision 76078)
+++ trunk/doc/manual/en_US/oracle-support-en.xml	(revision 76078)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE simplesect PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+[
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
+%all.entities;
+]>
+<simplesect>
+  
+  <!-- Include this statement in the document Preface -->
+
+  <title>Access to Oracle Support</title>
+
+  <para>
+    Oracle customers that have purchased support have access to
+    electronic support through My Oracle Support. For information, visit
+
+<?fo-linebreak?>
+
+    <ulink url="http://www.oracle.com/pls/topic/lookup?ctx=acc&amp;id=info">http://www.oracle.com/pls/topic/lookup?ctx=acc&amp;id=info</ulink>
+    or visit
+    <ulink
+      url="http://www.oracle.com/pls/topic/lookup?ctx=acc&amp;id=trs">http://www.oracle.com/pls/topic/lookup?ctx=acc&amp;id=trs</ulink>
+    if you are hearing impaired.
+  </para>
+
+</simplesect>
Index: trunk/doc/manual/en_US/user_AdvancedTopics.xml
===================================================================
--- trunk/doc/manual/en_US/user_AdvancedTopics.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_AdvancedTopics.xml	(revision 76078)
@@ -9,189 +9,17 @@
   <title>Advanced Topics</title>
 
-  <sect1 id="vboxsdl">
-
-    <title>VBoxSDL, The Simplified VM Displayer</title>
-
-    <sect2 id="vboxsdl-intro">
-
-      <title>Introduction</title>
-
-      <para>
-        VBoxSDL is a simple graphical user interface (GUI) that lacks
-        the nice point-and-click support of the main GUI, VirtualBox.
-        VBoxSDL is currently primarily used internally for debugging
-        VirtualBox and therefore not officially supported. But you may
-        find it useful for environments where the virtual machines are
-        not necessarily controlled by the same person that uses the
-        virtual machine.
-      </para>
-
-      <note>
-        <para>
-          VBoxSDL is not available on the Mac OS X host platform.
-        </para>
-      </note>
-
-      <para>
-        As shown in the following screenshot, VBoxSDL provides a simple
-        window that contains only the "pure" virtual machine, without
-        menus or other controls to click and with no additional
-        indicators of virtual machine activity.
-      </para>
-
-      <para>
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="images/vbox-sdl.png"
-                       width="10cm" />
-          </imageobject>
-        </mediaobject>
-      </para>
-
-      <para>
-        To start a virtual machine with VBoxSDL instead of the
-        VirtualBox GUI, enter the following on a command line:
-      </para>
-
-<screen>VBoxSDL --startvm &lt;vm&gt;</screen>
-
-      <para>
-        where <computeroutput>&lt;vm&gt;</computeroutput> is the name or
-        UUID of an existing virtual machine.
-      </para>
-
-    </sect2>
-
-    <sect2 id="vboxsdl-secure-label">
-
-      <title>Secure Labeling with VBoxSDL</title>
-
-      <para>
-        When running guest operating systems in full screen mode, the
-        guest operating system usually has control over the whole
-        screen. This could present a security risk as the guest
-        operating system might fool the user into thinking that it is
-        either a different system, which might have a higher security
-        level, or it might present messages on the screen that appear to
-        stem from the host operating system.
-      </para>
-
-      <para>
-        In order to protect the user against the above mentioned
-        security risks, the secure labeling feature has been developed.
-        Secure labeling is currently available only for VBoxSDL. When
-        enabled, a portion of the display area is reserved for a label
-        in which a user defined message is displayed. The label height
-        is set to 20 pixels in VBoxSDL. The label font color and
-        background color can be optionally set as hexadecimal RGB color
-        values. The following syntax is used to enable secure labeling:
-      </para>
-
-<screen>VBoxSDL --startvm "VM name"
-      --securelabel --seclabelfnt ~/fonts/arial.ttf
-      --seclabelsiz 14 --seclabelfgcol 00FF00 --seclabelbgcol 00FFFF</screen>
-
-      <para>
-        In addition to enabling secure labeling, a TrueType font has to
-        be supplied. To use another font size than 12 point use the
-        parameter <computeroutput>--seclabelsiz</computeroutput>.
-      </para>
-
-      <para>
-        The label text can be set with:
-      </para>
-
-<screen>VBoxManage setextradata "VM name" "VBoxSDL/SecureLabel" "The Label"</screen>
-
-      <para>
-        Changing this label will take effect immediately.
-      </para>
-
-      <para>
-        Typically, full screen resolutions are limited to certain
-        standard geometries such as 1024 x 768. Increasing this by
-        twenty lines is not usually feasible, so in most cases, VBoxSDL
-        will chose the next higher resolution, such as 1280 x 1024 and
-        the guest's screen will not cover the whole display surface. If
-        VBoxSDL is unable to choose a higher resolution, the secure
-        label will be painted on top of the guest's screen surface. In
-        order to address the problem of the bottom part of the guest
-        screen being hidden, VBoxSDL can provide custom video modes to
-        the guest that are reduced by the height of the label. For
-        Windows guests and recent Solaris and Linux guests, the
-        VirtualBox Guest Additions automatically provide the reduced
-        video modes. Additionally, the VESA BIOS has been adjusted to
-        duplicate its standard mode table with adjusted resolutions. The
-        adjusted mode IDs can be calculated using the following formula:
-      </para>
-
-<screen>reduced_modeid = modeid + 0x30</screen>
-
-      <para>
-        For example, in order to start Linux with 1024 x 748 x 16, the
-        standard mode 0x117 (1024 x 768 x 16) is used as a base. The
-        Linux video mode kernel parameter can then be calculated using:
-      </para>
-
-<screen>vga = 0x200 | 0x117 + 0x30
-vga = 839</screen>
-
-      <para>
-        The reason for duplicating the standard modes instead of only
-        supplying the adjusted modes is that most guest operating
-        systems require the standard VESA modes to be fixed and refuse
-        to start with different modes.
-      </para>
-
-      <para>
-        When using the X.org VESA driver, custom modelines have to be
-        calculated and added to the configuration, usually in
-        <literal>/etc/X11/xorg.conf</literal>. A handy tool to determine
-        modeline entries can be found at:
-        <ulink
-      url="http://www.tkk.fi/Misc/Electronics/faq/vga2rgb/calc.html">http://www.tkk.fi/Misc/Electronics/faq/vga2rgb/calc.html</ulink>.
-      </para>
-
-    </sect2>
-
-    <sect2 id="vboxsdl-modifier-release">
-
-      <title>Releasing Modifiers with VBoxSDL on Linux</title>
-
-      <para>
-        When switching from a X virtual terminal (VT) to another VT
-        using Ctrl-Alt-F<replaceable>x</replaceable> while the VBoxSDL
-        window has the input focus, the guest will receive Ctrl and Alt
-        keypress events without receiving the corresponding key release
-        events. This is an architectural limitation of Linux. In order
-        to reset the modifier keys, it is possible to send
-        <computeroutput>SIGUSR1</computeroutput> to the VBoxSDL main
-        thread, the first entry in the
-        <computeroutput>ps</computeroutput> list. For example, when
-        switching away to another VT and saving the virtual machine from
-        this terminal, the following sequence can be used to make sure
-        the VM is not saved with stuck modifiers:
-      </para>
-
-<screen>kill -usr1 &lt;pid&gt;
-VBoxManage controlvm "Windows 2000" savestate</screen>
-
-    </sect2>
-
-  </sect1>
-
   <sect1 id="autologon">
 
-    <title>Automated Guest Logons</title>
-
-    <para>
-      VirtualBox provides Guest Addition modules for Windows, Linux, and
-      Solaris to enable automated logons on the guest.
+    <title>Automated Guest Logins</title>
+
+    <para>
+      &product-name; provides Guest Addition modules for Windows, Linux,
+      and Oracle Solaris to enable automated logins on the guest.
     </para>
 
     <para>
       When a guest operating system is running in a virtual machine, it
-      might be desirable to perform coordinated and automated logons
-      using credentials from a master logon system. Credentials are user
+      might be desirable to perform coordinated and automated logins
+      using credentials from a master login system. Credentials are user
       name, password, and domain name, where each value might be empty.
     </para>
@@ -199,21 +27,22 @@
     <sect2 id="autologon_win">
 
-      <title>Automated Windows Guest Logons</title>
-
-      <para>
-        Since Windows NT, Windows has provided a modular system logon
+      <title>Automated Windows Guest Logins</title>
+
+      <para>
+        Since Windows NT, Windows has provided a modular system login
         subsystem, called Winlogon, which can be customized and extended
         by means of so-called GINA (Graphical Identification and
         Authentication) modules. With Windows Vista and Windows 7, the
         GINA modules were replaced with a new mechanism called
-        credential providers. The VirtualBox Guest Additions for Windows
-        come with both, a GINA and a credential provider module, and
-        therefore enable any Windows guest to perform automated logons.
-      </para>
-
-      <para>
-        To activate the VirtualBox GINA or credential provider module,
-        install the Guest Additions using the command line switch
-        <computeroutput>/with_autologon</computeroutput>. All the
+        credential providers. The &product-name; Guest Additions for
+        Windows come with both, a GINA and a credential provider module,
+        and therefore enable any Windows guest to perform automated
+        logins.
+      </para>
+
+      <para>
+        To activate the &product-name; GINA or credential provider
+        module, install the Guest Additions using the command line
+        switch <computeroutput>/with_autologon</computeroutput>. All the
         following manual steps required for installing these modules
         will be then done by the installer.
@@ -221,5 +50,5 @@
 
       <para>
-        To manually install the VirtualBox GINA module, extract the
+        To manually install the &product-name; GINA module, extract the
         Guest Additions as shown in
         <xref linkend="windows-guest-file-extraction" /> and copy the
@@ -227,5 +56,5 @@
         Windows <computeroutput>SYSTEM32</computeroutput> directory.
         Then, in the registry, create the following key with a value of
-        <computeroutput>VBoxGINA.dll</computeroutput>.:
+        <computeroutput>VBoxGINA.dll</computeroutput>:
       </para>
 
@@ -234,6 +63,6 @@
       <note>
         <para>
-          The VirtualBox GINA module is implemented as a wrapper around
-          the standard Windows GINA module,
+          The &product-name; GINA module is implemented as a wrapper
+          around the standard Windows GINA module,
           <computeroutput>MSGINA.DLL</computeroutput>. As a result, it
           may not work correctly with third party GINA modules.
@@ -242,6 +71,6 @@
 
       <para>
-        To manually install the VirtualBox credential provider module,
-        extract the Guest Additions as shown in
+        To manually install the &product-name; credential provider
+        module, extract the Guest Additions as shown in
         <xref
       linkend="windows-guest-file-extraction" /> and copy
@@ -249,12 +78,12 @@
         the Windows <computeroutput>SYSTEM32</computeroutput> directory.
         In the registry, create the following keys:
+      </para>
 
 <screen>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\
-           Authentication\Credential Providers\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}
+Authentication\Credential Providers\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}
 
 HKEY_CLASSES_ROOT\CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}
 
 HKEY_CLASSES_ROOT\CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}\InprocServer32</screen>
-      </para>
 
       <para>
@@ -280,11 +109,11 @@
       <para>
         While the VM is running, the credentials can be queried by the
-        VirtualBox logon modules, GINA or credential provider, using the
-        VirtualBox Guest Additions device driver. When Windows is in
-        <emphasis>logged out</emphasis> mode, the logon modules will
-        constantly poll for credentials and if they are present, a logon
-        will be attempted. After retrieving the credentials, the logon
-        modules will erase them so that the above command will have to
-        be repeated for subsequent logons.
+        &product-name; login modules, GINA or credential provider, using
+        the &product-name; Guest Additions device driver. When Windows
+        is in <emphasis>logged out</emphasis> mode, the login modules
+        will constantly poll for credentials and if they are present, a
+        login will be attempted. After retrieving the credentials, the
+        login modules will erase them so that the above command will
+        have to be repeated for subsequent logins.
       </para>
 
@@ -307,7 +136,7 @@
           <para>
             For <emphasis role="bold">Windows XP guests.</emphasis> The
-            logon subsystem needs to be configured to use the classic
-            logon dialog as the VirtualBox GINA module does not support
-            the XP-style welcome dialog.
+            login subsystem needs to be configured to use the classic
+            login dialog, as the &product-name; GINA module does not
+            support the XP-style welcome dialog.
           </para>
         </listitem>
@@ -315,7 +144,7 @@
         <listitem>
           <para>
-            <emphasis role="bold">Windows Vista, Windows 7, and Windows
-            8 guests.</emphasis> The logon subsystem does not support
-            the so-called Secure Attention Sequence,
+            <emphasis role="bold">Windows Vista, Windows 7, Windows 8,
+            and Windows 10 guests.</emphasis> The login subsystem does
+            not support the so-called Secure Attention Sequence,
             <computeroutput>Ctrl+Alt+Del</computeroutput>. As a result,
             the guest's group policy settings need to be changed to not
@@ -330,5 +159,5 @@
         <listitem>
           <para>
-            Auto-logon handling of the built-in
+            Automatic login handling of the built-in
             <emphasis role="bold">Windows Remote Desktop
             Service</emphasis>, formerly known as Terminal Services, is
@@ -344,9 +173,11 @@
 
       <para>
-        The following command forces VirtualBox to keep the credentials
-        after they were read by the guest and on VM reset:
+        The following command forces &product-name; to keep the
+        credentials after they were read by the guest and on VM reset:
+      </para>
 
 <screen>VBoxManage setextradata "Windows XP" VBoxInternal/Devices/VMMDev/0/Config/KeepCredentials 1</screen>
 
+      <para>
         Note that this is a potential security risk, as a malicious
         application running on the guest could request this information
@@ -358,17 +189,16 @@
     <sect2 id="autologon_unix">
 
-      <title>Automated Linux and Unix Guest Logons</title>
-
-      <para>
-        Starting with version 3.2, VirtualBox provides a custom PAM
-        module (Pluggable Authentication Module) which can be used to
-        perform automated guest logons on platforms which support this
-        framework. Virtually all modern Linux and Unix distributions
-        rely on PAM.
-      </para>
-
-      <para>
-        For automated logons on Ubuntu, or Ubuntu-derived, distributions
-        using LightDM as the display manager, see
+      <title>Automated Linux and UNIX Guest Logins</title>
+
+      <para>
+        &product-name; provides a custom PAM module (Pluggable
+        Authentication Module) which can be used to perform automated
+        guest logins on platforms which support this framework.
+        Virtually all modern Linux and UNIX distributions rely on PAM.
+      </para>
+
+      <para>
+        For automated logins on Ubuntu, or Ubuntu-derived, distributions
+        using LightDM as the display manager. See
         <xref linkend="autologon_unix_lightdm" />.
       </para>
@@ -413,5 +243,5 @@
         For example, to use <computeroutput>pam_vbox.so</computeroutput>
         with a Ubuntu Linux guest OS and the GNOME Desktop Manager (GDM)
-        to logon users automatically with the credentials passed by the
+        to log in users automatically with the credentials passed by the
         host, configure the guest OS as follows:
       </para>
@@ -450,13 +280,13 @@
             <computeroutput>use_first_pass</computeroutput> for
             <computeroutput>pam_unix2.so</computeroutput> is needed in
-            order to pass the credentials from the VirtualBox module to
-            the shadow database authentication module. For Ubuntu, this
-            needs to be added to
+            order to pass the credentials from the &product-name; module
+            to the shadow database authentication module. For Ubuntu,
+            this needs to be added to
             <computeroutput>/etc/pam.d/common-auth</computeroutput>, to
             the end of the line referencing
             <computeroutput>pam_unix.so</computeroutput>. This argument
             tells the PAM module to use credentials already present in
-            the stack, such as the ones provided by the VirtualBox PAM
-            module.
+            the stack, such as the ones provided by the &product-name;
+            PAM module.
           </para>
         </listitem>
@@ -480,16 +310,17 @@
       <note>
         <para>
-          By default, pam_vbox will not wait for credentials to arrive
-          from the host. When a login prompt is shown, for example by
-          GDM/KDM or the text console, and pam_vbox does not yet have
-          credentials it does not wait until they arrive. Instead the
-          next module in the PAM stack, depending on the PAM
-          configuration, will have the chance for authentication.
+          By default, <computeroutput>pam_vbox</computeroutput> will not
+          wait for credentials to arrive from the host. When a login
+          prompt is shown, for example by GDM/KDM or the text console,
+          and pam_vbox does not yet have credentials it does not wait
+          until they arrive. Instead the next module in the PAM stack,
+          depending on the PAM configuration, will have the chance for
+          authentication.
         </para>
       </note>
 
       <para>
-        Starting with VirtualBox 4.1.4 pam_vbox supports various guest
-        property parameters which all reside in
+        <computeroutput>pam_vbox</computeroutput> supports various guest
+        property parameters that are located in
         <computeroutput>/VirtualBox/GuestAdd/PAM/</computeroutput>.
         These parameters allow pam_vbox to wait for credentials to be
@@ -579,27 +410,29 @@
       <sect3 id="autologon_unix_lightdm">
 
-        <title>VirtualBox Greeter for Ubuntu/LightDM</title>
-
-        <para>
-          Starting with version 4.2.12, VirtualBox comes with an own
-          greeter module named vbox-greeter which can be used with
-          LightDM 1.0.1 or later. LightDM is the default display manager
-          since Ubuntu 10.11 and therefore also can be used for
-          automated guest logons.
-        </para>
-
-        <para>
-          vbox-greeter does not need the pam_vbox module described above
-          in order to function. It comes with its own authentication
-          mechanism provided by LightDM. However, to provide maximum of
-          flexibility both modules can be used together on the same
-          guest.
-        </para>
-
-        <para>
-          As with the pam_vbox module, vbox-greeter is shipped as part
-          of the Guest Additions but it is not installed or activated on
-          the guest OS by default. To install vbox-greeter automatically
-          upon Guest Additions installation, use the
+        <title>&product-name; Greeter for Ubuntu/LightDM</title>
+
+        <para>
+          &product-name; comes with an own greeter module, named
+          vbox-greeter. The module can be used with LightDM 1.0.1 or
+          later. LightDM is the default display manager since Ubuntu
+          10.11 and therefore also can be used for automated guest
+          logins.
+        </para>
+
+        <para>
+          vbox-greeter does not need the
+          <computeroutput>pam_vbox</computeroutput> module described
+          above in order to function. It comes with its own
+          authentication mechanism provided by LightDM. However, to
+          provide maximum of flexibility both modules can be used
+          together on the same guest.
+        </para>
+
+        <para>
+          As with the <computeroutput>pam_vbox</computeroutput> module,
+          vbox-greeter is shipped as part of the Guest Additions but it
+          is not installed or activated on the guest OS by default. To
+          install vbox-greeter automatically upon Guest Additions
+          installation, use the
           <computeroutput>--with-autologon</computeroutput> switch when
           starting the VBoxLinuxAdditions.run file:
@@ -613,6 +446,6 @@
           to be copied from
           <computeroutput>/opt/VBoxGuestAdditions-&lt;version&gt;/other/</computeroutput>
-          to the <computeroutput>xgreeters</computeroutput> directory,
-          usually
+          to the <computeroutput>xgreeters</computeroutput> directory
+          This is usually
           <computeroutput>/usr/share/xgreeters/</computeroutput>. Please
           refer to your guest OS documentation for the correct LightDM
@@ -622,5 +455,5 @@
         <para>
           The vbox-greeter module itself already was installed by the
-          VirtualBox Guest Additions installer and resides in
+          &product-name; Guest Additions installer and resides in
           <computeroutput>/usr/sbin/</computeroutput>. To enable
           vbox-greeter as the standard greeter module, the file
@@ -629,8 +462,6 @@
         </para>
 
-        <para>
 <screen>[SeatDefaults]
 greeter-session=vbox-greeter</screen>
-        </para>
 
         <note>
@@ -733,5 +564,5 @@
             <para>
               <computeroutput>Theme/LogonDialog/BackgroundColor</computeroutput>:
-              Hexadecimal RRGGBB color for the logon dialog background.
+              Hexadecimal RRGGBB color for the login dialog background.
               This property must be set read-only for the guest
               (<computeroutput>RDONLYGUEST</computeroutput>).
@@ -742,5 +573,5 @@
             <para>
               <computeroutput>Theme/LogonDialog/ButtonColor</computeroutput>:
-              Hexadecimal RRGGBB background color for the logon dialog
+              Hexadecimal RRGGBB background color for the login dialog
               button. This property must be set read-only for the guest
               (<computeroutput>RDONLYGUEST</computeroutput>).
@@ -784,7 +615,7 @@
 
       <para>
-        Starting with VirtualBox 3.2.2, the Guest Additions offer a way
-        to launch a system preparation on the guest operating system in
-        an automated way, controlled from the host system. See
+        The Guest Additions offer a way to launch a system preparation
+        on the guest operating system in an automated way, controlled
+        from the host system. See
         <xref linkend="guestadd-guestcontrol" /> for details of how to
         use this feature with the special identifier
@@ -834,5 +665,5 @@
   <sect1 id="adv-config-linux-guest">
 
-    <title>Advanced Configuration for Linux and Solaris Guests</title>
+    <title>Advanced Configuration for Linux and Oracle Solaris Guests</title>
 
     <sect2 id="linux-guest-manual-setup">
@@ -841,5 +672,5 @@
 
       <para>
-        The VirtualBox Guest Additions contain several different
+        The &product-name; Guest Additions contain several different
         drivers. If for any reason you do not wish to set them all up,
         you can install the Guest Additions using the following command:
@@ -866,8 +697,10 @@
         To setup the time synchronization service, add the service
         vboxadd-service to the default runlevel. To set up the X11 and
-        OpenGL part of the Guest Additions, run the command
+        OpenGL part of the Guest Additions, run the following command:
+      </para>
 
 <screen>  rcvboxadd-x11 setup</screen>
 
+      <para>
         You do not need to enable any services for this.
       </para>
@@ -875,7 +708,9 @@
       <para>
         To recompile the guest kernel modules, use this command:
+      </para>
 
 <screen>  rcvboxadd setup</screen>
 
+      <para>
         After compilation you should reboot your guest to ensure that
         the new modules are actually used.
@@ -896,6 +731,6 @@
 
       <para>
-        The VirtualBox Guest Additions include the following drivers for
-        X.Org versions:
+        The &product-name; Guest Additions include the following drivers
+        for X.Org versions:
       </para>
 
@@ -947,5 +782,5 @@
         load the vboxvideo driver. Many recent X server versions look
         for it automatically if they see that they are running in
-        VirtualBox. For an optimal user experience the guest kernel
+        &product-name;. For an optimal user experience the guest kernel
         drivers must be loaded and the Guest Additions tool VBoxClient
         must be running as a client in the X session. For mouse
@@ -960,5 +795,5 @@
 
       <para>
-        The VirtualBox guest graphics driver can use any graphics
+        The &product-name; guest graphics driver can use any graphics
         configuration for which the virtual resolution fits into the
         virtual video memory allocated to the virtual machine, minus a
@@ -977,9 +812,9 @@
 
       <para>
-        With pre-1.3 X Servers you can also add your own modes to the X
-        server configuration file. You simply need to add them to the
-        "Modes" list in the "Display" subsection of the "Screen"
-        section. For example, the following section has a custom
-        2048x800 resolution mode added:
+        With X Servers before version 1.3, you can also add your own
+        modes to the X server configuration file. You simply need to add
+        them to the "Modes" list in the "Display" subsection of the
+        "Screen" section. For example, the following section has a
+        custom 2048x800 resolution mode added:
       </para>
 
@@ -1005,52 +840,49 @@
     <para>
       With virtual machines running modern server operating systems,
-      VirtualBox supports CPU hot-plugging.
-
-      <footnote>
-
-        <para>
-          Support for CPU hot-plugging was introduced with VirtualBox
-          3.2.
-        </para>
-
-      </footnote>
-
-      Whereas on a physical computer this would mean that a CPU can be
-      added or removed while the machine is running, VirtualBox supports
-      adding and removing virtual CPUs while a virtual machine is
-      running.
+      &product-name; supports CPU hot-plugging.
+    </para>
+
+    <para>
+      On a physical computer CPU hot-plugging would mean that a CPU can
+      be added or removed while the machine is running. &product-name;
+      supports adding and removing of virtual CPUs while a virtual
+      machine is running.
     </para>
 
     <para>
       CPU hot-plugging works only with guest operating systems that
-      support it. So far this applies only to Linux and Windows Server
-      2008 x64 Data Center Edition. Windows supports only hot-add while
-      Linux supports hot-add and hot-remove but to use this feature with
-      more than 8 CPUs a 64bit Linux guest is required.
-    </para>
-
-    <para>
-      At this time, CPU hot-plugging requires using the VBoxManage
+      support the feature. So far this applies only to Linux and Windows
+      Server. Windows supports only hot-add, while Linux supports
+      hot-add and hot-remove. To use this feature with more than 8 CPUs,
+      a 64-bit Linux guest is required.
+    </para>
+
+    <para>
+      CPU hot-plugging is done using the <command>VBoxManage</command>
       command-line interface. First, hot-plugging needs to be enabled
       for a virtual machine:
+    </para>
 
 <screen>VBoxManage modifyvm "VM name" --cpuhotplug on</screen>
-    </para>
-
-    <para>
-      After that, the <computeroutput>--cpus</computeroutput> option
-      specifies the maximum number of CPUs that the virtual machine can
+
+    <para>
+      The <computeroutput>--cpus</computeroutput> option is used to
+      specify the maximum number of CPUs that the virtual machine can
       have:
+    </para>
 
 <screen>VBoxManage modifyvm "VM name" --cpus 8</screen>
 
+    <para>
       When the VM is off, you can then add and remove virtual CPUs with
       the <computeroutput>modifyvm --plugcpu</computeroutput> and
       <computeroutput>--unplugcpu</computeroutput> subcommands, which
-      take the number of the virtual CPU as a parameter, like this:
+      take the number of the virtual CPU as a parameter, as follows:
+    </para>
 
 <screen>VBoxManage modifyvm "VM name" --plugcpu 3
 VBoxManage modifyvm "VM name" --unplugcpu 3</screen>
 
+    <para>
       Note that CPU 0 can never be removed.
     </para>
@@ -1059,9 +891,10 @@
       While the VM is running, CPUs can be added and removed with the
       <computeroutput>controlvm plugcpu</computeroutput> and
-      <computeroutput>unplugcpu</computeroutput> commands instead:
+      <computeroutput>unplugcpu</computeroutput> commands instead, as
+      follows:
+    </para>
 
 <screen>VBoxManage controlvm "VM name" plugcpu 3
 VBoxManage controlvm "VM name" unplugcpu 3</screen>
-    </para>
 
     <para>
@@ -1094,22 +927,13 @@
 
     <para>
-      When running on Linux hosts, with a recent enough kernel, at least
-      version <computeroutput>2.6.31</computeroutput>, experimental host
-      PCI devices passthrough is available.
-
-      <footnote>
-
-        <para>
-          Experimental support for PCI passthrough was introduced with
-          VirtualBox 4.1.
-        </para>
-
-      </footnote>
+      When running on Linux hosts with a kernel version later than
+      <computeroutput>2.6.31</computeroutput>, experimental host PCI
+      devices passthrough is available.
     </para>
 
     <note>
       <para>
-        The PCI passthrough module is shipped as a VirtualBox extension
-        package, which must be installed separately. See
+        The PCI passthrough module is shipped as a &product-name;
+        extension package, which must be installed separately. See
         <xref
       linkend="intro-installing" />.
@@ -1118,16 +942,16 @@
 
     <para>
-      Essentially this feature allows a guest to directly use physical
-      PCI devices on the host, even if host does not have drivers for
-      this particular device. Both, regular PCI and some PCI Express
-      cards, are supported. AGP and certain PCI Express cards are not
-      supported at the moment if they rely on Graphics Address Remapping
-      Table (GART) unit programming for texture management as it does
-      rather non-trivial operations with pages remapping interfering
-      with IOMMU. This limitation may be lifted in future releases.
-    </para>
-
-    <para>
-      To be fully functional, PCI passthrough support in VirtualBox
+      This feature enables a guest to directly use physical PCI devices
+      on the host, even if host does not have drivers for this
+      particular device. Both, regular PCI and some PCI Express cards,
+      are supported. AGP and certain PCI Express cards are not supported
+      at the moment if they rely on Graphics Address Remapping Table
+      (GART) unit programming for texture management as it does rather
+      non-trivial operations with pages remapping interfering with
+      IOMMU. This limitation may be lifted in future releases.
+    </para>
+
+    <para>
+      To be fully functional, PCI passthrough support in &product-name;
       depends upon an IOMMU hardware unit which is not yet too widely
       available. If the device uses bus mastering, for example it
@@ -1209,6 +1033,5 @@
       next step is to select the PCI card and attach it to the guest. To
       figure out the list of available PCI devices, use the
-      <computeroutput>lspci</computeroutput> command. The output will
-      look as follows:
+      <command>lspci</command> command. The output will look as follows:
     </para>
 
@@ -1242,5 +1065,6 @@
       different PCI address to the card attached during runtime, so
       those addresses only apply to the address of the card at the
-      moment of attachment (host), and during BIOS PCI init (guest).
+      moment of attachment on the host, and during BIOS PCI init on the
+      guest.
     </para>
 
@@ -1294,16 +1118,16 @@
 
       <para>
-        VirtualBox 4.3 includes an experimental feature which allows a
-        guest to use a host webcam. This complements the general USB
-        passthrough support which was the typical way of using host
-        webcams in earlier versions. The webcam passthrough support can
-        handle non-USB video sources in theory, but this is completely
-        untested.
+        &product-name; 4.3 includes an experimental feature which
+        enables a guest to use a host webcam. This complements the
+        general USB passthrough support which was the typical way of
+        using host webcams in earlier versions. The webcam passthrough
+        support can handle non-USB video sources in theory, but this is
+        completely untested.
       </para>
 
       <note>
         <para>
-          The webcam passthrough module is shipped as part of the Oracle
-          VM VirtualBox extension pack, which must be installed
+          The webcam passthrough module is shipped as part of the
+          &product-name; extension pack, which must be installed
           separately. See <xref
         linkend="intro-installing" />.
@@ -1312,14 +1136,17 @@
 
       <para>
-        The host webcam can be attached to the VM using Devices menu in
-        the VM menu bar. The Webcams menu contains a list of available
-        video input devices on the host. Clicking on a webcam name
-        attaches or detaches the corresponding host device.
-      </para>
-
-      <para>
-        The VBoxManage command line tool can be used to enable webcam
-        passthrough. Please see the host-specific sections below for
-        additional details. The following commands are available:
+        The host webcam can be attached to the VM using the
+        <emphasis role="bold">Devices</emphasis> menu in the VM menu
+        bar. The <emphasis role="bold">Webcams</emphasis> menu contains
+        a list of available video input devices on the host. Clicking on
+        a webcam name attaches or detaches the corresponding host
+        device.
+      </para>
+
+      <para>
+        The <command>VBoxManage</command> command line tool can be used
+        to enable webcam passthrough. Please see the host-specific
+        sections below for additional details. The following commands
+        are available:
       </para>
 
@@ -1350,9 +1177,11 @@
         <listitem>
           <para>
-            Attach a webcam to a running VM:
+            Attach a webcam to a running VM, as follows:
+          </para>
 
 <screen>VBoxManage controlvm "VM name" webcam attach [host_path|alias [settings]]</screen>
 
-            This will attach a USB webcam device to the guest.
+          <para>
+            This attaches a USB webcam device to the guest.
           </para>
 
@@ -1396,19 +1225,21 @@
         <listitem>
           <para>
-            Detach a webcam from a running VM:
+            Detach a webcam from a running VM, as follows:
+          </para>
 
 <screen>VBoxManage controlvm "VM name" webcam detach [host_path|alias]</screen>
-          </para>
         </listitem>
 
         <listitem>
           <para>
-            List the webcams attached to a running VM:
+            List the webcams attached to a running VM, as follows:
+          </para>
 
 <screen>VBoxManage controlvm "VM name" webcam list</screen>
 
+          <para>
             The output contains the path or alias which was used in the
-            <computeroutput>webcam attach</computeroutput> command for
-            each attached webcam.
+            <command>webcam attach</command> command for each attached
+            webcam.
           </para>
         </listitem>
@@ -1448,5 +1279,5 @@
     <sect2 id="webcam-linux-hosts">
 
-      <title>Linux and Solaris Hosts</title>
+      <title>Linux and Oracle Solaris Hosts</title>
 
       <para>
@@ -1479,10 +1310,10 @@
 
       <para>
-        Apart from the standard VESA resolutions, the VirtualBox VESA
-        BIOS allows you to add up to 16 custom video modes which will be
-        reported to the guest operating system. When using Windows
-        guests with the VirtualBox Guest Additions, a custom graphics
-        driver will be used instead of the fallback VESA solution so
-        this information does not apply.
+        Apart from the standard VESA resolutions, the &product-name;
+        VESA BIOS enables you to add up to 16 custom video modes which
+        will be reported to the guest operating system. When using
+        Windows guests with the &product-name; Guest Additions, a custom
+        graphics driver will be used instead of the fallback VESA
+        solution so this information does not apply.
       </para>
 
@@ -1490,10 +1321,10 @@
         Additional video modes can be configured for each VM using the
         extra data facility. The extra data key is called
-        <literal>CustomVideoMode&lt;x&gt;</literal> with
-        <literal>x</literal> being a number from 1 to 16. Please note
-        that modes will be read from 1 until either the following number
-        is not defined or 16 is reached. The following example adds a
-        video mode that corresponds to the native display resolution of
-        many notebook computers:
+        <computeroutput>CustomVideoMode&lt;x&gt;</computeroutput> with
+        <computeroutput>x</computeroutput> being a number from 1 to 16.
+        Please note that modes will be read from 1 until either the
+        following number is not defined or 16 is reached. The following
+        example adds a video mode that corresponds to the native display
+        resolution of many notebook computers:
       </para>
 
@@ -1502,7 +1333,7 @@
       <para>
         The VESA mode IDs for custom video modes start at
-        <literal>0x160</literal>. In order to use the above defined
-        custom video mode, the following command line has be supplied to
-        Linux:
+        <computeroutput>0x160</computeroutput>. In order to use the
+        above defined custom video mode, the following command line has
+        to be supplied to Linux:
       </para>
 
@@ -1511,6 +1342,7 @@
 
       <para>
-        For guest operating systems with VirtualBox Guest Additions, a
-        custom video mode can be set using the video mode hint feature.
+        For guest operating systems with &product-name; Guest Additions,
+        a custom video mode can be set using the video mode hint
+        feature.
       </para>
 
@@ -1524,12 +1356,13 @@
       <para>
         When guest systems with the Guest Additions installed are
-        started using the graphical frontend, the normal VirtualBox
+        started using the graphical frontend, the normal &product-name;
         application, they will not be allowed to use screen resolutions
         greater than the host's screen size unless the user manually
         resizes them by dragging the window, switching to full screen or
-        seamless mode or sending a video mode hint using VBoxManage.
-        This behavior is what most users will want, but if you have
-        different needs, it is possible to change it by issuing one of
-        the following commands from the command line:
+        seamless mode or sending a video mode hint using
+        <command>VBoxManage</command>. This behavior is what most users
+        will want, but if you have different needs, it is possible to
+        change it by issuing one of the following commands from the
+        command line:
       </para>
 
@@ -1566,13 +1399,13 @@
 
       <para>
-        Starting with version 1.4, as an alternative to using virtual
-        disk images as described in <xref linkend="storage" />,
-        VirtualBox can also present either entire physical hard disks or
-        selected partitions as virtual disks to virtual machines.
-      </para>
-
-      <para>
-        With VirtualBox, this type of access is called <emphasis>raw
-        hard disk access</emphasis>. It allows a guest operating system
+        As an alternative to using virtual disk images as described in
+        <xref linkend="storage" />, &product-name; can also present
+        either entire physical hard disks or selected partitions as
+        virtual disks to virtual machines.
+      </para>
+
+      <para>
+        With &product-name;, this type of access is called <emphasis>raw
+        hard disk access</emphasis>. It enables a guest operating system
         to access its virtual hard disk without going through the host
         OS file system. The actual performance difference for image
@@ -1607,6 +1440,6 @@
         regular virtual disk image. For example, you can use the
         VirtualBox Manager, see <xref linkend="vdis" />, or
-        <computeroutput>VBoxManage</computeroutput> to assign the image
-        to a virtual machine.
+        <command>VBoxManage</command> to assign the image to a virtual
+        machine.
       </para>
 
@@ -1630,20 +1463,26 @@
           On a Linux host, to create an image that represents an entire
           physical hard disk which will not contain any actual data, as
-          this will all be stored on the physical disk, use the command
+          this will all be stored on the physical disk, use the
+          following command:
+        </para>
 
 <screen>VBoxManage internalcommands createrawvmdk -filename /path/to/file.vmdk
       -rawdisk /dev/sda</screen>
 
-          This creates the image <code>/path/to/file.vmdk</code>, which
+        <para>
+          This creates the image
+          <computeroutput>/path/to/file.vmdk</computeroutput>, which
           must be an absolute path. All data will be read and written
-          from <code>/dev/sda</code>.
+          from <computeroutput>/dev/sda</computeroutput>.
         </para>
 
         <para>
           On a Windows host, instead of the above device specification,
-          use e.g. <code>\\.\PhysicalDrive0</code>. On a Mac OS X host,
-          instead of the above device specification use e.g.
-          <code>/dev/disk1</code>. Note that on OS X you can only get
-          access to an entire disk if no volume is mounted from it.
+          for example use
+          <computeroutput>\\.\PhysicalDrive0</computeroutput>. On a Mac
+          OS X host, instead of the above device specification use for
+          example <computeroutput>/dev/disk1</computeroutput>. Note that
+          on OS X you can only get access to an entire disk if no volume
+          is mounted from it.
         </para>
 
@@ -1660,8 +1499,10 @@
           automatically attach the newly created image to a virtual
           machine. This can be done as follows:
+        </para>
 
 <screen>VBoxManage storageattach WindowsXP --storagectl "IDE Controller"
       --port 0 --device 0 --type hdd --medium /path/to/file.vmdk</screen>
 
+        <para>
           When this is done the selected virtual machine will boot from
           the specified physical disk.
@@ -1701,11 +1542,13 @@
           except for the additional
           <computeroutput>-partitions</computeroutput> parameter. This
-          example would create the image <code>/path/to/file.vmdk</code>
-          (which, again, must be absolute), and partitions 1 and 5 of
-          <code>/dev/sda</code> would be made accessible to the guest.
-        </para>
-
-        <para>
-          VirtualBox uses the same partition numbering as your Linux
+          example would create the image
+          <computeroutput>/path/to/file.vmdk</computeroutput>, which
+          must be absolute, and partitions 1 and 5 of
+          <computeroutput>/dev/sda</computeroutput> would be made
+          accessible to the guest.
+        </para>
+
+        <para>
+          &product-name; uses the same partition numbering as your Linux
           host. As a result, the numbers given in the above example
           would refer to the first primary partition and the first
@@ -1715,18 +1558,21 @@
         <para>
           On a Windows host, instead of the above device specification,
-          use e.g. <code>\\.\PhysicalDrive0</code>. On a Mac OS X host,
-          instead of the above device specification use
-          <code>/dev/disk1</code>, for example. Note that on OS X you
-          can only use partitions which are not mounted. Eject the
-          respective volume first. Partition numbers are the same on
-          Linux, Windows, and Mac OS X hosts.
+          use for example
+          <computeroutput>\\.\PhysicalDrive0</computeroutput>. On a Mac
+          OS X host, instead of the above device specification use
+          <computeroutput>/dev/disk1</computeroutput>, for example. Note
+          that on OS X you can only use partitions which are not
+          mounted. Eject the respective volume first. Partition numbers
+          are the same on Linux, Windows, and Mac OS X hosts.
         </para>
 
         <para>
           The numbers for the list of partitions can be taken from the
-          output of
+          output of the following command:
+        </para>
 
 <screen>VBoxManage internalcommands listpartitions -rawdisk /dev/sda</screen>
 
+        <para>
           The output lists the partition types and sizes to give the
           user enough information to identify the partitions necessary
@@ -1757,9 +1603,10 @@
           When used from a virtual machine, the image will then refer
           not to the entire disk, but only to the individual partitions.
-          In this example, <code>/dev/sda1</code> and
-          <code>/dev/sda5</code>. As a consequence, read/write access is
-          only required for the affected partitions, not for the entire
-          disk. During creation however, read-only access to the entire
-          disk is required to obtain the partitioning information.
+          In this example, <computeroutput>/dev/sda1</computeroutput>
+          and <computeroutput>/dev/sda5</computeroutput>. As a
+          consequence, read/write access is only required for the
+          affected partitions, not for the entire disk. During creation
+          however, read-only access to the entire disk is required to
+          obtain the partitioning information.
         </para>
 
@@ -1768,11 +1615,11 @@
           code of the created image. For example, to replace the Linux
           boot loader that is used on the host by another boot loader.
-          This allows for example the guest to boot directly to Windows,
-          while the host boots Linux from the "same" disk. For this
-          purpose the <computeroutput>-mbr</computeroutput> parameter is
-          provided. It specifies a file name from which to take the MBR
-          code. The partition table is not modified at all, so a MBR
-          file from a system with totally different partitioning can be
-          used. An example of this is:
+          This enables for example the guest to boot directly to
+          Windows, while the host boots Linux from the "same" disk. For
+          this purpose the <computeroutput>-mbr</computeroutput>
+          parameter is provided. It specifies a file name from which to
+          take the MBR code. The partition table is not modified at all,
+          so a MBR file from a system with totally different
+          partitioning can be used. An example of this is:
         </para>
 
@@ -1799,5 +1646,5 @@
 
       <para>
-        VirtualBox reports vendor product data for its virtual hard
+        &product-name; reports vendor product data for its virtual hard
         disks which consist of hard disk serial number, firmware
         revision and model number. These can be changed using the
@@ -1863,10 +1710,10 @@
     <sect2 id="iscsi-intnet">
 
-      <title>Access iSCSI Targets via Internal Networking</title>
-
-      <para>
-        As an experimental feature, VirtualBox allows for accessing an
-        iSCSI target running in a virtual machine which is configured
-        for using Internal Networking mode. See
+      <title>Access iSCSI Targets Using Internal Networking</title>
+
+      <para>
+        As an experimental feature, &product-name; enables access to an
+        iSCSI target running in a virtual machine which is configured to
+        use Internal Networking mode. See
         <xref linkend="storage-iscsi" />,
         <xref linkend="network_internal" />, and
@@ -1897,9 +1744,9 @@
         Finally the iSCSI disk must be attached with the
         <computeroutput>--intnet</computeroutput> option to tell the
-        iSCSI initiator to use internal networking:
+        iSCSI initiator to use internal networking, as follows:
+      </para>
 
 <screen>VBoxManage storageattach ... --medium iscsi
          --server 10.0.9.30 --target iqn.2008-12.com.sun:sampletarget --intnet</screen>
-      </para>
 
       <para>
@@ -1926,17 +1773,15 @@
 
     <para>
-      Starting with version 1.4, VirtualBox provided support for virtual
-      serial ports, which, at the time, was rather complicated to set up
-      with a sequence of <computeroutput>VBoxManage
-      setextradata</computeroutput> statements. Since version 1.5, that
-      way of setting up serial ports is no longer necessary and
+      In legacy releases, &product-name; provided support for virtual
+      serial ports. This was rather complicated to set up, requiring a
+      sequence of <command>VBoxManage setextradata</command> statements.
+      That method of setting up serial ports is no longer necessary and
       <emphasis>deprecated.</emphasis> To set up virtual serial ports,
-      use the methods described in <xref
-    linkend="serialports" />.
+      use the methods described in <xref linkend="serialports" />.
     </para>
 
     <note>
       <para>
-        For backwards compatibility, the old
+        For backwards compatibility, the legacy
         <computeroutput>setextradata</computeroutput> statements, whose
         description is retained below from the old version of the
@@ -1949,6 +1794,6 @@
 
     <para>
-      The old sequence of configuring a serial port used the following
-      commands:
+      The legacy sequence of configuring a serial port used the
+      following commands:
     </para>
 
@@ -1977,8 +1822,8 @@
       <computeroutput>Location</computeroutput> can be chosen more
       freely. Local domain sockets can be placed anywhere, provided the
-      user running VirtualBox has the permission to create a new file in
-      the directory. The final command above defines that VirtualBox
-      acts as a server. It creates the named pipe itself instead of
-      connecting to an already existing one.
+      user running &product-name; has the permission to create a new
+      file in the directory. The final command above defines that
+      &product-name; acts as a server. It creates the named pipe itself
+      instead of connecting to an already existing one.
     </para>
 
@@ -1987,5 +1832,5 @@
   <sect1 id="changenat">
 
-    <title>Fine Tuning the VirtualBox NAT Engine</title>
+    <title>Fine Tuning the &product-name; NAT Engine</title>
 
     <sect2 id="nat-address-config">
@@ -2030,13 +1875,13 @@
 
       <para>
-        For network booting in NAT mode, by default VirtualBox uses a
-        built-in TFTP server at the IP address 10.0.2.4. This default
+        For network booting in NAT mode, by default &product-name; uses
+        a built-in TFTP server at the IP address 10.0.2.4. This default
         behavior should work fine for typical remote-booting scenarios.
         However, it is possible to change the boot server IP and the
         location of the boot image with the following commands:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --nattftpserver1 10.0.2.2
 VBoxManage modifyvm "VM name" --nattftpfile1 /srv/tftp/boot/MyPXEBoot.pxe</screen>
-      </para>
 
     </sect2>
@@ -2047,14 +1892,16 @@
 
       <para>
-        The VirtualBox NAT stack performance is often determined by its
-        interaction with the host's TCP/IP stack and the size of several
-        buffers (<computeroutput>SO_RCVBUF</computeroutput> and
-        <computeroutput>SO_SNDBUF</computeroutput>). For certain setups
+        The &product-name; NAT stack performance is often determined by
+        its interaction with the host's TCP/IP stack and the size of
+        several buffers, <computeroutput>SO_RCVBUF</computeroutput> and
+        <computeroutput>SO_SNDBUF</computeroutput>. For certain setups
         users might want to adjust the buffer size for a better
         performance. This can by achieved using the following commands,
         where values are in kilobytes and can range from 8 to 1024:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --natsettings1 16000,128,128,0,0</screen>
 
+      <para>
         This example illustrates tuning the NAT settings. The first
         parameter is the MTU, then the size of the socket's send buffer
@@ -2077,18 +1924,20 @@
 
       <para>
-        By default, VirtualBox's NAT engine will route TCP/IP packets
-        through the default interface assigned by the host's TCP/IP
-        stack. The technical reason for this is that the NAT engine uses
-        sockets for communication. If you want to change this behavior,
-        you can tell the NAT engine to bind to a particular IP address
-        instead. Use the following command:
+        By default, &product-name;'s NAT engine will route TCP/IP
+        packets through the default interface assigned by the host's
+        TCP/IP stack. The technical reason for this is that the NAT
+        engine uses sockets for communication. If you want to change
+        this behavior, you can tell the NAT engine to bind to a
+        particular IP address instead. For example, use the following
+        command:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --natbindip1 "10.45.0.2"</screen>
-      </para>
 
       <para>
         After this, all outgoing traffic will be sent through the
-        interface with the IP address 10.45.0.2. Please make sure that
-        this interface is up and running prior to this assignment.
+        interface with the IP address 10.45.0.2. Ensure that this
+        interface is up and running before changing the NAT bind
+        address.
       </para>
 
@@ -2120,7 +1969,7 @@
         offers a list of registered DNS servers of the host. If for some
         reason you need to hide this DNS server list and use the host's
-        resolver settings, thereby forcing the VirtualBox NAT engine to
-        intercept DNS requests and forward them to host's resolver, use
-        the following command:
+        resolver settings, thereby forcing the &product-name; NAT engine
+        to intercept DNS requests and forward them to host's resolver,
+        use the following command:
       </para>
 
@@ -2142,5 +1991,5 @@
           In some cases it might be useful to intercept the name
           resolving mechanism, providing a user-defined IP address on a
-          particular DNS request. The intercepting mechanism allows the
+          particular DNS request. The intercepting mechanism enables the
           user to map not only a single host but domains and even more
           complex naming conventions if required.
@@ -2209,13 +2058,13 @@
         protocols might need a more transparent behavior or may depend
         on the real port number the packet was sent from. It is possible
-        to change the NAT mode via the VBoxManage frontend with the
-        following commands:
+        to change the NAT mode using the <command>VBoxManage</command>
+        frontend with the following commands:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --nataliasmode1 proxyonly</screen>
 
-        and
-
 <screen>VBoxManage modifyvm "Linux Guest" --nataliasmode1 sameports</screen>
 
+      <para>
         The first example disables aliasing and switches NAT into
         transparent mode, the second example enforces preserving of port
@@ -2232,9 +2081,10 @@
 
     <para>
-      The DMI data that VirtualBox provides to guests can be changed for
-      a specific VM. Use the following commands to configure the DMI
+      The DMI data that &product-name; provides to guests can be changed
+      for a specific VM. Use the following commands to configure the DMI
       BIOS information. In case your VM is configured to use EFI
-      firmware you need to replace <code>pcbios</code> by
-      <code>efi</code> in the keys.
+      firmware you need to replace
+      <computeroutput>pcbios</computeroutput> by
+      <computeroutput>efi</computeroutput> in the keys.
     </para>
 
@@ -2347,5 +2197,5 @@
 
     <para>
-      If a DMI string is not set, the default value of VirtualBox is
+      If a DMI string is not set, the default value of &product-name; is
       used. To set an empty string use
       <computeroutput>"&lt;EMPTY&gt;"</computeroutput>.
@@ -2370,12 +2220,14 @@
       information of the host to the guest to prevent Windows from
       asking for a new product key. On Linux hosts, the DMI BIOS
-      information can be obtained with:
+      information can be obtained with the following command:
+    </para>
 
 <screen>dmidecode -t0</screen>
 
-      The DMI system information can be obtained with:
+    <para>
+      The DMI system information can be obtained as follows:
+    </para>
 
 <screen>dmidecode -t1</screen>
-    </para>
 
   </sect1>
@@ -2386,8 +2238,9 @@
 
     <para>
-      VirtualBox can be configured to present up to four custom ACPI tables
-      to the guest. A command such as the following can be used to configure
-      custom ACPI tables (note that CustomTable1, CustomTable2, and
-      CustomTable3 are available in addition to CustomTable0):
+      &product-name; can be configured to present up to four custom ACPI
+      tables to the guest. A command such as the following can be used
+      to configure custom ACPI tables. Note that CustomTable1,
+      CustomTable2, and CustomTable3 are available in addition to
+      CustomTable0.
     </para>
 
@@ -2396,11 +2249,9 @@
 
     <para>
-      Configuring custom ACPI tables can for example avoid the need to
-      ask for a new product key in Windows Vista/7/8 and later guests.
-    </para>
-
-    <para>
-      On Linux hosts, one of the system's ACPI tables can be read from
-      <filename>/sys/firmware/acpi/tables/</filename>.
+      Configuring custom ACPI tables can for example avoid the need for
+      asking for a new product key on Windows Vista, Windows 7, Windows
+      8 and later guests. On Linux hosts, one of the system's ACPI
+      tables can be read from
+      <computeroutput>/sys/firmware/acpi/tables/</computeroutput>.
     </para>
 
@@ -2417,7 +2268,7 @@
 
       <para>
-        By default, VirtualBox keeps all sources of time visible to the
-        guest synchronized to a single time source, the monotonic host
-        time. This reflects the assumptions of many guest operating
+        By default, &product-name; keeps all sources of time visible to
+        the guest synchronized to a single time source, the monotonic
+        host time. This reflects the assumptions of many guest operating
         systems, which expect all time sources to reflect "wall clock"
         time. In special circumstances it may be useful however to make
@@ -2478,5 +2329,5 @@
         that any time synchronization mechanism will frequently try to
         resynchronize the guest clock with the reference clock, which is
-        the host clock if the VirtualBox Guest Additions are active.
+        the host clock if the &product-name; Guest Additions are active.
         Therefore any time synchronization should be disabled if the
         rate of the guest clock is changed as described above. See
@@ -2491,8 +2342,8 @@
 
       <para>
-        The VirtualBox Guest Additions ensure that the guest's system
-        time is synchronized with the host time. There are several
-        parameters which can be tuned. The parameters can be set for a
-        specific VM using the following command:
+        The &product-name; Guest Additions ensure that the guest's
+        system time is synchronized with the host time. There are
+        several parameters which can be tuned. The parameters can be set
+        for a specific VM using the following command:
       </para>
 
@@ -2604,7 +2455,7 @@
             <para>
               Set the time after the VM was restored from a saved state
-              when passing 1 as parameter (default). Disable by passing
-              0. In the latter case, the time will be adjusted smoothly
-              which can take a long time.
+              when passing 1 as parameter. This is the default. Disable
+              by passing 0. In the latter case, the time will be
+              adjusted smoothly, which can take a long time.
             </para>
           </listitem>
@@ -2625,8 +2476,8 @@
 
       <para>
-        Once installed and started, the VirtualBox Guest Additions will
-        try to synchronize the guest time with the host time. This can
-        be prevented by forbidding the guest service from reading the
-        host clock:
+        Once installed and started, the &product-name; Guest Additions
+        will try to synchronize the guest time with the host time. This
+        can be prevented by forbidding the guest service from reading
+        the host clock:
       </para>
 
@@ -2639,11 +2490,12 @@
   <sect1 id="vboxbowsolaris11">
 
-    <title>Installing the Alternate Bridged Networking Driver on Solaris 11 hosts</title>
-
-    <para>
-      Starting with VirtualBox 4.1, VirtualBox ships a new network
-      filter driver that utilizes Solaris 11's Crossbow functionality.
-      By default, this new driver is installed for Solaris 11 hosts
-      (builds 159 and above) that has support for it.
+    <title>Installing the Alternate Bridged Networking Driver on Oracle Solaris 11
+      hosts</title>
+
+    <para>
+      &product-name; includes a network filter driver that utilizes
+      Oracle Solaris 11's Crossbow functionality. By default, this new
+      driver is installed for Oracle Solaris 11 hosts, builds 159 and
+      above, that have support for it.
     </para>
 
@@ -2651,5 +2503,5 @@
       To force installation of the older STREAMS based network filter
       driver, execute as root the following command before installing
-      the VirtualBox package:
+      the &product-name; package:
     </para>
 
@@ -2659,5 +2511,5 @@
       To force installation of the Crossbow based network filter driver,
       execute as root the following command before installing the
-      VirtualBox package:
+      &product-name; package:
     </para>
 
@@ -2665,5 +2517,5 @@
 
     <para>
-      To check which driver is currently being used by VirtualBox,
+      To check which driver is currently being used by &product-name;,
       execute:
     </para>
@@ -2672,6 +2524,6 @@
 
     <para>
-      If the output contains "vboxbow", it indicates VirtualBox is using
-      the Crossbow network filter driver, while the name "vboxflt"
+      If the output contains "vboxbow", it indicates &product-name; is
+      using the Crossbow network filter driver, while the name "vboxflt"
       indicates usage of the older STREAMS network filter.
     </para>
@@ -2681,41 +2533,24 @@
   <sect1 id="vboxbowvnictemplates">
 
-    <title>VirtualBox VNIC Templates for VLANs on Solaris 11 Hosts</title>
-
-    <para>
-      VirtualBox supports Virtual Network Interface (VNIC) templates for
-      configuring VMs over VLANs.
-
-      <footnote>
-
-        <para>
-          Support for Crossbow based bridged networking was introduced
-          with VirtualBox 4.1 and requires Solaris 11 build 159 or
-          above.
-        </para>
-
-      </footnote>
-
-      A VirtualBox VNIC template is a VNIC whose name starts with
-      "vboxvnic_template". The string is case-sensitive.
-    </para>
-
-    <para>
-      On Solaris 11 hosts, a VNIC template may be used to specify the
-      VLAN ID to use while bridging over a network link.
-
-      <footnote>
-
-        <para>
-          When Crossbow based bridged networking is used.
-        </para>
-
-      </footnote>
-    </para>
-
-    <para>
-      Here is an example of how to use a VNIC template to configure a VM
-      over a VLAN. Create a VirtualBox VNIC template, by executing as
-      root:
+    <title>&product-name; VNIC Templates for VLANs on Oracle Solaris 11 Hosts</title>
+
+    <para>
+      &product-name; supports Virtual Network Interface (VNIC) templates
+      for configuring VMs over VLANs. An &product-name; VNIC template is
+      a VNIC whose name starts with
+      <computeroutput>vboxvnic_template</computeroutput>. The string is
+      case-sensitive.
+    </para>
+
+    <para>
+      On Oracle Solaris 11 hosts, when Crossbow-based bridged networking
+      is used, a VNIC template may be used to specify the VLAN ID to use
+      while bridging over a network link.
+    </para>
+
+    <para>
+      The following is an example of how to use a VNIC template to
+      configure a VM over a VLAN. Create an &product-name; VNIC
+      template, by executing as root:
     </para>
 
@@ -2727,8 +2562,7 @@
       across host reboots, skip the <computeroutput>-t</computeroutput>
       parameter in the above command. You may check the current state of
-      links using:
-    </para>
-
-    <para>
+      links using the following command:
+    </para>
+
 <screen>$ dladm show-link
 LINK        CLASS     MTU    STATE    BRIDGE     OVER
@@ -2740,10 +2574,9 @@
 LINK         OVER         SPEED  MACADDRESS        MACADDRTYPE         VID
 vboxvnic_template0 nge0   1000   2:8:20:25:12:75   random              23</screen>
-    </para>
 
     <para>
       Once the VNIC template is created, any VMs that need to be on VLAN
-      23 over the interface "nge0" can be configured to bridge using
-      this VNIC template.
+      23 over the interface <computeroutput>nge0</computeroutput> can be
+      configured to bridge using this VNIC template.
     </para>
 
@@ -2753,11 +2586,11 @@
       configuration but rather inherited from the VNIC template while
       starting the VM. The VNIC template itself can be modified anytime
-      using <computeroutput>dladm</computeroutput>.
+      using the <command>dladm</command> command.
     </para>
 
     <para>
       VNIC templates can be created with additional properties such as
-      bandwidth limits, CPU fanout etc. Refer to your Solaris network
-      documentation on how to accomplish this. These additional
+      bandwidth limits, CPU fanout etc. Refer to your Oracle Solaris
+      network documentation on how to accomplish this. These additional
       properties, if any, are also applied to VMs which bridge using the
       VNIC template.
@@ -2768,11 +2601,12 @@
   <sect1 id="addhostonlysolaris">
 
-    <title>Configuring Multiple Host-Only Network Interfaces on Solaris Hosts</title>
-
-    <para>
-      By default VirtualBox provides you with one host-only network
-      interface. Adding more host-only network interfaces on Solaris
-      hosts requires manual configuration. Here is how to add another
-      host-only network interface.
+    <title>Configuring Multiple Host-Only Network Interfaces on Oracle Solaris
+      Hosts</title>
+
+    <para>
+      By default &product-name; provides you with one host-only network
+      interface. Adding more host-only network interfaces on Oracle
+      Solaris hosts requires manual configuration. Here is how to add
+      another host-only network interface.
     </para>
 
@@ -2815,7 +2649,7 @@
 
     <para>
-      On Solaris 11.1 and newer hosts you may want to rename the default
-      vanity interface name. To check what name has been assigned,
-      execute:
+      On Oracle Solaris 11.1 and newer hosts you may want to rename the
+      default vanity interface name. To check what name has been
+      assigned, execute:
     </para>
 
@@ -2849,7 +2683,7 @@
       are using NWAM <computeroutput>/etc/nwam/llp</computeroutput> and
       add the appropriate entries to set the netmask and static IP for
-      each of those interfaces. The VirtualBox installer only updates
-      these configuration files for the one "vboxnet0" interface it
-      creates by default.
+      each of those interfaces. The &product-name; installer only
+      updates these configuration files for the one "vboxnet0" interface
+      it creates by default.
     </para>
 
@@ -2858,50 +2692,48 @@
   <sect1 id="solariscodedumper">
 
-    <title>Configuring the VirtualBox CoreDumper on Solaris Hosts</title>
-
-    <para>
-      VirtualBox is capable of producing its own core files for
+    <title>Configuring the &product-name; CoreDumper on Oracle Solaris Hosts</title>
+
+    <para>
+      &product-name; is capable of producing its own core files for
       extensive debugging when things go wrong. Currently this is only
-      available on Solaris hosts.
-    </para>
-
-    <para>
-      The VirtualBox CoreDumper can be enabled using the following
+      available on Oracle Solaris hosts.
+    </para>
+
+    <para>
+      The &product-name; CoreDumper can be enabled using the following
       command:
     </para>
 
-    <para>
 <screen>VBoxManage setextradata "VM name" VBoxInternal2/CoreDumpEnabled 1</screen>
-    </para>
 
     <para>
       You can specify which directory to use for core dumps with this
-      command:
-    </para>
-
-    <para>
+      command, as follows:
+    </para>
+
 <screen>VBoxManage setextradata "VM name" VBoxInternal2/CoreDumpDir &lt;path-to-directory&gt;</screen>
 
+    <para>
       Make sure the directory you specify is on a volume with sufficient
-      free space and that the VirtualBox process has sufficient
+      free space and that the &product-name; process has sufficient
       permissions to write files to this directory. If you skip this
       command and do not specify any core dump directory, the current
-      directory of the VirtualBox executable will be used. This would
-      most likely fail when writing cores as they are protected with
-      root permissions. It is recommended you explicitly set a core dump
-      directory.
-    </para>
-
-    <para>
-      You must specify when the VirtualBox CoreDumper should be
+      directory of the &product-name; executable will be used. This
+      would most likely fail when writing cores as they are protected
+      with root permissions. It is recommended you explicitly set a core
+      dump directory.
+    </para>
+
+    <para>
+      You must specify when the &product-name; CoreDumper should be
       triggered. This is done using the following commands:
     </para>
 
-    <para>
 <screen>VBoxManage setextradata "VM name" VBoxInternal2/CoreDumpReplaceSystemDump 1
 VBoxManage setextradata "VM name" VBoxInternal2/CoreDumpLive 1</screen>
 
+    <para>
       At least one of the above two commands will have to be provided if
-      you have enabled the VirtualBox CoreDumper.
+      you have enabled the &product-name; CoreDumper.
     </para>
 
@@ -2909,5 +2741,5 @@
       Setting <computeroutput>CoreDumpReplaceSystemDump</computeroutput>
       sets up the VM to override the host's core dumping mechanism and
-      in the event of any crash only the VirtualBox CoreDumper would
+      in the event of any crash only the &product-name; CoreDumper would
       produce the core file.
     </para>
@@ -2918,13 +2750,13 @@
       <computeroutput>SIGUSR2</computeroutput> signal. After producing
       the core file, the VM will not be terminated and will continue to
-      run. You can thus take cores of the VM process using:
-    </para>
-
-    <para>
+      run. You can thus take cores of the VM process using the following
+      command:
+    </para>
+
 <screen>kill -s SIGUSR2 &lt;VM-process-id&gt;</screen>
-    </para>
-
-    <para>
-      Core files produced by the VirtualBox CoreDumper are of the form
+
+    <para>
+      Core files produced by the &product-name; CoreDumper are of the
+      form
       <computeroutput>core.vb.&lt;ProcessName&gt;.&lt;ProcessID&gt;</computeroutput>,
       for example
@@ -2936,27 +2768,27 @@
   <sect1 id="vboxandsolzvmm">
 
-    <title>VirtualBox and Solaris Kernel Zones</title>
-
-    <para>
-      Solaris kernel zones on x86-based systems make use of
-      hardware-assisted virtualization features like VirtualBox does.
-      However, for kernel zones and VirtualBox to share this hardware
-      resource, they need to co-operate.
-    </para>
-
-    <para>
-      By default, due to performance reasons, VirtualBox acquires the
-      hardware-assisted virtualization resource (VT-x/AMD-V) globally on
-      the host machine and uses it until the last VirtualBox VM that
-      requires it is powered off. This prevents other software from
-      using VT-x/AMD-V during the time VirtualBox has taken control of
-      it.
-    </para>
-
-    <para>
-      VirtualBox can be instructed to relinquish use of
+    <title>&product-name; and Oracle Solaris Kernel Zones</title>
+
+    <para>
+      Oracle Solaris kernel zones on x86-based systems make use of
+      hardware-assisted virtualization features like &product-name;
+      does. However, for kernel zones and &product-name; to share this
+      hardware resource, they need to cooperate.
+    </para>
+
+    <para>
+      By default, due to performance reasons, &product-name; acquires
+      the hardware-assisted virtualization resource (VT-x/AMD-V)
+      globally on the host machine and uses it until the last
+      &product-name; VM that requires it is powered off. This prevents
+      other software from using VT-x/AMD-V during the time
+      &product-name; has taken control of it.
+    </para>
+
+    <para>
+      &product-name; can be instructed to relinquish use of
       hardware-assisted virtualization features when not executing guest
       code, thereby allowing kernel zones to make use of them. To do
-      this, shutdown all VirtualBox VMs and execute the following
+      this, shutdown all &product-name; VMs and execute the following
       command:
     </para>
@@ -2966,6 +2798,7 @@
     <para>
       This command needs to be executed only once as the setting is
-      stored as part of the global VirtualBox settings which will
-      continue to persist across host-reboots and VirtualBox upgrades.
+      stored as part of the global &product-name; settings which will
+      continue to persist across host-reboots and &product-name;
+      upgrades.
     </para>
 
@@ -2974,19 +2807,17 @@
   <sect1 id="guitweaks">
 
-    <title>Locking Down the VirtualBox GUI</title>
+    <title>Locking Down the &product-name; GUI</title>
 
     <sect2 id="customize-vm-manager">
 
-      <title>Customizing the VM Manager</title>
+      <title>Customizing the VirtualBox Manager</title>
 
       <para>
         There are several advanced customization settings for locking
-        down the VirtualBox manager. Locking down means removing some
+        down the VirtualBox Manager. Locking down means removing some
         features that the user should not see.
       </para>
 
-      <para>
 <screen>VBoxManage setextradata global GUI/Customizations OPTION[,OPTION...]</screen>
-      </para>
 
       <para>
@@ -3004,5 +2835,5 @@
           <listitem>
             <para>
-              Do not allow users to start the VirtualBox manager. Trying
+              Do not allow users to start the VirtualBox Manager. Trying
               to do so will show a window containing a proper error
               message.
@@ -3038,8 +2869,9 @@
 
       <para>
-        To disable any of these VM manager customizations do
+        To disable any of these VM manager customizations use the
+        following command:
+      </para>
 
 <screen>VBoxManage setextradata global GUI/Customizations</screen>
-      </para>
 
     </sect2>
@@ -3084,5 +2916,6 @@
           <listitem>
             <para>
-              Do not allow the user to open the settings dialog for a
+              Do not allow the user to open the
+              <emphasis role="bold">Settings</emphasis> dialog for a
               certain VM.
             </para>
@@ -3132,6 +2965,6 @@
       <para>
         Please note that these settings would not prevent the user from
-        reconfiguring the VM by <computeroutput>VBoxManage
-        modifyvm</computeroutput>.
+        reconfiguring the VM by using <command>VBoxManage
+        modifyvm</command>.
       </para>
 
@@ -3163,6 +2996,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>General</emphasis> settings
-              pane.
+              Do not show the <emphasis role="bold">General</emphasis>
+              settings pane.
             </para>
           </listitem>
@@ -3176,5 +3009,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Input</emphasis> settings pane.
+              Do not show the <emphasis role="bold">Input</emphasis>
+              settings pane.
             </para>
           </listitem>
@@ -3188,5 +3022,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Update</emphasis> settings pane.
+              Do not show the <emphasis role="bold">Update</emphasis>
+              settings pane.
             </para>
           </listitem>
@@ -3200,6 +3035,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Language</emphasis> settings
-              pane.
+              Do not show the <emphasis role="bold">Language</emphasis>
+              settings pane.
             </para>
           </listitem>
@@ -3213,6 +3048,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Display</emphasis> settings
-              pane.
+              Do not show the <emphasis role="bold">Display</emphasis>
+              settings pane.
             </para>
           </listitem>
@@ -3226,6 +3061,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Network</emphasis> settings
-              pane.
+              Do not show the <emphasis role="bold">Network</emphasis>
+              settings pane.
             </para>
           </listitem>
@@ -3239,6 +3074,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Extensions</emphasis> settings
-              pane.
+              Do not show the
+              <emphasis role="bold">Extensions</emphasis> settings pane.
             </para>
           </listitem>
@@ -3252,5 +3087,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Proxy</emphasis> settings pane.
+              Do not show the <emphasis role="bold">Proxy</emphasis>
+              settings pane.
             </para>
           </listitem>
@@ -3305,6 +3141,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Machine</emphasis> menu in the
-              VM window.
+              Do not show the <emphasis role="bold">Machine</emphasis>
+              menu in the VM window.
             </para>
           </listitem>
@@ -3318,6 +3154,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>View</emphasis> menu in the VM
-              window.
+              Do not show the <emphasis role="bold">View</emphasis> menu
+              in the VM window.
             </para>
           </listitem>
@@ -3331,6 +3167,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Devices</emphasis> menu in the
-              VM window.
+              Do not show the <emphasis role="bold">Devices</emphasis>
+              menu in the VM window.
             </para>
           </listitem>
@@ -3344,6 +3180,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Help</emphasis> menu in the VM
-              window.
+              Do not show the <emphasis role="bold">Help</emphasis> menu
+              in the VM window.
             </para>
           </listitem>
@@ -3357,8 +3193,8 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Debug</emphasis> menu in the VM
-              window. The debug menu is only visible if the GUI was
-              started with special command line parameters or
-              environment variable settings.
+              Do not show the <emphasis role="bold">Debug</emphasis>
+              menu in the VM window. The Debug menu is only visible if
+              the GUI was started with special command line parameters
+              or environment variable settings.
             </para>
           </listitem>
@@ -3377,6 +3213,6 @@
         You can also disable, or blacklist, certain menu actions of
         certain menus. Use the following command to disable certain
-        actions of the <emphasis>Application</emphasis> menu. This is
-        only available on Mac OS X hosts.
+        actions of the <emphasis role="bold">Application</emphasis>
+        menu. This is only available on Mac OS X hosts.
       </para>
 
@@ -3409,6 +3245,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>About</emphasis> menu item in
-              this menu.
+              Do not show the <emphasis role="bold">About</emphasis>
+              menu item in this menu.
             </para>
           </listitem>
@@ -3426,5 +3262,5 @@
       <para>
         Use the following command to disable certain actions of the
-        <emphasis>Machine</emphasis> menu:
+        <emphasis role="bold">Machine</emphasis> menu:
       </para>
 
@@ -3457,6 +3293,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Settings</emphasis> menu item in
-              this menu.
+              Do not show the <emphasis role="bold">Settings</emphasis>
+              menu item in this menu.
             </para>
           </listitem>
@@ -3470,6 +3306,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Take Snapshot</emphasis> menu
-              item in this menu.
+              Do not show the <emphasis role="bold">Take
+              Snapshot</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3483,6 +3319,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Take Screenshot</emphasis> menu
-              item in this menu.
+              Do not show the <emphasis role="bold">Take
+              Screenshot</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3496,6 +3332,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Session Information</emphasis>
-              menu item in this menu.
+              Do not show the <emphasis role="bold">Session
+              Information</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3509,5 +3345,5 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Disable Mouse
+              Do not show the <emphasis role="bold">Disable Mouse
               Integration</emphasis> menu item in this menu.
             </para>
@@ -3522,6 +3358,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Insert Ctrl+Alt+Del</emphasis>
-              menu item in this menu.
+              Do not show the <emphasis role="bold">Insert
+              Ctrl+Alt+Del</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3535,5 +3371,5 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Insert
+              Do not show the <emphasis role="bold">Insert
               Ctrl+Alt+Backspace</emphasis> menu item in this menu.
               Available on X11 hosts only.
@@ -3549,6 +3385,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Pause</emphasis> menu item in
-              this menu.
+              Do not show the <emphasis role="bold">Pause</emphasis>
+              menu item in this menu.
             </para>
           </listitem>
@@ -3562,6 +3398,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Reset</emphasis> menu item in
-              this menu.
+              Do not show the <emphasis role="bold">Reset</emphasis>
+              menu item in this menu.
             </para>
           </listitem>
@@ -3575,5 +3411,5 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Save the machine
+              Do not show the <emphasis role="bold">Save the machine
               state</emphasis> menu item in this menu.
             </para>
@@ -3588,6 +3424,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>ACPI Shutdown</emphasis> menu
-              item in this menu.
+              Do not show the <emphasis role="bold">ACPI
+              Shutdown</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3601,6 +3437,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Power Off the machine</emphasis>
-              menu item in this menu.
+              Do not show the <emphasis role="bold">Power Off the
+              machine</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3618,5 +3454,5 @@
       <para>
         Use the following command to disable certain actions of the
-        <emphasis>View</emphasis> menu:
+        <emphasis role="bold">View</emphasis> menu:
       </para>
 
@@ -3649,6 +3485,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Switch to Fullscreen</emphasis>
-              menu item in this menu.
+              Do not show the <emphasis role="bold">Switch to
+              Fullscreen</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3662,5 +3498,5 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Switch to Seamless
+              Do not show the <emphasis role="bold">Switch to Seamless
               Mode</emphasis> menu item in this menu.
             </para>
@@ -3675,6 +3511,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Switch to Scaled Mode</emphasis>
-              menu item in this menu.
+              Do not show the <emphasis role="bold">Switch to Scaled
+              Mode</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3688,5 +3524,5 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Auto-resize Guest
+              Do not show the <emphasis role="bold">Auto-resize Guest
               Display</emphasis> menu item in this menu.
             </para>
@@ -3701,6 +3537,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Adjust Window Size</emphasis>
-              menu item in this menu.
+              Do not show the <emphasis role="bold">Adjust Window
+              Size</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3714,6 +3550,7 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Multiscreen</emphasis> menu item
-              in this menu. Only visible in full screen/seamless mode.
+              Do not show the
+              <emphasis role="bold">Multiscreen</emphasis> menu item in
+              this menu. Only visible in full screen/seamless mode.
             </para>
           </listitem>
@@ -3731,5 +3568,5 @@
       <para>
         Use the following command to disable certain actions of the
-        <emphasis>View</emphasis> menu:
+        <emphasis role="bold">View</emphasis> menu:
       </para>
 
@@ -3739,5 +3576,5 @@
         where <computeroutput>OPTION</computeroutput> is one of the
         following keywords to disable actions in the
-        <emphasis>Devices</emphasis> menu:
+        <emphasis role="bold">Devices</emphasis> menu:
       </para>
 
@@ -3763,6 +3600,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>CD/DVD Devices</emphasis> menu
-              item in this menu.
+              Do not show the <emphasis role="bold">CD/DVD
+              Devices</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3776,6 +3613,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Floppy Devices</emphasis> menu
-              item in this menu.
+              Do not show the <emphasis role="bold">Floppy
+              Devices</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3789,6 +3626,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>USB Devices</emphasis> menu item
-              in this menu.
+              Do not show the <emphasis role="bold">USB
+              Devices</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3802,6 +3639,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Shared Clipboard</emphasis> menu
-              item in this menu.
+              Do not show the <emphasis role="bold">Shared
+              Clipboard</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3815,6 +3652,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Drag and Drop</emphasis> menu
-              item in this menu.
+              Do not show the <emphasis role="bold">Drag and
+              Drop</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3828,6 +3665,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Network Settings...</emphasis>
-              menu item in this menu.
+              Do not show the <emphasis role="bold">Network
+              Settings...</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3841,5 +3678,5 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Shared Folders
+              Do not show the <emphasis role="bold">Shared Folders
               Settings...</emphasis> menu item in this menu.
             </para>
@@ -3854,6 +3691,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Remove Display</emphasis> menu
-              item in this menu.
+              Do not show the <emphasis role="bold">Remove
+              Display</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3867,6 +3704,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Insert Guest Additions CD
-              image...</emphasis> menu item in this menu.
+              Do not show the <emphasis role="bold">Insert Guest
+              Additions CD image...</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3884,5 +3721,5 @@
       <para>
         Use the following command to disable certain actions of the
-        <emphasis>View</emphasis> menu:
+        <emphasis role="bold">View</emphasis> menu:
       </para>
 
@@ -3917,6 +3754,7 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Statistics...</emphasis> menu
-              item in this menu.
+              Do not show the
+              <emphasis role="bold">Statistics...</emphasis> menu item
+              in this menu.
             </para>
           </listitem>
@@ -3930,6 +3768,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Command Line...</emphasis> menu
-              item in this menu.
+              Do not show the <emphasis role="bold">Command
+              Line...</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3943,6 +3781,7 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Logging...</emphasis> menu item
-              in this menu.
+              Do not show the
+              <emphasis role="bold">Logging...</emphasis> menu item in
+              this menu.
             </para>
           </listitem>
@@ -3956,6 +3795,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Show Log...</emphasis> menu item
-              in this menu.
+              Do not show the <emphasis role="bold">Show
+              Log...</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3973,5 +3812,5 @@
       <para>
         Use the following command to disable certain actions of the
-        <emphasis>View</emphasis> menu:
+        <emphasis role="bold">View</emphasis> menu:
       </para>
 
@@ -3981,6 +3820,6 @@
         where <computeroutput>OPTION</computeroutput> is one of the
         following keywords to disable actions in the
-        <emphasis>Help</emphasis> menu, which is normally completely
-        disabled:
+        <emphasis role="bold">Help</emphasis> menu, which is normally
+        completely disabled:
       </para>
 
@@ -4006,6 +3845,7 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Contents...</emphasis> menu item
-              in this menu.
+              Do not show the
+              <emphasis role="bold">Contents...</emphasis> menu item in
+              this menu.
             </para>
           </listitem>
@@ -4019,5 +3859,5 @@
           <listitem>
             <para>
-              Do not show the <emphasis>VirtualBox Web
+              Do not show the <emphasis role="bold">VirtualBox Web
               Site...</emphasis> menu item in this menu.
             </para>
@@ -4032,6 +3872,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Reset All Warnings</emphasis>
-              menu item in this menu.
+              Do not show the <emphasis role="bold">Reset All
+              Warnings</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -4045,5 +3885,5 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Network Operations
+              Do not show the <emphasis role="bold">Network Operations
               Manager</emphasis> menu item in this menu.
             </para>
@@ -4058,6 +3898,6 @@
           <listitem>
             <para>
-              Do not show the <emphasis>About</emphasis> menu item in
-              this menu. Only for non-Mac OS X hosts.
+              Do not show the <emphasis role="bold">About</emphasis>
+              menu item in this menu. Only for non-Mac OS X hosts.
             </para>
           </listitem>
@@ -4071,6 +3911,7 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Contents...</emphasis> menu item
-              in this menu.
+              Do not show the
+              <emphasis role="bold">Contents...</emphasis> menu item in
+              this menu.
             </para>
           </listitem>
@@ -4084,6 +3925,7 @@
           <listitem>
             <para>
-              Do not show the <emphasis>Contents...</emphasis> menu item
-              in this menu.
+              Do not show the
+              <emphasis role="bold">Contents...</emphasis> menu item in
+              this menu.
             </para>
           </listitem>
@@ -4331,5 +4173,5 @@
         To disable all Host key combinations, open the preferences and
         change the Host key to None. This might be useful when using
-        VirtualBox in a kiosk mode.
+        &product-name; in a kiosk mode.
       </para>
 
@@ -4352,119 +4194,248 @@
           <thead>
             <row>
-              <entry><emphasis role="bold">Action</emphasis></entry>
-              <entry><emphasis role="bold">Default Key</emphasis></entry>
-              <entry><emphasis role="bold">Action</emphasis></entry>
+              <entry><para>
+                  <emphasis role="bold">Action</emphasis>
+                </para></entry>
+              <entry><para>
+                  <emphasis role="bold">Default Key</emphasis>
+                </para></entry>
+              <entry><para>
+                  <emphasis role="bold">Action</emphasis>
+                </para></entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry><computeroutput>TakeSnapshot</computeroutput></entry>
-              <entry>T</entry>
-              <entry>Take a snapshot</entry>
+              <entry><para>
+                  <computeroutput>TakeSnapshot</computeroutput>
+                </para></entry>
+              <entry><para>
+                  T
+                </para></entry>
+              <entry><para>
+                  Take a snapshot
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>TakeScreenshot</computeroutput></entry>
-              <entry>E</entry>
-              <entry>Take a screenshot</entry>
+              <entry><para>
+                  <computeroutput>TakeScreenshot</computeroutput>
+                </para></entry>
+              <entry><para>
+                  E
+                </para></entry>
+              <entry><para>
+                  Take a screenshot
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>MouseIntegration</computeroutput></entry>
-              <entry>I</entry>
-              <entry>Toggle mouse integration</entry>
+              <entry><para>
+                  <computeroutput>MouseIntegration</computeroutput>
+                </para></entry>
+              <entry><para>
+                  I
+                </para></entry>
+              <entry><para>
+                  Toggle mouse integration
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>TypeCAD</computeroutput></entry>
-              <entry>Del</entry>
-              <entry>Inject Ctrl+Alt+Del</entry>
+              <entry><para>
+                  <computeroutput>TypeCAD</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Del
+                </para></entry>
+              <entry><para>
+                  Inject Ctrl+Alt+Del
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>TypeCABS</computeroutput></entry>
-              <entry>Backspace</entry>
-              <entry>Inject Ctrl+Alt+Backspace</entry>
+              <entry><para>
+                  <computeroutput>TypeCABS</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Backspace
+                </para></entry>
+              <entry><para>
+                  Inject Ctrl+Alt+Backspace
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>Pause</computeroutput></entry>
-              <entry>P</entry>
-              <entry>Pause the VM</entry>
+              <entry><para>
+                  <computeroutput>Pause</computeroutput>
+                </para></entry>
+              <entry><para>
+                  P
+                </para></entry>
+              <entry><para>
+                  Pause the VM
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>Reset</computeroutput></entry>
-              <entry>R</entry>
+              <entry><para>
+                  <computeroutput>Reset</computeroutput>
+                </para></entry>
+              <entry><para>
+                  R
+                </para></entry>
               <entry>Hard reset the guest</entry>
             </row>
             <row>
-              <entry><computeroutput>SaveState</computeroutput></entry>
-              <entry></entry>
-              <entry>Save the VM state and terminate the VM</entry>
+              <entry><para>
+                  <computeroutput>SaveState</computeroutput>
+                </para></entry>
+              <entry><para></para></entry>
+              <entry><para>
+                  Save the VM state and terminate the VM
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>Shutdown</computeroutput></entry>
-              <entry>H</entry>
-              <entry>Press the (virtual) ACPI power button</entry>
+              <entry><para>
+                  <computeroutput>Shutdown</computeroutput>
+                </para></entry>
+              <entry><para>
+                  H
+                </para></entry>
+              <entry><para>
+                  Press the virtual ACPI power button
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>PowerOff</computeroutput></entry>
-              <entry></entry>
-              <entry>Power the VM off, without saving the state</entry>
+              <entry><para>
+                  <computeroutput>PowerOff</computeroutput>
+                </para></entry>
+              <entry><para></para></entry>
+              <entry><para>
+                  Power off the VM without saving the state
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>Close</computeroutput></entry>
-              <entry>Q</entry>
-              <entry>Show the VM close dialog</entry>
+              <entry><para>
+                  <computeroutput>Close</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Q
+                </para></entry>
+              <entry><para>
+                  Show the Close VM dialog
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>FullscreenMode</computeroutput></entry>
-              <entry>F</entry>
-              <entry>Switch the VM into full screen</entry>
+              <entry><para>
+                  <computeroutput>FullscreenMode</computeroutput>
+                </para></entry>
+              <entry><para>
+                  F
+                </para></entry>
+              <entry><para>
+                  Switch the VM into full screen mode
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>SeamlessMode</computeroutput></entry>
-              <entry>L</entry>
-              <entry>Switch the VM into seamless mode</entry>
+              <entry><para>
+                  <computeroutput>SeamlessMode</computeroutput>
+                </para></entry>
+              <entry><para>
+                  L
+                </para></entry>
+              <entry><para>
+                  Switch the VM into seamless mode
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>ScaleMode</computeroutput></entry>
-              <entry>C</entry>
-              <entry>Switch the VM into scale mode</entry>
+              <entry><para>
+                  <computeroutput>ScaleMode</computeroutput>
+                </para></entry>
+              <entry><para>
+                  C
+                </para></entry>
+              <entry><para>
+                  Switch the VM into scaled mode
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>GuestAutoResize</computeroutput></entry>
-              <entry>G</entry>
-              <entry>Automatically resize the guest window</entry>
+              <entry><para>
+                  <computeroutput>GuestAutoResize</computeroutput>
+                </para></entry>
+              <entry><para>
+                  G
+                </para></entry>
+              <entry><para>
+                  Automatically resize the guest window
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>WindowAdjust</computeroutput></entry>
-              <entry>A</entry>
-              <entry>Immediately resize the guest window</entry>
+              <entry><para>
+                  <computeroutput>WindowAdjust</computeroutput>
+                </para></entry>
+              <entry><para>
+                  A
+                </para></entry>
+              <entry><para>
+                  Immediately resize the guest window
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>PopupMenu</computeroutput></entry>
-              <entry>Home</entry>
-              <entry>Show popup menu in full screen / seaml. mode</entry>
+              <entry><para>
+                  <computeroutput>PopupMenu</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Home
+                </para></entry>
+              <entry><para>
+                  Show the popup menu in full screen mode and seamless
+                  mode
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>SettingsDialog</computeroutput></entry>
-              <entry>S</entry>
-              <entry>Open the VM settings dialog</entry>
+              <entry><para>
+                  <computeroutput>SettingsDialog</computeroutput>
+                </para></entry>
+              <entry><para>
+                  S
+                </para></entry>
+              <entry><para>
+                  Open the VM Settings dialog
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>InformationDialog</computeroutput></entry>
-              <entry>N</entry>
-              <entry>Show the VM information window</entry>
+              <entry><para>
+                  <computeroutput>InformationDialog</computeroutput>
+                </para></entry>
+              <entry><para>
+                  N
+                </para></entry>
+              <entry><para>
+                  Show the VM Session Information window
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>NetworkAdaptersDialog</computeroutput></entry>
-              <entry></entry>
-              <entry>Show the VM network adapters dialog</entry>
+              <entry><para>
+                  <computeroutput>NetworkAdaptersDialog</computeroutput>
+                </para></entry>
+              <entry><para></para></entry>
+              <entry><para>
+                  Show the VM Network Adapters dialog
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>SharedFoldersDialog</computeroutput></entry>
-              <entry></entry>
-              <entry>Show the VM shared folders dialog</entry>
+              <entry><para>
+                  <computeroutput>SharedFoldersDialog</computeroutput>
+                </para></entry>
+              <entry><para></para></entry>
+              <entry><para>
+                  Show the VM Shared Folders dialog
+                </para></entry>
             </row>
             <row>
-              <entry><computeroutput>InstallGuestAdditions</computeroutput></entry>
-              <entry>D</entry>
-              <entry>Mount the ISO containing the Guest Additions</entry>
+              <entry><para>
+                  <computeroutput>InstallGuestAdditions</computeroutput>
+                </para></entry>
+              <entry><para>
+                  D
+                </para></entry>
+              <entry><para>
+                  Mount the ISO containing the Guest Additions
+                </para></entry>
             </row>
           </tbody>
@@ -4473,9 +4444,9 @@
 
       <para>
-        To disable the full screen mode as well as the seamless mode,
-        use the following command:
+        To disable full screen mode and seamless mode, use the following
+        command:
+      </para>
 
 <screen>VBoxManage setextradata global GUI/Input/MachineShortcuts "FullscreenMode=None,SeamlessMode=None"</screen>
-      </para>
 
     </sect2>
@@ -4487,10 +4458,8 @@
       <para>
         You can disallow, or blacklist, certain actions when terminating
-        a VM. To disallow specific actions, type:
-      </para>
-
-      <para>
+        a VM. To disallow specific actions, use the following command:
+      </para>
+
 <screen>VBoxManage setextradata "VM name" GUI/RestrictedCloseActions OPTION[,OPTION...]</screen>
-      </para>
 
       <para>
@@ -4583,10 +4552,8 @@
         contrast to the setting decribed in the previous section, this
         setting allows only one action when the user terminates the VM.
-        No exit menu is shown.
-      </para>
-
-      <para>
+        No exit menu is shown. Use the following command:
+      </para>
+
 <screen>VBoxManage setextradata "VM name" GUI/DefaultCloseAction ACTION</screen>
-      </para>
 
       <para>
@@ -4681,10 +4648,8 @@
 
       <para>
-        This behavior can be configured:
-      </para>
-
-      <para>
+        This behavior can be configured as follows:
+      </para>
+
 <screen>VBoxManage setextradata "VM name" GUI/GuruMeditationHandler MODE</screen>
-      </para>
 
       <para>
@@ -4752,5 +4717,5 @@
         guest window and the guest expects relative mouse coordinates at
         this time. This happens if the pointing device is configured as
-        PS/2 mouse and the guest has not yet started the VirtualBox
+        PS/2 mouse and the guest has not yet started the &product-name;
         Guest Additions. For instance, the guest is booting or the Guest
         Additions are not installed, or if the pointing device is
@@ -4763,10 +4728,8 @@
       <para>
         The default behavior is sometimes not desired. Therefore it can
-        be configured:
-      </para>
-
-      <para>
+        be configured as follows:
+      </para>
+
 <screen>VBoxManage setextradata "VM name" GUI/MouseCapturePolicy MODE</screen>
-      </para>
 
       <para>
@@ -4827,23 +4790,20 @@
 
       <para>
-        As of version 4.3.16, VirtualBox uses special window manager
-        facilities to switch a multi-screen machine to full-screen on a
-        multi-monitor host system. However, not all window managers
-        provide these facilities correctly, so VirtualBox can be told to
-        use the old method of switching to full-screen mode instead
-        using the command:
-      </para>
-
-      <para>
+        &product-name; uses special window manager facilities to switch
+        a multi-screen machine to full-screen on a multi-monitor host
+        system. However, not all window managers provide these
+        facilities correctly. &product-name; can be configured to use a
+        legacy method of switching to full-screen mode instead, by using
+        the command:
+      </para>
+
 <screen>VBoxManage setextradata global GUI/Fullscreen/LegacyMode true</screen>
-      </para>
-
-      <para>
-        You can go back to the new method using the command:
-      </para>
-
-      <para>
+
+      <para>
+        You can go back to the default method by using the following
+        command:
+      </para>
+
 <screen>VBoxManage setextradata global GUI/Fullscreen/LegacyMode</screen>
-      </para>
 
       <para>
@@ -4857,15 +4817,15 @@
   <sect1 id="vboxwebsrv-daemon">
 
-    <title>Starting the VirtualBox Web Service Automatically</title>
-
-    <para>
-      The VirtualBox web service,
+    <title>Starting the &product-name; Web Service Automatically</title>
+
+    <para>
+      The &product-name; web service,
       <computeroutput>vboxwebsrv</computeroutput>, is used for
-      controlling VirtualBox remotely. It is documented in detail in the
-      VirtualBox Software Development Kit (SDK). See
+      controlling &product-name; remotely. It is documented in detail in
+      the &product-name; Software Development Kit (SDK). See
       <xref linkend="VirtualBoxAPI" />. As the client base using this
       interface is growing, we added start scripts for the various
       operation systems we support. The following sections describe how
-      to use them. The VirtualBox web service is never started
+      to use them. The &product-name; web service is never started
       automatically as a result of a standard installation.
     </para>
@@ -4873,5 +4833,5 @@
     <sect2 id="vboxwebsrv-linux">
 
-      <title>Linux: Starting the Web Service via init</title>
+      <title>Linux: Starting the Web Service With init</title>
 
       <para>
@@ -4886,100 +4846,190 @@
         example: <computeroutput>VBOXWEB_HOST</computeroutput> and
         <computeroutput>VBOXWEB_PORT</computeroutput>.
-
-        <table id="table-websrv-config-params">
-          <title>Web Service Configuration Parameters</title>
-          <tgroup cols="3">
-            <thead>
-              <row>
-                <entry><emphasis role="bold">Parameter</emphasis></entry>
-                <entry><emphasis role="bold">Description</emphasis></entry>
-                <entry><emphasis role="bold">Default</emphasis></entry>
-              </row>
-            </thead>
-            <tbody>
-              <row>
-                <entry><computeroutput>USER</computeroutput></entry>
-                <entry>The user as which the web service runs</entry>
-                <entry></entry>
-              </row>
-              <row>
-                <entry><computeroutput>HOST</computeroutput></entry>
-                <entry>The host to bind the web service to</entry>
-                <entry>localhost</entry>
-              </row>
-              <row>
-                <entry><computeroutput>PORT</computeroutput></entry>
-                <entry>The port to bind the web service to</entry>
-                <entry>18083</entry>
-              </row>
-              <row>
-                <entry><computeroutput>SSL_KEYFILE</computeroutput></entry>
-                <entry>Server key and certificate file, PEM format</entry>
-                <entry></entry>
-              </row>
-              <row>
-                <entry><computeroutput>SSL_PASSWORDFILE</computeroutput></entry>
-                <entry>File name for password to server key</entry>
-                <entry></entry>
-              </row>
-              <row>
-                <entry><computeroutput>SSL_CACERT</computeroutput></entry>
-                <entry>CA certificate file, PEM format</entry>
-                <entry></entry>
-              </row>
-              <row>
-                <entry><computeroutput>SSL_CAPATH</computeroutput></entry>
-                <entry>CA certificate path</entry>
-                <entry></entry>
-              </row>
-              <row>
-                <entry><computeroutput>SSL_DHFILE</computeroutput></entry>
-                <entry>DH file name or DH key length in bits</entry>
-                <entry></entry>
-              </row>
-              <row>
-                <entry><computeroutput>SSL_RANDFILE</computeroutput></entry>
-                <entry>File containing seed for random number generator</entry>
-                <entry></entry>
-              </row>
-              <row>
-                <entry><computeroutput>TIMEOUT</computeroutput></entry>
-                <entry>Session timeout in seconds; 0 disables timeouts</entry>
-                <entry>300</entry>
-              </row>
-              <row>
-                <entry><computeroutput>CHECK_INTERVAL</computeroutput></entry>
-                <entry>Frequency of timeout checks in seconds</entry>
-                <entry>5</entry>
-              </row>
-              <row>
-                <entry><computeroutput>THREADS</computeroutput></entry>
-                <entry>Maximum number of worker threads to run in parallel</entry>
-                <entry>100</entry>
-              </row>
-              <row>
-                <entry><computeroutput>KEEPALIVE</computeroutput></entry>
-                <entry>Maximum number of requests before a socket will be closed</entry>
-                <entry>100</entry>
-              </row>
-              <row>
-                <entry><computeroutput>ROTATE</computeroutput></entry>
-                <entry>Number of log files; 0 disables log rotation</entry>
-                <entry>10</entry>
-              </row>
-              <row>
-                <entry><computeroutput>LOGSIZE</computeroutput></entry>
-                <entry>Maximum size of a log file in bytes to trigger rotation</entry>
-                <entry>1MB</entry>
-              </row>
-              <row>
-                <entry><computeroutput>LOGINTERVAL</computeroutput></entry>
-                <entry>Maximum time interval in seconds to trigger log rotation</entry>
-                <entry>1 day</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </para>
+      </para>
+
+      <table id="table-websrv-config-params">
+        <title>Web Service Configuration Parameters</title>
+        <tgroup cols="3">
+          <thead>
+            <row>
+              <entry><para>
+                  <emphasis role="bold">Parameter</emphasis>
+                </para></entry>
+              <entry><para>
+                  <emphasis role="bold">Description</emphasis>
+                </para></entry>
+              <entry><para>
+                  <emphasis role="bold">Default</emphasis>
+                </para></entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><para>
+                  <computeroutput>USER</computeroutput>
+                </para></entry>
+              <entry><para>
+                  The user which the web service runs as
+                </para></entry>
+              <entry><para></para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>HOST</computeroutput>
+                </para></entry>
+              <entry><para>
+                  The host to bind the web service to
+                </para></entry>
+              <entry><para>
+                  localhost
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>PORT</computeroutput>
+                </para></entry>
+              <entry><para>
+                  The port to bind the web service to
+                </para></entry>
+              <entry><para>
+                  18083
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>SSL_KEYFILE</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Server key and certificate file, in PEM format
+                </para></entry>
+              <entry><para></para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>SSL_PASSWORDFILE</computeroutput>
+                </para></entry>
+              <entry><para>
+                  File name for password to server key
+                </para></entry>
+              <entry><para></para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>SSL_CACERT</computeroutput>
+                </para></entry>
+              <entry><para>
+                  CA certificate file, in PEM format
+                </para></entry>
+              <entry><para></para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>SSL_CAPATH</computeroutput>
+                </para></entry>
+              <entry><para>
+                  CA certificate path
+                </para></entry>
+              <entry><para></para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>SSL_DHFILE</computeroutput>
+                </para></entry>
+              <entry><para>
+                  DH file name or DH key length in bits
+                </para></entry>
+              <entry><para></para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>SSL_RANDFILE</computeroutput>
+                </para></entry>
+              <entry><para>
+                  File containing seed for random number generator
+                </para></entry>
+              <entry><para></para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>TIMEOUT</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Session timeout in seconds, 0 disables timeouts
+                </para></entry>
+              <entry><para>
+                  300
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>CHECK_INTERVAL</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Frequency of timeout checks in seconds
+                </para></entry>
+              <entry><para>
+                  5
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>THREADS</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Maximum number of worker threads to run in parallel
+                </para></entry>
+              <entry><para>
+                  100
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>KEEPALIVE</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Maximum number of requests before a socket will be
+                  closed
+                </para></entry>
+              <entry><para>
+                  100
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>ROTATE</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Number of log files, 0 disables log rotation
+                </para></entry>
+              <entry><para>
+                  10
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>LOGSIZE</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Maximum log file size to trigger rotation, in bytes
+                </para></entry>
+              <entry><para>
+                  1MB
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>LOGINTERVAL</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Maximum time interval to trigger log rotation, in
+                  seconds
+                </para></entry>
+              <entry><para>
+                  1 day
+                </para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
 
       <para>
@@ -4987,5 +5037,5 @@
         <computeroutput>SSL_KEYFILE</computeroutput> enables the SSL/TLS
         support. Using encryption is strongly encouraged, as otherwise
-        everything (including passwords) is transferred in clear text.
+        everything, including passwords, is transferred in clear text.
       </para>
 
@@ -4994,21 +5044,21 @@
     <sect2 id="vboxwebsrv-solaris">
 
-      <title>Solaris: Starting the Web Service via SMF</title>
-
-      <para>
-        On Solaris hosts, the VirtualBox web service daemon is
-        integrated into the SMF framework. You can change the
+      <title>Oracle Solaris: Starting the Web Service With SMF</title>
+
+      <para>
+        On Oracle Solaris hosts, the &product-name; web service daemon
+        is integrated into the SMF framework. You can change the
         parameters, but do not have to if the defaults below already
         match your needs:
+      </para>
 
 <screen>svccfg -s svc:/application/virtualbox/webservice:default setprop config/host=localhost
 svccfg -s svc:/application/virtualbox/webservice:default setprop config/port=18083
 svccfg -s svc:/application/virtualbox/webservice:default setprop config/user=root</screen>
-      </para>
 
       <para>
         <xref linkend="table-websrv-config-params"/> showing the
-        parameter names and defaults also applies for Solaris. The
-        parameter names must be changed to lowercase and a prefix of
+        parameter names and defaults also applies for Oracle Solaris.
+        The parameter names must be changed to lowercase and a prefix of
         <computeroutput>config/</computeroutput> has to be added. For
         example: <computeroutput>config/user</computeroutput> or
@@ -5016,26 +5066,26 @@
         any change, do not forget to run the following command to put
         the changes into effect immediately:
+      </para>
 
 <screen>svcadm refresh svc:/application/virtualbox/webservice:default</screen>
-      </para>
 
       <para>
         If you forget the above command then the previous settings are
         used when enabling the service. Check the current property
-        settings with:
+        settings as follows:
+      </para>
 
 <screen>svcprop -p config svc:/application/virtualbox/webservice:default</screen>
-      </para>
 
       <para>
         When everything is configured correctly you can start the
-        VirtualBox web service with the following command:
+        &product-name; web service with the following command:
+      </para>
 
 <screen>svcadm enable svc:/application/virtualbox/webservice:default</screen>
-      </para>
-
-      <para>
-        For more information about SMF, please refer to the Solaris
-        documentation.
+
+      <para>
+        For more information about SMF, please refer to the Oracle
+        Solaris documentation.
       </para>
 
@@ -5044,9 +5094,9 @@
     <sect2 id="vboxwebsrv-osx">
 
-      <title>Mac OS X: Starting the Web Service via launchd</title>
-
-      <para>
-        On Mac OS X, launchd is used to start the VirtualBox webservice.
-        An example configuration file can be found in
+      <title>Mac OS X: Starting the Web Service With launchd</title>
+
+      <para>
+        On Mac OS X, launchd is used to start the &product-name;
+        webservice. An example configuration file can be found in
         <computeroutput>$HOME/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist</computeroutput>.
         It can be enabled by changing the
@@ -5055,7 +5105,9 @@
         <computeroutput>false</computeroutput>. To manually start the
         service use the following command:
+      </para>
 
 <screen>launchctl load ~/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist</screen>
 
+      <para>
         For additional information on how launchd services could be
         configured see:
@@ -5073,15 +5125,11 @@
   <sect1 id="vboxwatchdog">
 
-    <title>VirtualBox Watchdog</title>
-
-    <para>
-      Starting with VirtualBox 4.2 the memory ballooning service
-      formerly known as <computeroutput>VBoxBalloonCtrl</computeroutput>
-      was renamed to VBoxWatchdog, which now incorporates several host
-      services that are meant to be run in a server environment.
-    </para>
-
-    <para>
-      These services are as follows:
+    <title>&product-name; Watchdog</title>
+
+    <para>
+      The memory ballooning service, formerly known as
+      <computeroutput>VBoxBalloonCtrl</computeroutput>, was renamed to
+      VBoxWatchdog. This service now incorporates the following host
+      services that are meant to be run in a server environment:
     </para>
 
@@ -5090,9 +5138,9 @@
       <listitem>
         <para>
-          Memory ballooning control, which automatically takes care of a
-          VM's configured memory balloon. See
-          <xref linkend="guestadd-balloon" />. This service is useful
-          for server environments where VMs may dynamically require more
-          or less memory during runtime.
+          <emphasis role="bold">Memory ballooning control.</emphasis>
+          This service automatically takes care of a VM's configured
+          memory balloon. See <xref linkend="guestadd-balloon" />. This
+          service is useful for server environments where VMs may
+          dynamically require more or less memory during runtime.
         </para>
 
@@ -5108,9 +5156,9 @@
       <listitem>
         <para>
-          Host isolation detection, which provides a way to detect
-          whether the host cannot reach the specific VirtualBox server
-          instance anymore and take appropriate actions, such as
-          shutting down, saving the current state or even powering down
-          certain VMs.
+          <emphasis role="bold">Host isolation detection.</emphasis>
+          This service provides a way to detect whether the host cannot
+          reach the specific &product-name; server instance anymore and
+          take appropriate actions, such as shutting down, saving the
+          current state or even powering down certain VMs.
         </para>
       </listitem>
@@ -5119,9 +5167,9 @@
 
     <para>
-      All configuration values can be either specified via command line
-      or global extradata, whereas command line values always have a
-      higher priority when set. Some of the configuration values also be
-      specified on a per-VM basis. So the overall lookup order is:
-      command line, per-VM basis extradata (if available), global
+      All configuration values can be either specified using the command
+      line or global extradata, whereas command line values always have
+      a higher priority when set. Some of the configuration values also
+      be specified on a per-VM basis. So the overall lookup order is:
+      command line, per-VM basis extradata if available, global
       extradata.
     </para>
@@ -5139,36 +5187,43 @@
       <para>
         To set up the memory ballooning control the maximum ballooning
-        size a VM can reach needs to be set. This can be specified via
-        the command line with:
+        size a VM can reach needs to be set. This can be specified using
+        the command line, as follows:
+      </para>
 
 <screen>--balloon-max &lt;Size in MB&gt;</screen>
 
-        or on a per-VM basis extradata value with:
+      <para>
+        Using a per-VM basis extradata value, as follows:
+      </para>
 
 <screen>VBoxManage setextradata &lt;VM-Name&gt; VBoxInternal2/Watchdog/BalloonCtrl/BalloonSizeMax &lt;Size in MB&gt;</screen>
 
-        or using a global extradata value with:
+      <para>
+        Using a global extradata value, as follows:
+      </para>
 
 <screen>VBoxManage setextradata global VBoxInternal2/Watchdog/BalloonCtrl/BalloonSizeMax &lt;Size in MB&gt;</screen>
 
-        <note>
-          <para>
-            If no maximum ballooning size is specified by at least one
-            of the parameters above, no ballooning will be performed at
-            all.
-          </para>
-        </note>
-      </para>
-
-      <para>
-        Setting the ballooning increment in MB can be either done via
-        command line with:
+      <note>
+        <para>
+          If no maximum ballooning size is specified by at least one of
+          the parameters above, no ballooning will be performed at all.
+        </para>
+      </note>
+
+      <para>
+        Setting the ballooning increment in MB can be either done using
+        command line, as follows:
+      </para>
 
 <screen>--balloon-inc &lt;Size in MB&gt;</screen>
 
-        or using a global extradata value with:
+      <para>
+        Using a global extradata value, as follows:
+      </para>
 
 <screen>VBoxManage setextradata global VBoxInternal2/Watchdog/BalloonCtrl/BalloonIncrementMB &lt;Size in MB&gt;</screen>
 
+      <para>
         The default ballooning increment is 256 MB if not specified.
       </para>
@@ -5176,26 +5231,34 @@
       <para>
         The same options apply for a ballooning decrement. Using the
-        command line with:
+        command line, as follows:
+      </para>
 
 <screen>--balloon-dec &lt;Size in MB&gt;</screen>
 
-        or using a global extradata value with:
+      <para>
+        Using a global extradata value, as follows:
+      </para>
 
 <screen>VBoxManage setextradata global VBoxInternal2/Watchdog/BalloonCtrl/BalloonDecrementMB &lt;Size in MB&gt;</screen>
 
+      <para>
         The default ballooning decrement is 128 MB if not specified.
       </para>
 
       <para>
-        To define the lower limit in MB a balloon can be the command
-        line with:
+        The lower limit in MB for a balloon can be defined using the
+        command line, as follows:
+      </para>
 
 <screen>--balloon-lower-limit &lt;Size in MB&gt;</screen>
 
-        can be used or using a global extradata value with:
+      <para>
+        Using a global extradata value, as follows:
+      </para>
 
 <screen>VBoxManage setextradata global VBoxInternal2/Watchdog/BalloonCtrl/BalloonLowerLimitMB &lt;Size in MB&gt;</screen>
 
-        is available. Default lower limit is 128 if not specified.
+      <para>
+        The default lower limit is 128 MB if not specified.
       </para>
 
@@ -5208,8 +5271,8 @@
       <para>
         To detect whether a host is being isolated, that is, the host
-        cannot reach the VirtualBox server instance anymore, the host
-        needs to set an alternating value to a global extradata value
-        within a time period. If this value is not set within that time
-        period a timeout occurred and the so-called host isolation
+        cannot reach the &product-name; server instance anymore, the
+        host needs to set an alternating value to a global extradata
+        value within a time period. If this value is not set within that
+        time period a timeout occurred and the so-called host isolation
         response will be performed to the VMs handled. Which VMs are
         handled can be controlled by defining VM groups and assigning
@@ -5220,33 +5283,42 @@
 
       <para>
-        To set the groups handled by the host isolation detection via
+        Set the groups handled by the host isolation detection using the
+        following command line:
+      </para>
+
+<screen>--apimon-groups=&lt;string[,stringN]&gt;</screen>
+
+      <para>
+        Using a global extradata value, as follows:
+      </para>
+
+<screen>VBoxManage setextradata global VBoxInternal2/Watchdog/APIMonitor/Groups &lt;string[,stringN]&gt;</screen>
+
+      <para>
+        Set the host isolation timeout using the following command line:
+      </para>
+
+<screen>--apimon-isln-timeout=&lt;ms&gt;</screen>
+
+      <para>
+        Using a global extradata value, as follows:
+      </para>
+
+<screen>VBoxManage setextradata global VBoxInternal2/Watchdog/APIMonitor/IsolationTimeoutMS &lt;ms&gt;</screen>
+
+      <para>
+        Set the actual host isolation response using the following
         command line:
-
-<screen>--apimon-groups=&lt;string[,stringN]&gt;</screen>
-
-        or using a global extradata value with:
-
-<screen>VBoxManage setextradata global VBoxInternal2/Watchdog/APIMonitor/Groups &lt;string[,stringN]&gt;</screen>
-      </para>
-
-      <para>
-        To set the host isolation timeout via command line:
-
-<screen>--apimon-isln-timeout=&lt;ms&gt;</screen>
-
-        or using a global extradata value with:
-
-<screen>VBoxManage setextradata global VBoxInternal2/Watchdog/APIMonitor/IsolationTimeoutMS &lt;ms&gt;</screen>
-      </para>
-
-      <para>
-        To set the actual host isolation response via command line:
+      </para>
 
 <screen>--apimon-isln-response=&lt;cmd&gt;</screen>
 
-        or using a global extradata value with:
+      <para>
+        Using a global extradata value, as follows:
+      </para>
 
 <screen>VBoxManage setextradata global VBoxInternal2/Watchdog/APIMonitor/IsolationResponse &lt;cmd&gt;</screen>
 
+      <para>
         The following response commands are available:
       </para>
@@ -5311,5 +5383,5 @@
     <sect2 id="vboxwatchdog-linux">
 
-      <title>Linux: Starting the Watchdog Service via init</title>
+      <title>Linux: Starting the Watchdog Service With init</title>
 
       <para>
@@ -5334,65 +5406,126 @@
         <computeroutput>VBOXBALLOONCTRL_INTERVAL</computeroutput> can
         still be used.
-
-        <table id="table-vboxwatchdog-config-params">
-          <title>VirtualBox Watchdog Configuration Parameters</title>
-          <tgroup cols="3">
-            <thead>
-              <row>
-                <entry><emphasis role="bold">Parameter</emphasis></entry>
-                <entry><emphasis role="bold">Description</emphasis></entry>
-                <entry><emphasis role="bold">Default</emphasis></entry>
-              </row>
-            </thead>
-            <tbody>
-              <row>
-                <entry><computeroutput>USER</computeroutput></entry>
-                <entry>The user as which the watchdog service runs</entry>
-                <entry></entry>
-              </row>
-              <row>
-                <entry><computeroutput>ROTATE</computeroutput></entry>
-                <entry>Number of log files; 0 disables log rotation</entry>
-                <entry>10</entry>
-              </row>
-              <row>
-                <entry><computeroutput>LOGSIZE</computeroutput></entry>
-                <entry>Maximum size of a log file in bytes to trigger rotation</entry>
-                <entry>1MB</entry>
-              </row>
-              <row>
-                <entry><computeroutput>LOGINTERVAL</computeroutput></entry>
-                <entry>Maximum time interval in seconds to trigger log rotation</entry>
-                <entry>1 day</entry>
-              </row>
-              <row>
-                <entry><computeroutput>BALLOON_INTERVAL</computeroutput></entry>
-                <entry>Interval for checking the balloon size (msec)</entry>
-                <entry>30000</entry>
-              </row>
-              <row>
-                <entry><computeroutput>BALLOON_INCREMENT</computeroutput></entry>
-                <entry>Balloon size increment (MByte)</entry>
-                <entry>256</entry>
-              </row>
-              <row>
-                <entry><computeroutput>BALLOON_DECREMENT</computeroutput></entry>
-                <entry>Balloon size decrement (MByte)</entry>
-                <entry>128</entry>
-              </row>
-              <row>
-                <entry><computeroutput>BALLOON_LOWERLIMIT</computeroutput></entry>
-                <entry>Balloon size lower limit (MByte)</entry>
-                <entry>64</entry>
-              </row>
-              <row>
-                <entry><computeroutput>BALLOON_SAFETYMARGIN</computeroutput></entry>
-                <entry>Free memory required for decreasing the balloon size (MByte)</entry>
-                <entry>1024</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </para>
+      </para>
+
+      <table id="table-vboxwatchdog-config-params">
+        <title>&product-name; Watchdog Configuration Parameters</title>
+        <tgroup cols="3">
+          <thead>
+            <row>
+              <entry><para>
+                  <emphasis role="bold">Parameter</emphasis>
+                </para></entry>
+              <entry><para>
+                  <emphasis role="bold">Description</emphasis>
+                </para></entry>
+              <entry><para>
+                  <emphasis role="bold">Default</emphasis>
+                </para></entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><para>
+                  <computeroutput>USER</computeroutput>
+                </para></entry>
+              <entry><para>
+                  The user which the watchdog service runs as
+                </para></entry>
+              <entry><para></para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>ROTATE</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Number of log files, 0 disables log rotation
+                </para></entry>
+              <entry><para>
+                  10
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>LOGSIZE</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Maximum log file size to trigger rotation, in bytes
+                </para></entry>
+              <entry><para>
+                  1MB
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>LOGINTERVAL</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Maximum time interval to trigger log rotation, in
+                  seconds
+                </para></entry>
+              <entry><para>
+                  1 day
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>BALLOON_INTERVAL</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Interval for checking the balloon size, in
+                  milliseconds
+                </para></entry>
+              <entry><para>
+                  30000
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>BALLOON_INCREMENT</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Balloon size increment, in megabytes
+                </para></entry>
+              <entry><para>
+                  256
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>BALLOON_DECREMENT</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Balloon size decrement, in megabytes
+                </para></entry>
+              <entry><para>
+                  128
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>BALLOON_LOWERLIMIT</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Balloon size lower limit, in megabytes
+                </para></entry>
+              <entry><para>
+                  64
+                </para></entry>
+            </row>
+            <row>
+              <entry><para>
+                  <computeroutput>BALLOON_SAFETYMARGIN</computeroutput>
+                </para></entry>
+              <entry><para>
+                  Free memory required for decreasing the balloon size,
+                  in megabytes
+                </para></entry>
+              <entry><para>
+                  1024
+                </para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
 
     </sect2>
@@ -5400,9 +5533,9 @@
     <sect2 id="vboxwatchdog-solaris">
 
-      <title>Solaris: Starting the Watchdog Service via SMF</title>
-
-      <para>
-        On Solaris hosts, the VirtualBox watchdog service daemon is
-        integrated into the SMF framework. You can change the
+      <title>Oracle Solaris: Starting the Watchdog Service With SMF</title>
+
+      <para>
+        On Oracle Solaris hosts, the &product-name; watchdog service
+        daemon is integrated into the SMF framework. You can change the
         parameters, but do not have to if the defaults already match
         your needs:
@@ -5416,33 +5549,33 @@
       <para>
         <xref linkend="table-vboxwatchdog-config-params"/> also applies
-        for Solaris. The parameter names must be changed to lowercase
-        and a prefix of <computeroutput>config/</computeroutput> has to
-        be added. For example:
-        <computeroutput>config/user</computeroutput> or
+        for Oracle Solaris. The parameter names must be changed to
+        lowercase and a prefix of
+        <computeroutput>config/</computeroutput> has to be added. For
+        example: <computeroutput>config/user</computeroutput> or
         <computeroutput>config/balloon_safetymargin</computeroutput>. If
         you made any change, do not forget to run the following command
         to put the changes into effect immediately:
+      </para>
 
 <screen>svcadm refresh svc:/application/virtualbox/balloonctrl:default</screen>
-      </para>
 
       <para>
         If you forget the above command then the previous settings will
         be used when enabling the service. Check the current property
-        settings with:
+        settings with the following command:
+      </para>
 
 <screen>svcprop -p config svc:/application/virtualbox/balloonctrl:default</screen>
-      </para>
 
       <para>
         When everything is configured correctly you can start the
-        VirtualBox watchdog service with the following command:
+        &product-name; watchdog service with the following command:
+      </para>
 
 <screen>svcadm enable svc:/application/virtualbox/balloonctrl:default</screen>
-      </para>
-
-      <para>
-        For more information about SMF, please refer to the Solaris
-        documentation.
+
+      <para>
+        For more information about SMF, please refer to the Oracle
+        Solaris documentation.
       </para>
 
@@ -5456,10 +5589,10 @@
 
     <para>
-      Starting with VirtualBox 4.2.0 there is another extension pack,
-      <code>VNC</code>, which is open source and replaces the previous
-      integration of the VNC remote access protocol. This is
-      experimental code, and will be initially available in the
-      VirtualBox source code package only. It is to a large portion code
-      contributed by users, and is not supported in any way by Oracle.
+      Another extension pack called VNC is available. This extension
+      pack is open source and replaces the previous integration of the
+      VNC remote access protocol. This is experimental code, and is
+      initially available in the &product-name; source code package
+      only. It is to a large portion code contributed by users, and is
+      not supported in any way by Oracle.
     </para>
 
@@ -5473,10 +5606,10 @@
 
     <para>
-      It is possible to install both the Oracle VM VirtualBox Extension
-      Pack and VNC, but only one VRDE module can be active at any time.
-      The following command switches to the VNC VRDE module in VNC:
+      It is possible to install both the &product-name; Extension Pack
+      and VNC, but only one VRDE module can be active at any time. The
+      following command switches to the VNC VRDE module in VNC:
+    </para>
 
 <screen>VBoxManage setproperty vrdeextpack VNC</screen>
-    </para>
 
     <para>
@@ -5488,7 +5621,7 @@
       other choice than having a clear-text password in the VM
       configuration, which can be set with the following command:
+    </para>
 
 <screen>VBoxManage modifyvm "VM name" --vrdeproperty VNCPassword=secret</screen>
-    </para>
 
     <para>
@@ -5496,14 +5629,14 @@
       should be removed when a VM configuration is passed to another
       person, for whatever purpose. Some VNC servers claim to have
-      "encrypted" passwords in the configuration. This is not true
-      encryption, it is only concealing the passwords, which is exactly
-      as secure as clear-text passwords.
+      encrypted passwords in the configuration. This is not true
+      encryption, it is only concealing the passwords, which is only as
+      secure as using clear-text passwords.
     </para>
 
     <para>
       The following command switches back to VRDP, if installed:
-
-<screen>VBoxManage setproperty vrdeextpack "Oracle VM VirtualBox Extension Pack"</screen>
-    </para>
+    </para>
+
+<screen>VBoxManage setproperty vrdeextpack "&product-name; Extension Pack"</screen>
 
   </sect1>
@@ -5514,12 +5647,11 @@
 
     <para>
-      Starting with VirtualBox 4.2.0 it is possible to start VMs
-      automatically during system boot on Linux, Solaris and Mac OS X
-      for all users.
+      You can start VMs automatically during system boot on Linux,
+      Oracle Solaris, and Mac OS X platforms for all users.
     </para>
 
     <sect2 id="autostart-linux">
 
-      <title>Linux: Starting the Autostart Service via init</title>
+      <title>Linux: Starting the Autostart Service With init</title>
 
       <para>
@@ -5549,5 +5681,4 @@
       </para>
 
-      <para>
 <screen>
 # Default policy is to deny starting a VM, the other option is "allow".
@@ -5567,12 +5698,12 @@
 }
       </screen>
-      </para>
 
       <para>
         Every user who wants to enable autostart for individual machines
-        has to set the path to the autostart database directory with
+        has to set the path to the autostart database directory with the
+        following command:
+      </para>
 
 <screen>VBoxManage setproperty autostartdbpath &lt;Autostart directory&gt;</screen>
-      </para>
 
     </sect2>
@@ -5580,27 +5711,27 @@
     <sect2 id="autostart-solaris">
 
-      <title>Solaris: Starting the Autostart Service via SMF</title>
-
-      <para>
-        On Solaris hosts, the VirtualBox autostart daemon is integrated
-        into the SMF framework. To enable it you have to point the
-        service to an existing configuration file which has the same
-        format as on Linux, see <xref linkend="autostart-linux" />. For
-        example:
+      <title>Oracle Solaris: Starting the Autostart Service With SMF</title>
+
+      <para>
+        On Oracle Solaris hosts, the &product-name; autostart daemon is
+        integrated into the SMF framework. To enable it you have to
+        point the service to an existing configuration file which has
+        the same format as on Linux, see
+        <xref linkend="autostart-linux" />. For example:
+      </para>
 
 <screen>svccfg -s svc:/application/virtualbox/autostart:default setprop \
   config/config=/etc/vbox/autostart.cfg</screen>
-      </para>
 
       <para>
         When everything is configured correctly you can start the
-        VirtualBox autostart service with the following command:
+        &product-name; autostart service with the following command:
+      </para>
 
 <screen>svcadm enable svc:/application/virtualbox/autostart:default</screen>
-      </para>
-
-      <para>
-        For more information about SMF, please refer to the Solaris
-        documentation.
+
+      <para>
+        For more information about SMF, please refer to the Oracle
+        Solaris documentation.
       </para>
 
@@ -5609,9 +5740,9 @@
     <sect2 id="autostart-osx">
 
-      <title>Mac OS X: Starting the Autostart Service via launchd</title>
-
-      <para>
-        On Mac OS X, launchd is used to start the VirtualBox autostart
-        service. An example configuration file can be found in
+      <title>Mac OS X: Starting the Autostart Service With launchd</title>
+
+      <para>
+        On Mac OS X, launchd is used to start the &product-name;
+        autostart service. An example configuration file can be found in
         <computeroutput>/Applications/VirtualBox.app/Contents/MacOS/org.virtualbox.vboxautostart.plist</computeroutput>.
         To enable the service copy the file to
@@ -5622,9 +5753,14 @@
         second parameter to an existing configuration file which has the
         same format as on Linux, see <xref linkend="autostart-linux" />.
+      </para>
+
+      <para>
         To manually start the service use the following command:
+      </para>
 
 <screen>launchctl load /Library/LaunchDaemons/org.virtualbox.vboxautostart.plist</screen>
 
-        For additional information on how launchd services could be
+      <para>
+        For additional information on how launchd services can be
         configured see:
       </para>
@@ -5641,9 +5777,9 @@
   <sect1 id="vboxexpertstoragemgmt">
 
-    <title>VirtualBox Expert Storage Management</title>
-
-    <para>
-      In case the snapshot model of VirtualBox is not sufficient it is
-      possible to enable a special mode which makes it possible to
+    <title>&product-name; Expert Storage Management</title>
+
+    <para>
+      In case the snapshot model of &product-name; is not sufficient it
+      is possible to enable a special mode which makes it possible to
       reconfigure storage attachments while the VM is paused. The user
       has to make sure that the disk data stays consistent to the guest
@@ -5673,6 +5809,6 @@
 
     <para>
-      Some host power management events are handled by VirtualBox. The
-      actual behavior depends on the platform:
+      Some host power management events are handled by &product-name;.
+      The actual behavior depends on the platform:
     </para>
 
@@ -5688,5 +5824,5 @@
         <para>
           This event is currently only handled on Windows hosts and Mac
-          OS X hosts. When this event is generated, VirtualBox will
+          OS X hosts. When this event is generated, &product-name; will
           pause all running VMs.
         </para>
@@ -5701,5 +5837,5 @@
         <para>
           This event is currently only handled on Windows hosts and Mac
-          OS X hosts. When this event is generated, VirtualBox will
+          OS X hosts. When this event is generated, &product-name; will
           resume all VMs which are where paused before.
         </para>
@@ -5715,7 +5851,7 @@
         <para>
           This event is currently only handled on Windows hosts and Mac
-          OS X hosts. When this event is generated, VirtualBox will save
-          the state and terminate all VMs in preparation of a potential
-          host powerdown.
+          OS X hosts. When this event is generated, &product-name; will
+          save the state and terminate all VMs in preparation of a
+          potential host powerdown.
         </para>
 
@@ -5754,11 +5890,13 @@
       To provide SSE 4.1/SSE 4.2 support to guests, the host CPU has to
       implement these instruction sets. The instruction sets are exposed
-      to guests by default, but it is possible to disable the instructions
-      for certain guests using the following commands:</para>
+      to guests by default, but it is possible to disable the
+      instructions for certain guests by using the following commands:
+    </para>
+
 <screen>VBoxManage setextradata "VM name" VBoxInternal/CPUM/IsaExts/SSE4.1 0
 VBoxManage setextradata "VM name" VBoxInternal/CPUM/IsaExts/SSE4.2 0</screen>
 
     <para>
-      These are a per-VM settings which are turned on by default.
+      These are per-VM settings which are enabled by default.
     </para>
 
@@ -5767,18 +5905,18 @@
   <sect1 id="hidledssync">
 
-    <title>Support for Keyboard Indicators Synchronization</title>
-
-    <para>
-      This feature makes the host keyboard lights match those of the
-      virtual machine's emulated keyboard when the machine window is
-      selected. It is currently implemented for Mac OS X and Windows
-      hosts. The feature is enabled by default (on a supported host OS),
-      but can be disabled using the following command:
-    </para>
-
-<screen>VBoxManage setextradata "VM name" GUI/HidLedsSync "0"</screen>
-
-    <para>
-      This is a per-VM setting and it is enabled by default.
+    <title>Support for Keyboard Indicator Synchronization</title>
+
+    <para>
+      This feature makes the host keyboard indicators (LEDs) match those
+      of the VM's emulated keyboard when the machine window is active.
+      It is currently implemented for Mac OS X and Windows hosts. This
+      feature is enabled by default on supported host OSes. You can
+      disable this feature by running the following command:
+    </para>
+
+<screen>VBoxManage setextradata "VM name" GUI/HidLedsSync 0</screen>
+
+    <para>
+      This is a per-VM setting, which is enabled by default.
     </para>
 
@@ -5790,10 +5928,10 @@
 
     <para>
-      Starting with VirtualBox 5.0 it is possible to capture USB traffic
-      for single USB devices or on the root hub level which captures the
-      traffic of all USB devices attached to the root hub. VirtualBox
-      stores the traffic in a format which is compatible with Wireshark.
-      To capture the traffic of a specific USB device it must be
-      attached to the VM with VBoxManage using the following command:
+      You can capture USB traffic for single USB devices or on the root
+      hub level, which captures the traffic of all USB devices attached
+      to the root hub. &product-name; stores the traffic in a format
+      which is compatible with Wireshark. To capture the traffic of a
+      specific USB device it must be attached to the VM with
+      <command>VBoxManage</command> using the following command:
     </para>
 
@@ -5823,5 +5961,5 @@
 
     <para>
-      VirtualBox ships a simple heartbeat service. Once the Guest
+      &product-name; ships a simple heartbeat service. Once the Guest
       Additions are active, the guest sends frequent heartbeat pings to
       the host. If the guest stops sending the heartbeat pings without
@@ -5836,6 +5974,7 @@
       interval</emphasis> defines the time between two heartbeat pings.
       The default value is 2 seconds, that is, the heartbeat service of
-      the VirtualBox Guest Additions will send a heartbeat ping every
-      two seconds. The value in nanoseconds can be configured like this:
+      the &product-name; Guest Additions will send a heartbeat ping
+      every two seconds. The value in nanoseconds can be configured like
+      this:
     </para>
 
@@ -5870,16 +6009,17 @@
 
     <para>
-      Starting with VirtualBox 5.0, it is possible to encrypt the data
-      stored in hard disk images transparently for the guest. It does
-      not depend on a specific image format to be used. Images which
-      have the data encrypted are not portable between VirtualBox and
-      other virtualization software.
-    </para>
-
-    <para>
-      VirtualBox uses the AES algorithm in XTS mode and supports 128-bit
-      or 256-bit data encryption keys (DEK). The DEK is stored encrypted
-      in the medium properties and is decrypted during VM startup by
-      entering a password which was chosen when the image was encrypted.
+      &product-name; enables you to transparently encrypt the data
+      stored in hard disk images for the guest. It does not depend on a
+      specific image format to be used. Images which have the data
+      encrypted are not portable between &product-name; and other
+      virtualization software.
+    </para>
+
+    <para>
+      &product-name; uses the AES algorithm in XTS mode and supports
+      128-bit or 256-bit data encryption keys (DEK). The DEK is stored
+      encrypted in the medium properties and is decrypted during VM
+      startup by entering a password which was chosen when the image was
+      encrypted.
     </para>
 
@@ -5905,7 +6045,7 @@
         <listitem>
           <para>
-            This feature is part of the Oracle VM VirtualBox Extension
-            Pack, which needs to be installed. Otherwise disk encryption
-            is unavailable.
+            This feature is part of the &product-name; Extension Pack,
+            which needs to be installed. Otherwise disk encryption is
+            unavailable.
           </para>
         </listitem>
@@ -5942,9 +6082,9 @@
           <para>
             When encrypting or decrypting the images, the password is
-            passed in clear text via the VirtualBox API. This needs to
-            be kept in mind, especially when using third party API
-            clients which make use of the webservice where the password
-            might be transmitted over the network. The use of HTTPS is
-            mandatory in such a case.
+            passed in clear text using the &product-name; API. This
+            needs to be kept in mind, especially when using third party
+            API clients which make use of the webservice where the
+            password might be transmitted over the network. The use of
+            HTTPS is mandatory in such a case.
           </para>
         </listitem>
@@ -5954,5 +6094,5 @@
             Encrypting images with differencing images is only possible
             if there are no snapshots or a linear chain of snapshots.
-            This limitation may be addressed in a future VirtualBox
+            This limitation may be addressed in a future &product-name;
             version.
           </para>
@@ -5969,9 +6109,10 @@
       <para>
         Encrypting disk images can be done either using the GUI or
-        VBoxManage. While the GUI is easier to use, it works on a per VM
-        basis and encrypts all disk images attached to the specific VM.
-        With VBoxManage one can encrypt individual images, including all
-        differencing images. To encrypt an unencrypted medium with
-        VBoxManage, use:
+        <command>VBoxManage</command>. While the GUI is easier to use,
+        it works on a per VM basis and encrypts all disk images attached
+        to the specific VM. With <command>VBoxManage</command> one can
+        encrypt individual images, including all differencing images. To
+        encrypt an unencrypted medium with
+        <command>VBoxManage</command>, use:
       </para>
 
@@ -5980,8 +6121,8 @@
 
       <para>
-        To supply the encryption password point VBoxManage to the file
-        where the password is stored or specify
-        <computeroutput>-</computeroutput> to let VBoxManage ask you for
-        the password on the command line.
+        To supply the encryption password point
+        <command>VBoxManage</command> to the file where the password is
+        stored or specify <option>-</option> to let VBoxManage ask you
+        for the password on the command line.
       </para>
 
@@ -6014,5 +6155,6 @@
         used, the VM will be paused as soon as the guest tries to access
         an encrypted disk. The user needs to provide the passwords
-        through VBoxManage using the following command:
+        through <command>VBoxManage</command> using the following
+        command:
       </para>
 
@@ -6041,5 +6183,6 @@
         In some circumstances it might be required to decrypt previously
         encrypted images. This can be done in the GUI for a complete VM
-        or using VBoxManage with the following command:
+        or using <command>VBoxManage</command> with the following
+        command:
       </para>
 
@@ -6163,5 +6306,5 @@
 
           <para>
-            Value: Hyper-V vendor signature reported via CPUID to the
+            Value: Hyper-V vendor signature reported by CPUID to the
             guest
           </para>
@@ -6175,5 +6318,5 @@
           <para>
             Specify the Hyper-V vendor signature which is exposed to the
-            guest via CPUID. For debugging Microsoft Windows guests, it
+            guest by CPUID. For debugging Microsoft Windows guests, it
             is required the hypervisor reports the Microsoft vendor.
           </para>
@@ -6222,7 +6365,7 @@
 
           <para>
-            Specify whether to expose the "VS#1" (virtualization
-            service) interface to the guest. This interface is required
-            for debugging Microsoft Windows 10 32-bit guests, but is
+            Specify whether to expose the VS#1 virtualization service
+            interface to the guest. This interface is required for
+            debugging Microsoft Windows 10 32-bit guests, but is
             optional for other Windows versions.
           </para>
@@ -6238,8 +6381,8 @@
         <para>
           Windows supports debugging over a serial cable, USB, IEEE 1394
-          Firewire, and Ethernet (only Windows 8 and later). USB and
-          IEEE 1394 are not applicable for virtual machines, and
-          Ethernet requires Windows 8 or later. While serial connection
-          is universally usable, it is slow.
+          Firewire, and Ethernet. USB and IEEE 1394 are not applicable
+          for virtual machines, and Ethernet requires Windows 8 or
+          later. While a serial connection is universally usable, it is
+          slow.
         </para>
 
@@ -6263,12 +6406,11 @@
             <para>
               A VM configured for Hyper-V paravirtualization running a
-              Windows Vista or newer Windows guest. You may check the
-              effective paravirtualization provider for your VM from the
-              output of the following VBoxManage command:
-            </para>
-
-            <para>
+              Windows Vista or newer Windows guest. You can check the
+              effective paravirtualization provider for your VM with the
+              output of the following <command>VBoxManage</command>
+              command:
+            </para>
+
 <screen>VBoxManage showvminfo "VM name"</screen>
-            </para>
           </listitem>
 
@@ -6287,17 +6429,5 @@
               debugging with a Windows 7 or Vista guest, copy the file
               <computeroutput>kdvm.dll</computeroutput> from a Windows
-              8.0 installation
-
-              <footnote>
-
-                <para>
-                  Only Windows 8.0 ships
-                  <computeroutput>kdvm.dll</computeroutput>. Windows 8.1
-                  and newer Windows versions do not.
-                </para>
-
-              </footnote>
-
-              . This file is typically located in
+              8.0 installation. This file is typically located in
               <computeroutput>C:\Windows\System32</computeroutput>. Copy
               it to the same location in your Windows 7/Vista guest.
@@ -6305,4 +6435,12 @@
               which matches your guest OS.
             </para>
+
+            <note>
+              <para>
+                Only Windows 8.0 ships
+                <computeroutput>kdvm.dll</computeroutput>. Windows 8.1
+                and newer Windows versions do not.
+              </para>
+            </note>
           </listitem>
 
@@ -6323,11 +6461,9 @@
           <listitem>
             <para>
-              Enable the debug options by executing the following
-              VBoxManage command:
-            </para>
-
-            <para>
+              Enable the debug options with the following
+              <command>VBoxManage</command> command:
+            </para>
+
 <screen>VBoxManage modifyvm "VM name" --paravirtdebug "enabled=1"</screen>
-            </para>
 
             <para>
@@ -6335,10 +6471,8 @@
               your host machine on UDP port 50000. However, if you need
               to run the debugger on a remote machine you may specify
-              the remote address and port here. For example::
-            </para>
-
-            <para>
+              the remote address and port here. For example:
+            </para>
+
 <screen>VBoxManage modifyvm "VM name" --paravirtdebug "enabled=1,address=192.168.32.1,port=55000"</screen>
-            </para>
 
             <para>
@@ -6367,7 +6501,5 @@
                 </para>
 
-                <para>
 <screen>bcdedit /dbgsettings net hostip:5.5.5.5 port:50000 key:1.2.3.4</screen>
-                </para>
               </listitem>
 
@@ -6377,29 +6509,26 @@
                 </para>
 
-                <para>
 <screen>bcdedit /set loadoptions host_ip=5.5.5.5,host_port=50000,encryption_key=1.2.3.4</screen>
 
 <screen>bcdedit /set dbgtransport kdvm.dll</screen>
-                </para>
 
                 <para>
                   The IP address and port in the
-                  <computeroutput>bcdedit</computeroutput> command are
-                  ignored when using the Hyper-V debug transport. Any
-                  valid IP and a port number greater than 49151 and
-                  lower than 65536 can be entered.
+                  <command>bcdedit</command> command are ignored when
+                  using the Hyper-V debug transport. Any valid IP and a
+                  port number greater than 49151 and lower than 65536
+                  can be entered.
                 </para>
 
                 <para>
-                  The encryption key in the
-                  <computeroutput>bcdedit</computeroutput> command is
-                  relevant and must be valid. The key "1.2.3.4" used in
-                  the above example is valid and may be used if security
-                  is not a concern. If you do not specify any encryption
-                  key, <computeroutput>bcdedit</computeroutput> will
-                  generate one for you and you will need to copy this
-                  key to later enter in Microsoft WinDbg on the remote
-                  end. This encryption key is used to encrypt the debug
-                  data exchanged between Windows and the debugger.
+                  The encryption key in the <command>bcdedit</command>
+                  command is relevant and must be valid. The key
+                  "1.2.3.4" used in the above example is valid and may
+                  be used if security is not a concern. If you do not
+                  specify any encryption key, <command>bcdedit</command>
+                  will generate one for you and you will need to copy
+                  this key to later enter in Microsoft WinDbg on the
+                  remote end. This encryption key is used to encrypt the
+                  debug data exchanged between Windows and the debugger.
                 </para>
               </listitem>
@@ -6407,24 +6536,21 @@
               <listitem>
                 <para>
-                  Execute one or more of the following commands to
-                  enable debugging for the appropriate phase or
-                  component of your Windows guest:
+                  Run one or more of the following commands to enable
+                  debugging for the appropriate phase or component of
+                  your Windows guest:
                 </para>
 
+<screen>bcdedit /set debug on</screen>
+
+<screen>bcdedit /set bootdebug on</screen>
+
+<screen>bcdedit /set {bootmgr} bootdebug on</screen>
+
                 <para>
-<screen>bcdedit /set debug on</screen>
-
-<screen>bcdedit /set bootdebug on</screen>
-
-<screen>bcdedit /set {bootmgr} bootdebug on</screen>
-                </para>
-
-                <para>
-                  Please note that the
-                  <computeroutput>bootdebug</computeroutput> options are
-                  only effective on Windows 8 or newer when using the
-                  Hyper-V debug transport. Refer to Microsoft Windows
-                  documentation for detailed explanation of
-                  <computeroutput>bcdedit</computeroutput> options.
+                  Please note that the <command>bootdebug</command>
+                  options are only effective on Windows 8 or newer when
+                  using the Hyper-V debug transport. Refer to Microsoft
+                  Windows documentation for detailed explanation of
+                  <command>bcdedit</command> options.
                 </para>
               </listitem>
@@ -6442,5 +6568,6 @@
               From the <emphasis role="bold">File</emphasis> menu,
               select <emphasis role="bold">Kernel Debug</emphasis>. On
-              the NET tab, specify the UDP port number you used in the
+              the <emphasis role="bold">NET</emphasis> tab, specify the
+              UDP port number you used in the
               <computeroutput>paravirtdebug</computeroutput> options. If
               you did not specify any, leave it as 50000. Ensure that
@@ -6450,5 +6577,5 @@
 
             <para>
-              In the Key field, enter
+              In the <emphasis role="bold">Key</emphasis> field, enter
               <computeroutput>1.2.3.4</computeroutput> or the encryption
               key from the <computeroutput>bcdedit</computeroutput>
@@ -6459,15 +6586,17 @@
               Click <emphasis role="bold">OK</emphasis> to start
               listening for connections. Microsoft WinDbg typically
-              shows a "Waiting to reconnect" message during this phase.
-            </para>
-
-            <para>
-              Alternatively, launch WinDbg from the command line to
-              directly start a debug session:
+              shows a Waiting to Reconnect message during this phase.
+            </para>
+
+            <para>
+              Alternatively, to directly start a debug session, run
+              WinDbg from the command line as follows :
+            </para>
 
 <screen>windbg.exe -k net:port=50000,key=1.2.3.4</screen>
 
-              Please refer to the WinDbg documentation for complete
-              command line syntax.
+            <para>
+              See the WinDbg documentation for the complete command line
+              syntax.
             </para>
           </listitem>
@@ -6495,12 +6624,12 @@
       As an experimental feature, primarily due to being limited to
       Linux host only and unknown Linux distribution coverage,
-      VirtualBox supports passing through the PC speaker to the host.
-      The PC speaker, sometimes called the system speaker, is a way to
-      produce audible feedback such as beeps without the need for
+      &product-name; supports passing through the PC speaker to the
+      host. The PC speaker, sometimes called the system speaker, is a
+      way to produce audible feedback such as beeps without the need for
       regular audio and sound card support.
     </para>
 
     <para>
-      The PC speaker passthrough feature in VirtualBox handles beeps
+      The PC speaker passthrough feature in &product-name; handles beeps
       only. Advanced PC speaker use by the VM, such as PCM audio, will
       not work, resulting in undefined host behavior.
@@ -6508,5 +6637,5 @@
 
     <para>
-      Producing beeps on Linux is a very complex topic. VirtualBox
+      Producing beeps on Linux is a very complex topic. &product-name;
       offers a collection of options, in an attempt to make this work
       deterministically and reliably on as many Linux distributions and
@@ -6520,49 +6649,97 @@
         <thead>
           <row>
-            <entry><emphasis role="bold">Code</emphasis></entry>
-            <entry><emphasis role="bold">Device</emphasis></entry>
-            <entry><emphasis role="bold">Notes</emphasis></entry>
+            <entry><para>
+                <emphasis role="bold">Code</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">Device</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">Notes</emphasis>
+              </para></entry>
           </row>
         </thead>
         <tbody>
           <row>
-            <entry>1</entry>
-            <entry><computeroutput>/dev/input/ by-path/platform-
-              pcspkr-event-spkr</computeroutput></entry>
-            <entry>Direct host PC speaker use.</entry>
+            <entry><para>
+                1
+              </para></entry>
+            <entry><para>
+                <computeroutput>/dev/input/by-path/platform-
+                pcspkr-event-spkr</computeroutput>
+              </para></entry>
+            <entry><para>
+                Direct host PC speaker use.
+              </para></entry>
           </row>
           <row>
-            <entry>2</entry>
+            <entry><para>
+                2
+              </para></entry>
             <entry><computeroutput>/dev/tty</computeroutput></entry>
-            <entry>Uses the terminal association of the VM process. VM needs to be started
-              on a virtual console.</entry>
+            <entry><para>
+                Uses the terminal association of the VM process. VM
+                needs to be started on a virtual console.
+              </para></entry>
           </row>
           <row>
-            <entry>3</entry>
-            <entry><computeroutput>/dev/tty0</computeroutput> or
-              <computeroutput>/dev/vc/0</computeroutput></entry>
-            <entry>Can only be used by user <computeroutput>root</computeroutput> or users
-              with capability
-              <computeroutput>cap_sys_tty_config</computeroutput></entry>
+            <entry><para>
+                3
+              </para></entry>
+            <entry><para>
+                <computeroutput>/dev/tty0</computeroutput> or
+                <computeroutput>/dev/vc/0</computeroutput>
+              </para></entry>
+            <entry><para>
+                Can only be used by user
+                <computeroutput>root</computeroutput> or users with
+                <computeroutput>cap_sys_tty_config</computeroutput>
+                capability.
+              </para></entry>
           </row>
           <row>
-            <entry>9</entry>
-            <entry>user specified console or evdev device path</entry>
-            <entry>Like 1-3, just with a custom device path.</entry>
+            <entry><para>
+                9
+              </para></entry>
+            <entry><para>
+                A user-specified console or evdev device path.
+              </para></entry>
+            <entry><para>
+                As for codes 1 to 3, but with a custom device path.
+              </para></entry>
           </row>
           <row>
-            <entry>70</entry>
-            <entry><computeroutput>/dev/tty</computeroutput></entry>
-            <entry>Standard beep only. Loses frequency and length. See code 2.</entry>
+            <entry><para>
+                70
+              </para></entry>
+            <entry><para>
+                <computeroutput>/dev/tty</computeroutput>
+              </para></entry>
+            <entry><para>
+                Standard beep only. Loses frequency and length. See code
+                2.
+              </para></entry>
           </row>
           <row>
-            <entry>79</entry>
-            <entry>user specified terminal device path</entry>
-            <entry>Like 70, just with a custom device path.</entry>
+            <entry><para>
+                79
+              </para></entry>
+            <entry><para>
+                A user-specified terminal device path.
+              </para></entry>
+            <entry><para>
+                As for code 70, but with a custom device path.
+              </para></entry>
           </row>
           <row>
-            <entry>100</entry>
-            <entry>all of the above</entry>
-            <entry>Tries all above codes.</entry>
+            <entry><para>
+                100
+              </para></entry>
+            <entry><para>
+                All of the above.
+              </para></entry>
+            <entry><para>
+                Tries all the available codes.
+              </para></entry>
           </row>
         </tbody>
@@ -6572,7 +6749,9 @@
     <para>
       To enable PC speaker passthrough use the following command:
+    </para>
 
 <screen>VBoxManage setextradata "VM name" "VBoxInternal/Devices/i8254/0/Config/PassthroughSpeaker" N</screen>
 
+    <para>
       Replace <computeroutput>N</computeroutput> with the code
       representing the case you want to use. Changing this setting will
@@ -6592,9 +6771,9 @@
     <para>
       Enabling PC speaker passthrough for the VM is usually the simple
-      part. The real difficulty is making sure that VirtualBox can
+      part. The real difficulty is making sure that &product-name; can
       access the necessary device, because in a typical Linux install
       most of them can only be accessed by user
       <computeroutput>root</computeroutput>. You should follow the
-      preferred way to persistently change this, e.g. by referring to
+      preferred way to persistently change this, such as by referring to
       your distribution's documentation. Since there are countless Linux
       distribution variants, we can only give the general hints that
@@ -6608,9 +6787,9 @@
     <para>
       Sometimes additional rules are applied by the kernel to limit
-      access (e.g. that the VM process must have the same controlling
-      terminal as the device configured to be used for beeping,
-      something which is often very difficult to achieve for GUI
-      applications such as VirtualBox). The table above contains some
-      hints, but generally refer to the Linux documentation.
+      access. For example, that the VM process must have the same
+      controlling terminal as the device configured to be used for
+      beeping, something which is often very difficult to achieve for
+      GUI applications such as &product-name;. The table above contains
+      some hints, but in general refer to the Linux documentation.
     </para>
 
@@ -6623,6 +6802,6 @@
       Check if the beeps are audible if you connect speakers to your
       sound card. Today almost all systems have one. Finally, check if
-      the audio mixer control has a channel named "beep" (could be
-      hidden in the mixer settings) and that it is not muted.
+      the audio mixer control has a channel named "beep", which could be
+      hidden in the mixer settings, and that it is not muted.
     </para>
 
@@ -6634,10 +6813,10 @@
 
     <para>
-      Starting with 5.1.0, VirtualBox supports passing through USB
-      devices which are exposed over the network using the USB over IP
-      protocol without the need to configure the client side provided by
-      the kernel and usbip tools. Furthermore, this feature works with
-      VirtualBox running on any supported host, rather than just Linux
-      alone, as is the case with the official client.
+      &product-name; supports passing through USB devices which are
+      exposed over the network using the USB over IP protocol without
+      the need to configure the client side provided by the kernel and
+      usbip tools. Furthermore, this feature works with &product-name;
+      running on any supported host, rather than just Linux alone, as is
+      the case with the official client.
     </para>
 
@@ -6646,18 +6825,20 @@
       server exporting the devices must be added with the following
       command:
+    </para>
 
 <screen>VBoxManage usbdevsource add "Unique name" --backend "USBIP" --address "Device server[:port]"</screen>
 
+    <para>
       USB devices exported on the device server are then accessible
-      through the GUI or VBoxManage, like any USB devices attached
-      locally. This can be used multiple times to access different
-      device servers.
+      through the GUI or <command>VBoxManage</command>, like any USB
+      devices attached locally. This can be used multiple times to
+      access different device servers.
     </para>
 
     <para>
       To remove a device server, the following command can be used:
+    </para>
 
 <screen>VBoxManage usbdevsource remove "Unique name"</screen>
-    </para>
 
     <sect2 id="usbip-setup-server">
@@ -6674,22 +6855,23 @@
         The particular installation method for the necessary tools
         depends on which distribution is used. For example, for Debian
-        based systems - the following command should be used to install
+        based systems, the following command should be used to install
         the required tools:
+      </para>
 
 <screen>apt-get install usbip-utils</screen>
-      </para>
 
       <para>
         To check whether the necessary tools are already installed use
         the following command:
+      </para>
 
 <screen>
 $ usbip list -l
       </screen>
-      </para>
 
       <para>
         This should produce output similar to that shown in the example
         below:
+      </para>
 
 <screen>
@@ -6700,5 +6882,4 @@
    Logitech, Inc. : Unifying Receiver (046d:c52b)
       </screen>
-      </para>
 
       <para>
@@ -6706,7 +6887,9 @@
         started as <computeroutput>root</computeroutput> using the
         following command:
+      </para>
 
 <screen>usbipd -D</screen>
 
+      <para>
         Refer to the documentation for the installed distribution to
         determine how to start the service when the system boots.
@@ -6715,12 +6898,15 @@
       <para>
         By default, no device on the server is exported. This must be
-        done manually for each device. To export a device use:
+        done manually for each device. To export a device use the
+        following command:
+      </para>
 
 <screen>usbip bind -b "bus identifier"</screen>
 
-        To export the multicard reader from above, for example - use:
+      <para>
+        To export the multicard reader in the previous example:
+      </para>
 
 <screen>usbip bind -b 4-2</screen>
-      </para>
 
     </sect2>
@@ -6745,5 +6931,72 @@
   </sect1>
 
-  <xi:include href="user_isomakercmd-man.xml"    xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <sect1 id="hyperv-support">
+
+    <title>Using Hyper-V with &product-name;</title>
+
+    <para>
+      &product-name; can be used on a Windows host where Hyper-V is
+      running. This is an experimental feature.
+    </para>
+
+    <para>
+      No configuration is required. &product-name; detects Hyper-V
+      automatically and uses Hyper-V as the virtualization engine for
+      the host. The CPU icon in the VM window status bar indicates that
+      Hyper-V is being used.
+    </para>
+
+    <note>
+      <para>
+        When using this feature, you might experience significant
+        &product-name; performance degradation on some host systems.
+      </para>
+    </note>
+
+  </sect1>
+
+  <sect1 id="nested-virt">
+
+    <title>Nested Virtualization</title>
+
+    <para>
+      &product-name; supports <emphasis>nested virtualization</emphasis>
+      on host systems that run AMD CPUs. This feature enables the
+      passthrough of hardware virtualization functions to the guest VM.
+      That means that you can install a hypervisor, such as
+      &product-name; or KVM, on an &product-name; guest. You can then
+      create and run VMs within the guest VM.
+    </para>
+
+    <para>
+      You can enable the nested virtualization feature in one of the
+      following ways:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          From the VirtualBox Manager, select the
+          <emphasis role="bold">Enable Nested VT-x/AMD-V</emphasis>
+          check box on the <emphasis role="bold">System</emphasis> tab.
+          To disable the feature, deselect the check box.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Use the <option>--nested-hw-virt</option> option of the
+          <command>VBoxManage modifyvm</command> command to enable or
+          disable nested virtualization. See
+          <xref linkend="vboxmanage-modifyvm"/>.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+  </sect1>
+
+  <xi:include href="user_isomakercmd-man.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
 </chapter>
Index: trunk/doc/manual/en_US/user_BasicConcepts.xml
===================================================================
--- trunk/doc/manual/en_US/user_BasicConcepts.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_BasicConcepts.xml	(revision 76078)
@@ -10,22 +10,42 @@
 
   <para>
-    Whereas <xref linkend="Introduction" /> gave you a quick
-    introduction to VirtualBox and how to get your first virtual machine
-    running, the following chapter describes in detail how to configure
-    virtual machines.
+    This chapter provides detailed steps for configuring an
+    &product-name; virtual machine (VM). For an introduction to
+    &product-name; and steps to get your first virtual machine running,
+    see <xref linkend="Introduction" />.
   </para>
 
   <para>
-    You have considerable latitude in deciding what virtual hardware
-    will be provided to the guest. The virtual hardware can be used for
-    communicating with the host system or with other guests. For
-    instance, if you provide VirtualBox with the image of a CD-ROM in an
-    ISO file, VirtualBox can present this image to a guest system as if
-    it were a physical CD-ROM. Similarly, you can give a guest system
-    access to the real network via its virtual network card, and, if you
-    so choose, give the host system, other guests, or computers on the
-    Internet access to the guest system.
+    You have considerable latitude when deciding what virtual hardware
+    to provide to the guest. Use virtual hardware to communicate with
+    the host system or with other guests. For example, you can use
+    virtual hardware in the following ways:
   </para>
 
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        Have &product-name; present an ISO CD-ROM image to a guest
+        system as if it were a physical CD-ROM.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        Provide a guest system access to the physical network through
+        its virtual network card.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        Provide the host system, other guests, and computers on the
+        Internet access to the guest system.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
   <sect1 id="guestossupport">
 
@@ -33,8 +53,8 @@
 
     <para>
-      Since VirtualBox is designed to provide a generic virtualization
-      environment for x86 systems, it may run operating systems of any
-      kind, even those not listed here. However, the focus is to
-      optimize VirtualBox for the following guest systems:
+      Because &product-name; is designed to provide a generic
+      virtualization environment for x86 systems, it can run operating
+      systems (OSes) of any kind. However, &product-name; focuses on the
+      following guest systems:
     </para>
 
@@ -46,36 +66,86 @@
         </para>
 
-        <para>
-          All versions, editions and service packs are fully supported.
-          However, there are some issues with older service packs. We
-          recommend that you install service pack 6a. Guest Additions
-          are available with a limited feature set.
-        </para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Fully supports all versions, editions, and service packs.
+              Note that you might encounter issues with some older
+              service packs, so install at least service pack 6a.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are available with a limited feature set.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold">Windows 2000/XP/Server 2003/Vista/Server
-          2008/7/8/8.1/10 RTM 10240/Server 2012:</emphasis>
-        </para>
-
-        <para>
-          All versions, editions and service packs are fully supported,
-          including 64-bit versions, under the preconditions listed
-          below. Guest Additions are available. Windows 8 and later
-          requires hardware virtualization to be enabled.
-        </para>
+          <emphasis role="bold">Windows 2000, Windows XP, Windows Server
+          2003, Windows Vista, Windows Server 2008, Windows 7, Windows
+          8, Windows 8.1, Windows 10 RTM 10240, Windows Server
+          2012:</emphasis>
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Fully supports all versions, editions, and service packs,
+              including 64-bit versions under the preconditions for
+              MS-DOS, Windows 3.x, Windows 95, Windows 98, and Windows
+              ME.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Note that you must enable hardware virtualization when
+              running at least Windows 8.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are available.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold">DOS/Windows 3.x/95/98/ME:</emphasis>
-        </para>
-
-        <para>
-          Limited testing has been performed. Use beyond legacy
-          installation mechanisms is not recommended. Guest Additions
-          are not available.
-        </para>
+          <emphasis role="bold">MS-DOS, Windows 3.x, Windows 95, Windows
+          98, Windows ME:</emphasis>
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Limited testing has been performed.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Use beyond legacy installation mechanisms is not
+              recommended.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are not available.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
@@ -95,13 +165,27 @@
         </para>
 
-        <para>
-          All versions and editions are fully supported, both 32-bit and
-          64-bit. Guest Additions are available.
-        </para>
-
-        <para>
-          We strongly recommend using a Linux kernel version of 2.6.13
-          or later for best performance.
-        </para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Fully supports all versions and editions, both 32-bit and
+              64-bit.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              For best performance, use at least Linux kernel version
+              2.6.13.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are available.
+            </para>
+          </listitem>
+
+        </itemizedlist>
 
         <note>
@@ -109,6 +193,5 @@
             Certain Linux kernel releases have bugs that prevent them
             from executing in a virtual environment. See
-            <xref
-                linkend="ts_linux-buggy" />.
+            <xref linkend="ts_linux-buggy" />.
           </para>
         </note>
@@ -120,20 +203,51 @@
         </para>
 
-        <para>
-          All versions and editions are fully supported, both 32-bit and
-          64-bit. Guest Additions are available.
-        </para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Fully supports all versions and editions, both 32-bit and
+              64-bit.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are available.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold"> Solaris 10u6 and higher, Solaris 11,
-          including Solaris 11 Express:</emphasis>
-        </para>
-
-        <para>
-          Fully supported. 64-bit, prior to Solaris 11 11/11, and also
-          32 32-bit. Guest Additions are available.
-        </para>
+          <emphasis role="bold"> Oracle Solaris 10 and Oracle Solaris
+          11:</emphasis>
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Fully supports all versions starting with Oracle Solaris
+              10 8/08 and Oracle Solaris 11.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Supports 64-bit prior to Oracle Solaris 11 11/11, and
+              32-bit.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are available.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
@@ -143,8 +257,26 @@
         </para>
 
-        <para>
-          Requires hardware virtualization to be enabled. Limited
-          support. Guest Additions are not available yet.
-        </para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Limited support.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Note that you must enable hardware virtualization when
+              running FreeBSD.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are not available.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
@@ -154,9 +286,26 @@
         </para>
 
-        <para>
-          Requires hardware virtualization to be enabled. Versions 3.7
-          and later are supported. Guest Additions are not available
-          yet.
-        </para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Supports at least version 3.7.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Note that you must enable hardware virtualization when
+              running OpenBSD.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are not available.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
@@ -166,10 +315,28 @@
         </para>
 
-        <para>
-          Requires hardware virtualization to be enabled. We officially
-          support MCP2 only. Other OS/2 versions may or may not work.
-          Guest Additions are available with a limited feature set. See
-          <xref linkend="KnownIssues" />.
-        </para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Only MCP2 is supported. Other OS/2 versions might not
+              work.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Note that you must enable hardware virtualization when
+              running OS/2 Warp 4.5.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are available with a limited feature set.
+              See <xref linkend="KnownIssues" />.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
@@ -179,10 +346,22 @@
         </para>
 
-        <para>
-          VirtualBox 3.2 added experimental support for Mac OS X guests,
-          but this comes with restrictions. See
-          <xref linkend="intro-macosxguests"/> and also
-          <xref linkend="KnownIssues" />.
-        </para>
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              &product-name; 3.2 added experimental support for Mac OS X
+              guests, with restrictions. See
+              <xref linkend="intro-macosxguests"/> and
+              <xref linkend="KnownIssues" />.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Guest Additions are not available.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
@@ -194,19 +373,21 @@
 
       <para>
-        Starting with version 3.2, VirtualBox has experimental support
-        for Mac OS X guests. This allows you to install and execute
-        unmodified versions of Mac OS X on supported host hardware.
-      </para>
-
-      <para>
-        Whereas competing solutions perform modifications to the Mac OS
-        X install DVDs, such as a different boot loader and replaced
-        files, VirtualBox is the first product to provide the modern PC
-        architecture expected by OS X without requiring any "hacks".
-      </para>
-
-      <para>
-        You should be aware of a number of important issues before
-        attempting to install a Mac OS X guest:
+        &product-name; enables you to install and execute unmodified
+        versions of Mac OS X guests on supported host hardware. Note
+        that this feature is experimental and thus unsupported.
+      </para>
+
+      <para>
+        &product-name; is the first product to provide the modern PC
+        architecture expected by OS X without requiring any of the
+        modifications used by competing virtualization solutions. For
+        example, some competing solutions perform modifications to the
+        Mac OS X install DVDs, such as a different boot loader and
+        replaced files.
+      </para>
+
+      <para>
+        Be aware of the following important issues before you attempt to
+        install a Mac OS X guest:
       </para>
 
@@ -218,19 +399,19 @@
             <emphasis role="bold">both license and technical
             restrictions</emphasis> that limit its use to certain
-            hardware and usage scenarios. It is important that you
-            understand and obey these restrictions.
-          </para>
-
-          <para>
-            In particular, for most versions of Mac OS X, Apple
-            prohibits installing them on non-Apple hardware.
+            hardware and usage scenarios. You must understand and comply
+            with these restrictions.
+          </para>
+
+          <para>
+            In particular, Apple prohibits the installation of most
+            versions of Mac OS X on non-Apple hardware.
           </para>
 
           <para>
             These license restrictions are also enforced on a technical
-            level. Mac OS X verifies whether it is running on Apple
-            hardware, and most DVDs that come with Apple hardware even
-            check for an exact model. These restrictions are
-            <emphasis>not</emphasis> circumvented by VirtualBox and
+            level. Mac OS X verifies that it is running on Apple
+            hardware. Most DVDs that accompany Apple hardware check for
+            the exact model. These restrictions are
+            <emphasis>not</emphasis> circumvented by &product-name; and
             continue to apply.
           </para>
@@ -239,27 +420,32 @@
         <listitem>
           <para>
-            Only <emphasis role="bold">CPUs</emphasis> known and tested
-            by Apple are supported. As a result, if your Intel CPU is
-            newer than the build of Mac OS X, or if you have a non-Intel
-            CPU, it will most likely panic during bootup with an
-            "Unsupported CPU" exception. It is generally best to use the
-            Mac OS X DVD that came with your Apple hardware.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            The Mac OS X installer expects the harddisk to be
-            <emphasis role="bold">partitioned</emphasis> so when it does
-            not offer a selection, you have to start the Disk Utility
-            from the Tools menu and partition the hard disk. Then close
-            the Disk Utility and proceed with the installation.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            In addition, as Mac OS X support in VirtualBox is currently
-            still experimental, see also <xref linkend="KnownIssues" />.
+            Only <emphasis role="bold">CPUs</emphasis> that are known
+            and tested by Apple are supported. As a result, if your
+            Intel CPU is newer than the Mac OS X build, or if you have a
+            non-Intel CPU, you will likely encounter a panic during
+            bootup with an "Unsupported CPU" exception.
+          </para>
+
+          <para>
+            Ensure that you use the Mac OS X DVD that comes with your
+            Apple hardware.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            The Mac OS X installer expects the hard disk to be
+            <emphasis>partitioned</emphasis>. So, the installer will not
+            offer a partition selection to you. Before you can install
+            the software successfully, start the Disk Utility from the
+            Tools menu and partition the hard disk. Close the Disk
+            Utility and proceed with the installation.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            In addition, Mac OS X support in &product-name; is an
+            experimental feature. See <xref linkend="KnownIssues" />.
           </para>
         </listitem>
@@ -274,18 +460,7 @@
 
       <para>
-        VirtualBox supports 64-bit guest operating systems, even on
-        32-bit host operating systems,
-
-        <footnote>
-
-          <para>
-            64-bit guest support was added with VirtualBox 2.0; support
-            for 64-bit guests on 32-bit hosts was added with VirtualBox
-            2.1.
-          </para>
-
-        </footnote>
-
-        provided that the following conditions are met:
+        &product-name; enables you to run 64-bit guest OSes even on a
+        32-bit host OS. To run a 64-bit guest OS on a 32-bit host
+        system, ensure that you meet the following conditions:
       </para>
 
@@ -294,5 +469,5 @@
         <listitem>
           <para>
-            You need a 64-bit processor with hardware virtualization
+            You need a 64-bit processor that has hardware virtualization
             support. See <xref linkend="hwvirt" />.
           </para>
@@ -302,23 +477,22 @@
           <para>
             You must enable hardware virtualization for the particular
-            VM for which you want 64-bit support. Software
-            virtualization is not supported for 64-bit VMs.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If you want to use 64-bit guest support on a 32-bit host
-            operating system, you must also select a 64-bit operating
-            system for the particular VM. Since supporting 64 bits on
-            32-bit hosts incurs additional overhead, VirtualBox only
-            enables this support upon explicit request.
-          </para>
-
-          <para>
-            On 64-bit hosts, which typically come with hardware
-            virtualization support, 64-bit guest operating systems are
-            always supported regardless of settings. So you can simply
-            install a 64-bit operating system in the guest.
+            VM that requires 64-bit support. Software virtualization is
+            not supported for 64-bit VMs.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            To use 64-bit guest support on a 32-bit host OS, you must
+            select a 64-bit OS for the particular VM. Since supporting
+            64 bits on 32-bit hosts incurs additional overhead,
+            &product-name; only enables this support only upon explicit
+            request.
+          </para>
+
+          <para>
+            64-bit hosts typically come with hardware virtualization
+            support. So, you can install a 64-bit guest OS in the guest
+            regardless of the settings.
           </para>
         </listitem>
@@ -326,27 +500,22 @@
       </itemizedlist>
 
-      <para>
-        <warning>
-          <para>
-            On any host, you should enable <emphasis role="bold">I/O
-            APIC</emphasis> for virtual machines that you intend to use
-            in 64-bit mode. This is especially true for 64-bit Windows
-            VMs. See <xref linkend="settings-general-advanced" />. In
-            addition, for 64-bit Windows guests, you should make sure
-            that the VM uses the <emphasis role="bold">Intel networking
-            device</emphasis>, since there is no 64-bit driver support
-            for the AMD PCNet card. See
-            <xref
-          linkend="nichardware" />.
-          </para>
-        </warning>
-      </para>
-
-      <para>
-        If you use the <emphasis role="bold">Create VM </emphasis>
-        wizard of the VirtualBox graphical user interface, see
-        <xref linkend="gui-createvm" />, VirtualBox will automatically
-        use the correct settings for each selected 64-bit operating
-        system type.
+      <warning>
+        <para>
+          Be sure to enable <emphasis role="bold">I/O APIC</emphasis>
+          for virtual machines that you intend to use in 64-bit mode.
+          This is especially true for 64-bit Windows VMs. See
+          <xref linkend="settings-general-advanced" />. For 64-bit
+          Windows guests, ensure that the VM uses the
+          <emphasis role="bold">Intel networking device</emphasis>
+          because there is no 64-bit driver support for the AMD PCNet
+          card. See <xref linkend="nichardware" />.
+        </para>
+      </warning>
+
+      <para>
+        If you use the <emphasis role="bold">Create VM</emphasis> wizard
+        of the &product-name; graphical user interface (GUI),
+        &product-name; automatically uses the correct settings for each
+        selected 64-bit OS type. See <xref linkend="gui-createvm" />.
       </para>
 
@@ -360,46 +529,328 @@
 
     <para>
-      VirtualBox is able to automatically install a guest by providing
-      the installation medium as well as a few parameters like the name
-      of the default user.
-    </para>
-
-    <para>
-      To perform an unattended guest installation, a VM has to be
-      prepared. A VM can be created using the GUI as described in
-      <xref
-    linkend="gui-createvm" /> or by using VBoxManage as
-      described in <xref linkend="vboxmanage-createvm" />. In general
-      it's sufficient to chose the type of the guest operating system
-      and to use the proposed defaults for that operating system. See
-      the following sections on how to change the VM settings for
-      certain needs.
-    </para>
-
-    <para>
-      After the VM was created, the VM has to be prepared for unattended
-      guest execution use VBoxManage, see
-      <xref
-    linkend="vboxmanage-unattended" />. During this step
-      VirtualBox scans the installation medium and changes certain
-      parameters for a seamless installation as a guest running on
-      VirtualBox.
-    </para>
-
-    <para>
-      Once the preparation phase was successfully finished, the VM can
-      be started either from the GUI or from VBoxManage, see
-      <xref
-    linkend="vboxmanage-startvm" />. The VM will now perform
-      the automatic installation. Please note that the boot order was
-      changed during the preparation phase by giving the virtual hard
-      disk the highest priority. As the disk is normally empty before an
-      automatic installation is started, the VM will boot from the
-      virtual DVD drive as next available boot medium and the
-      installation will start. If, for some reason, the virtual hard
-      disk contains a bootable operating system then the installation
-      will not start unless the boot order was manually changed by
-      pressing F12 during the BIOS splash screen.
-    </para>
+      &product-name; is able to install a guest operating system
+      automatically. You only need to provide the installation medium
+      and a few other parameters, such as the name of the default user.
+    </para>
+
+    <para>
+      Performing an unattended guest installation involves the following
+      steps:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Create a new VM.</emphasis> You can use
+          either of the following to do this:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              The VirtualBox Manager, see
+              <xref linkend="gui-createvm" />.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              The <command>VBoxManage</command> command, see
+              <xref linkend="vboxmanage-createvm" />.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+        <para>
+          For the new VM, you can usually just choose the type of the
+          guest operating system and accept the default settings for
+          that operating system. The following sections in this chapter
+          describe how to change the settings for a VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Prepare the VM for unattended guest
+          installation.</emphasis> Use the <command>VBoxManage
+          unattended</command> command, see
+          <xref linkend="vboxmanage-unattended" />.
+        </para>
+
+        <para>
+          During this step, &product-name; scans the installation medium
+          and changes certain parameters to ensure a seamless
+          installation as a guest running on &product-name;.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Start the VM.</emphasis> You can use the
+          VirtualBox Manager or the <command>VBoxManage
+          startvm</command> command.
+        </para>
+
+        <para>
+          When you start the VM, the unattended installation is
+          performed automatically.
+        </para>
+
+        <para>
+          Note that the boot order is changed during the preparation
+          step, giving the virtual hard disk the highest priority. As
+          this disk is normally empty before an automatic installation
+          is started, the VM will instead boot from the virtual DVD
+          drive as next available boot medium and the installation will
+          start. If the virtual hard disk contains a bootable operating
+          system, then the installation will not start. The boot order
+          must be manually changed, by pressing F12 during the BIOS
+          splash screen.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>
+      <xref linkend="unattended-guest-install-example"/> describes how
+      to perform an unattended guest installation for an Oracle Linux
+      guest.
+    </para>
+
+    <sect2 id="unattended-guest-install-example">
+
+      <title>An Example of Unattended Guest Installation</title>
+
+      <para>
+        The following example shows how to perform an unattended guest
+        installation for an Oracle Linux virtual machine. The example
+        uses various <command>VBoxManage</command> commands to prepare
+        the guest VM. The <command>VBoxManage unattended
+        install</command> command is then used to install and configure
+        the guest operating system.
+      </para>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Create the virtual machine.
+          </para>
+
+<screen># VM="ol7-autoinstall"
+# VBoxManage list ostypes
+# VBoxManage createvm --name $VM --ostype "Oracle_64" --register</screen>
+
+          <para>
+            Note the following:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                The variable $VM represents the name of the VM.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The <command>VBoxManage list ostypes</command> command
+                lists the guest operating systems supported by
+                &product-name;, including the name used for each
+                operating system in the <command>VBoxManage</command>
+                commands.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                A 64-bit Oracle Linux 7 VM is created and registered
+                with &product-name;.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The VM has a unique UUID.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                An XML settings file is generated.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>
+            Create a virtual hard disk and storage devices for the VM.
+          </para>
+
+<screen># VBoxManage createhd --filename /VirtualBox/$VM/$VM.vdi --size 32768
+# VBoxManage storagectl $VM --name "SATA Controller" --add sata --controller IntelAHCI
+# VBoxManage storageattach $VM --storagectl "SATA Controller" --port 0 --device 0 \
+--type hdd --medium /VirtualBox/$VM/$VM.vdi
+# VBoxManage storagectl $VM --name "IDE Controller" --add ide
+# VBoxManage storageattach $VM --storagectl "IDE Controller" --port 0 --device 0 \
+--type dvddrive --medium /u01/Software/OL/OracleLinux-R7-U6-Server-x86_64-dvd.iso</screen>
+
+          <para>
+            Note the following:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                A 32768 MB virtual hard disk is created.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                A SATA storage controller is created and the virtual
+                hard disk is attached.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                An IDE storage controller for a virtual DVD drive is
+                created and an Oracle Linux installation ISO is
+                attached.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>
+            (Optional) Configure some settings for the VM.
+          </para>
+
+<screen># VBoxManage modifyvm $VM --ioapic on
+# VBoxManage modifyvm $VM --boot1 dvd --boot2 disk --boot3 none --boot4 none
+# VBoxManage modifyvm $VM --memory 8192 --vram 128</screen>
+
+          <para>
+            Note the following:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                I/O APIC is enabled for the motherboard of the VM.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The boot order for the VM is configured.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                8192 MB of RAM and 128 MB of video RAM are allocated to
+                the VM.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>
+            Perform an unattended install of the operating system.
+          </para>
+
+<screen># VBoxManage unattended install $VM \
+--iso=/u01/Software/OL/OracleLinux-R7-U6-Server-x86_64-dvd.iso \
+--user=<replaceable>login</replaceable> --full-user-name=<replaceable>name</replaceable> --password <replaceable>password</replaceable> \
+--install-additions --time-zone=CET</screen>
+
+          <para>
+            Note the following:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                An Oracle Linux ISO is specified as the installation
+                ISO.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Specify a login name, full name, and login password for
+                a default user on the guest operating system.
+              </para>
+
+              <para>
+                The specified password is also used for the root user
+                account on the guest.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The Guest Additions are installed on the VM.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The time zone for the guest operating system is set to
+                Central European Time (CET).
+              </para>
+            </listitem>
+
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>
+            Start the virtual machine.
+          </para>
+
+          <para>
+            This step completes the unattended install process.
+          </para>
+
+<screen># VBoxManage startvm $VM --type headless</screen>
+
+          <para>
+            The VM is started in headless mode. The VirtualBox Manager
+            window is not displayed.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            (Optional) Update the guest operating system to use the
+            latest Oracle Linux packages.
+          </para>
+
+          <para>
+            On the guest VM, run the following command:
+          </para>
+
+<screen># yum update</screen>
+        </listitem>
+
+      </orderedlist>
+
+    </sect2>
 
   </sect1>
@@ -410,7 +861,7 @@
 
     <para>
-      VirtualBox virtualizes nearly all hardware of the host. Depending
-      on a VM's configuration, the guest will see the following virtual
-      hardware:
+      &product-name; virtualizes nearly all hardware of the host.
+      Depending on a VM's configuration, the guest will see the
+      following virtual hardware:
     </para>
 
@@ -420,13 +871,13 @@
         <para>
           <emphasis role="bold">Input devices.</emphasis> By default,
-          VirtualBox emulates a standard PS/2 keyboard and mouse. These
-          devices are supported by almost all past and present operating
-          systems.
-        </para>
-
-        <para>
-          In addition, VirtualBox can provide virtual USB input devices
-          to avoid having to capture mouse and keyboard, as described in
-          <xref
+          &product-name; emulates a standard PS/2 keyboard and mouse.
+          These devices are supported by almost all past and present
+          operating systems.
+        </para>
+
+        <para>
+          In addition, &product-name; can provide virtual USB input
+          devices to avoid having to capture mouse and keyboard, as
+          described in <xref
           linkend="keyb_mouse_normal" />.
         </para>
@@ -435,8 +886,8 @@
       <listitem>
         <para>
-          <emphasis role="bold">Graphics.</emphasis> The VirtualBox
-          graphics device (sometimes referred to as VGA device) is,
-          unlike nearly all other emulated devices, not based on any
-          physical counterpart. It is a simple, synthetic device which
+          <emphasis role="bold">Graphics.</emphasis> The &product-name;
+          graphics device, sometimes referred to as a VGA device, is not
+          based on any physical counterpart. This is unlike nearly all
+          other emulated devices. It is a simple, synthetic device which
           provides compatibility with standard VGA and several extended
           registers used by the VESA BIOS Extensions (VBE).
@@ -446,10 +897,10 @@
       <listitem>
         <para>
-          <emphasis role="bold">Storage.</emphasis> VirtualBox currently
-          emulates the standard ATA interface found on Intel PIIX3/PIIX4
-          chips, the SATA (AHCI) interface, and two SCSI adapters (LSI
-          Logic and BusLogic). See
+          <emphasis role="bold">Storage.</emphasis> &product-name;
+          currently emulates the standard ATA interface found on Intel
+          PIIX3/PIIX4 chips, the SATA (AHCI) interface, and two SCSI
+          adapters (LSI Logic and BusLogic). See
           <xref linkend="harddiskcontrollers" /> for details. Whereas
-          providing one of these would be enough for VirtualBox by
+          providing one of these would be enough for &product-name; by
           itself, this multitude of storage adapters is required for
           compatibility with other hypervisors. Windows is particularly
@@ -470,5 +921,5 @@
       <listitem>
         <para>
-          <emphasis role="bold">USB.</emphasis> VirtualBox emulates
+          <emphasis role="bold">USB.</emphasis> &product-name; emulates
           three USB host controllers: xHCI, EHCI, and OHCI. While xHCI
           handles all USB transfer speeds, only guest operating systems
@@ -480,7 +931,7 @@
         <para>
           Older operating systems typically support OHCI and EHCI. The
-          two controllers are needed because OHCI only handles USB low-
-          and full-speed devices (both USB 1.x and 2.0), while EHCI only
-          handles high-speed devices (USB 2.0 only).
+          two controllers are needed because OHCI only handles USB
+          low-speed and full-speed devices (both USB 1.x and 2.0), while
+          EHCI only handles high-speed devices (USB 2.0 only).
         </para>
 
@@ -488,5 +939,5 @@
           The emulated USB controllers do not communicate directly with
           devices on the host but rather with a virtual USB layer which
-          abstracts the USB protocol and allows the use of remote USB
+          abstracts the USB protocol and enables the use of remote USB
           devices.
         </para>
@@ -496,6 +947,5 @@
         <para>
           <emphasis role="bold">Audio.</emphasis> See
-          <xref
-          linkend="settings-audio" />.
+          <xref linkend="settings-audio" />.
         </para>
       </listitem>
@@ -510,9 +960,8 @@
 
     <para>
-      In the Settings window, under
+      In the <emphasis role="bold">Settings</emphasis> window, under
       <emphasis role="bold">General</emphasis>, you can configure the
       most fundamental aspects of the virtual machine such as memory and
-      essential hardware. There are three tabs: Basic, Advanced and
-      Description.
+      essential hardware. The following tabs are available.
     </para>
 
@@ -522,6 +971,7 @@
 
       <para>
-        In the Basic tab of the General settings category, you can find
-        these settings:
+        In the <emphasis role="bold">Basic</emphasis> tab of the
+        <emphasis role="bold">General</emphasis> settings category, you
+        can find these settings:
       </para>
 
@@ -532,25 +982,25 @@
             <emphasis role="bold">Name:</emphasis> The name under which
             the VM is shown in the list of VMs in the main window. Under
-            this name, VirtualBox also saves the VM's configuration
-            files. By changing the name, VirtualBox renames these files
-            as well. As a result, you can only use characters which are
-            allowed in your host operating system's file names.
-          </para>
-
-          <para>
-            Note that internally, VirtualBox uses unique identifiers
+            this name, &product-name; also saves the VM's configuration
+            files. By changing the name, &product-name; renames these
+            files as well. As a result, you can only use characters
+            which are allowed in your host operating system's file
+            names.
+          </para>
+
+          <para>
+            Note that internally, &product-name; uses unique identifiers
             (UUIDs) to identify virtual machines. You can display these
-            with <computeroutput>VBoxManage</computeroutput>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <emphasis role="bold">Operating system/version:</emphasis>
-            The type of the guest operating system that is, or will be,
-            installed in the VM. This is the same setting that was
-            specified in the "New Virtual Machine" wizard. See
-            <xref
-            linkend="gui-createvm" />.
+            with <command>VBoxManage</command>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Type:</emphasis> The type of the guest
+            operating system for the VM. This is the same setting that
+            is specified in the <emphasis role="bold">New Virtual
+            Machine</emphasis> wizard. See
+            <xref linkend="gui-createvm" />.
           </para>
 
@@ -563,4 +1013,14 @@
         </listitem>
 
+        <listitem>
+          <para>
+            <emphasis role="bold">Version:</emphasis> The version of the
+            guest operating system for the VM. This is the same setting
+            that is specified in the <emphasis role="bold">New Virtual
+            Machine</emphasis> wizard. See
+            <xref linkend="gui-createvm" />.
+          </para>
+        </listitem>
+
       </itemizedlist>
 
@@ -572,5 +1032,6 @@
 
       <para>
-        The following settings are available in the Advanced tab:
+        The following settings are available in the
+        <emphasis role="bold">Advanced</emphasis> tab:
       </para>
 
@@ -580,9 +1041,8 @@
           <para>
             <emphasis role="bold">Snapshot Folder:</emphasis> By
-            default, VirtualBox saves snapshot data together with your
-            other VirtualBox configuration data. See
-            <xref
-              linkend="vboxconfigdata" />. With this
-            setting, you can specify any other folder for each VM.
+            default, &product-name; saves snapshot data together with
+            your other &product-name; configuration data. See
+            <xref linkend="vboxconfigdata" />. With this setting, you
+            can specify any other folder for each VM.
           </para>
         </listitem>
@@ -594,14 +1054,14 @@
             system should be shared with that of your host. If you
             select <emphasis role="bold">Bidirectional</emphasis>, then
-            VirtualBox will always make sure that both clipboards
+            &product-name; will always make sure that both clipboards
             contain the same data. If you select
             <emphasis role="bold">Host to Guest</emphasis> or
             <emphasis role="bold">Guest to Host</emphasis>, then
-            VirtualBox will only ever copy clipboard data in one
+            &product-name; will only ever copy clipboard data in one
             direction.
           </para>
 
           <para>
-            Clipboard sharing requires that the VirtualBox Guest
+            Clipboard sharing requires that the &product-name; Guest
             Additions be installed. In such a case, this setting has no
             effect. See <xref linkend="guestadditions" />.
@@ -609,9 +1069,9 @@
 
           <para>
-            The shared clipboard is disabled by default. See
-            <xref linkend="security_clipboard"/> for an explanation.
-            This setting can be changed at any time using the "Shared
-            Clipboard" menu item in the "Devices" menu of the virtual
-            machine.
+            For security reasons, the shared clipboard is disabled by
+            default. This setting can be changed at any time using the
+            <emphasis role="bold">Shared Clipboard</emphasis> menu item
+            in the <emphasis role="bold">Devices</emphasis> menu of the
+            virtual machine.
           </para>
         </listitem>
@@ -635,5 +1095,6 @@
               Drag and drop is disabled by default. This setting can be
               changed at any time using the <emphasis role="bold">Drag
-              and Drop</emphasis> menu item in the Devices menu of the
+              and Drop</emphasis> menu item in the
+              <emphasis role="bold">Devices</emphasis> menu of the
               virtual machine.
             </para>
@@ -642,13 +1103,4 @@
           <para>
             See <xref linkend="guestadd-dnd"/>.
-
-            <footnote>
-
-              <para>
-                Experimental support for drag and drop was added with
-                VirtualBox 4.2.
-              </para>
-
-            </footnote>
           </para>
         </listitem>
@@ -663,18 +1115,42 @@
 
       <para>
-        Here you can enter any description for your virtual machine, if
-        you want. This has no effect on the functionality of the
-        machine, but you may find this space useful to note down things
-        like the configuration of a virtual machine and the software
-        that has been installed into it.
-      </para>
-
-      <para>
-        To insert a line break into the description text field, press
-        <emphasis>Shift+Enter</emphasis>.
+        On the <emphasis role="bold">Description</emphasis> tab you can
+        enter a description for your virtual machine. This has no effect
+        on the functionality of the machine, but you may find this space
+        useful to note down things such as the configuration of a
+        virtual machine and the software that has been installed into
+        it.
+      </para>
+
+      <para>
+        To insert a line break into the
+        <emphasis role="bold">Description</emphasis> text field, press
+        Shift+Enter.
       </para>
 
     </sect2>
 
+    <sect2 id="settings-disk-encryption">
+
+      <title>Disk Encryption Tab</title>
+
+      <para>
+        The <emphasis role="bold">Disk Encryption</emphasis> tab enables
+        you to encrypt disks that are attached to the virtual machine.
+      </para>
+
+      <para>
+        To enable disk encryption, select the
+        <emphasis role="bold">Enable Disk Encryption</emphasis> check
+        box.
+      </para>
+
+      <para>
+        Settings are available to configure the cipher used for
+        encryption and the encryption password.
+      </para>
+
+    </sect2>
+
   </sect1>
 
@@ -684,6 +1160,7 @@
 
     <para>
-      The System category groups various settings that are related to
-      the basic hardware that is presented to the virtual machine.
+      The <emphasis role="bold">System</emphasis> category groups
+      various settings that are related to the basic hardware that is
+      presented to the virtual machine.
     </para>
 
@@ -697,4 +1174,8 @@
     </note>
 
+    <para>
+      The following tabs are available.
+    </para>
+
     <sect2 id="settings-motherboard">
 
@@ -702,6 +1183,7 @@
 
       <para>
-        On the Motherboard tab, you can influence virtual hardware that
-        would normally be on the motherboard of a real computer.
+        On the <emphasis role="bold">Motherboard</emphasis> tab, you can
+        configure virtual hardware that would normally be on the
+        motherboard of a real computer.
       </para>
 
@@ -710,5 +1192,5 @@
         <listitem>
           <para>
-            <emphasis role="bold">Base memory:</emphasis> Sets the
+            <emphasis role="bold">Base Memory:</emphasis> Sets the
             amount of RAM that is allocated and given to the VM when it
             is running. The specified amount of memory will be requested
@@ -717,6 +1199,6 @@
             start the VM and will not be available to the host while the
             VM is running. This is the same setting that was specified
-            in the "New Virtual Machine" wizard, as described in
-            <xref linkend="gui-createvm" />.
+            in the <emphasis role="bold">New Virtual Machine</emphasis>
+            wizard, as described in <xref linkend="gui-createvm" />.
           </para>
 
@@ -731,20 +1213,18 @@
         <listitem>
           <para>
-            <emphasis role="bold">Boot order:</emphasis> Determines the
+            <emphasis role="bold">Boot Order:</emphasis> Determines the
             order in which the guest operating system will attempt to
             boot from the various virtual boot devices. Analogous to a
-            real PC's BIOS setting, VirtualBox can tell a guest OS to
-            start from the virtual floppy, the virtual CD/DVD drive, the
-            virtual hard drive (each of these as defined by the other VM
-            settings), the network, or none of these.
+            real PC's BIOS setting, &product-name; can tell a guest OS
+            to start from the virtual floppy, the virtual CD/DVD drive,
+            the virtual hard drive (each of these as defined by the
+            other VM settings), the network, or none of these.
           </para>
 
           <para>
             If you select <emphasis role="bold">Network</emphasis>, the
-            VM will attempt to boot from a network via the PXE
+            VM will attempt to boot from a network using the PXE
             mechanism. This needs to be configured in detail on the
-            command line. See
-            <xref
-              linkend="vboxmanage-modifyvm" />.
+            command line. See <xref linkend="vboxmanage-modifyvm" />.
           </para>
         </listitem>
@@ -753,17 +1233,17 @@
           <para>
             <emphasis role="bold">Chipset:</emphasis> You can select
-            which chipset will be presented to the virtual machine.
-            Before VirtualBox 4.0, PIIX3 was the only available option
-            here. For modern guest operating systems such as Mac OS X,
-            that old chipset is no longer well supported. As a result,
-            VirtualBox 4.0 introduced an emulation of the more modern
-            ICH9 chipset, which supports PCI express, three PCI buses,
-            PCI-to-PCI bridges and Message Signaled Interrupts (MSI).
-            This allows modern operating systems to address more PCI
-            devices and no longer requires IRQ sharing. Using the ICH9
-            chipset it is also possible to configure up to 36 network
-            cards, up to 8 network adapters with PIIX3. Note that the
-            ICH9 support is experimental and not recommended for guest
-            operating systems which do not require it.
+            which chipset will be presented to the virtual machine. In
+            legacy versions of &product-name;, PIIX3 was the only
+            available option. For modern guest operating systems such as
+            Mac OS X, that old chipset is no longer well supported. As a
+            result, &product-name; supports an emulation of the more
+            modern ICH9 chipset, which supports PCI express, three PCI
+            buses, PCI-to-PCI bridges and Message Signaled Interrupts
+            (MSI). This enables modern operating systems to address more
+            PCI devices and no longer requires IRQ sharing. Using the
+            ICH9 chipset it is also possible to configure up to 36
+            network cards, up to 8 network adapters with PIIX3. Note
+            that the ICH9 support is experimental and not recommended
+            for guest operating systems which do not require it.
           </para>
         </listitem>
@@ -774,9 +1254,9 @@
             default virtual pointing devices for older guests is the
             traditional PS/2 mouse. If set to <emphasis>USB
-            tablet</emphasis>, VirtualBox reports to the virtual machine
-            that a USB tablet device is present and communicates mouse
-            events to the virtual machine through this device. The third
-            setting is a <emphasis>USB Multi-Touch Tablet</emphasis>
-            which is suited for recent Windows guests.
+            tablet</emphasis>, &product-name; reports to the virtual
+            machine that a USB tablet device is present and communicates
+            mouse events to the virtual machine through this device. The
+            third setting is a <emphasis>USB Multi-Touch
+            Tablet</emphasis> which is suited for recent Windows guests.
           </para>
 
@@ -784,22 +1264,10 @@
             Using the virtual USB tablet has the advantage that
             movements are reported in absolute coordinates, instead of
-            as relative position changes. This allows VirtualBox to
+            as relative position changes. This enables &product-name; to
             translate mouse events over the VM window into tablet events
             without having to "capture" the mouse in the guest as
-            described in
-            <xref
-              linkend="keyb_mouse_normal" />. This
+            described in <xref linkend="keyb_mouse_normal" />. This
             makes using the VM less tedious even if Guest Additions are
             not installed.
-
-            <footnote>
-
-              <para>
-                The virtual USB tablet was added with VirtualBox 3.2.
-                Depending on the guest operating system selected, this
-                is now enabled by default for new virtual machines.
-              </para>
-
-            </footnote>
           </para>
         </listitem>
@@ -836,6 +1304,6 @@
             <para>
               All Windows operating systems starting with Windows 2000
-              install different kernels depending on whether an I/O APIC
-              is available. As with ACPI, the I/O APIC therefore
+              install different kernels, depending on whether an I/O
+              APIC is available. As with ACPI, the I/O APIC therefore
               <emphasis>must not be turned off after
               installation</emphasis> of a Windows guest OS. Turning it
@@ -856,10 +1324,10 @@
         <listitem>
           <para>
-            <emphasis role="bold">Hardware clock in UTC time:</emphasis>
-            If checked, VirtualBox will report the system time in UTC
-            format to the guest instead of local (host) time. This
-            affects how the virtual real-time clock (RTC) operates and
-            may be useful for Unix-like guest operating systems, which
-            typically expect the hardware clock to be set to UTC.
+            <emphasis role="bold">Hardware Clock in UTC Time:</emphasis>
+            If selected, &product-name; will report the system time in
+            UTC format to the guest instead of the local (host) time.
+            This affects how the virtual real-time clock (RTC) operates
+            and may be useful for UNIX-like guest operating systems,
+            which typically expect the hardware clock to be set to UTC.
           </para>
         </listitem>
@@ -870,13 +1338,16 @@
         In addition, you can turn off the <emphasis role="bold">Advanced
         Configuration and Power Interface (ACPI)</emphasis> which
-        VirtualBox presents to the guest operating system by default.
+        &product-name; presents to the guest operating system by
+        default.
+      </para>
+
+      <para>
         ACPI is the current industry standard to allow operating systems
         to recognize hardware, configure motherboards and other devices
         and manage power. As all modern PCs contain this feature and
         Windows and Linux have been supporting it for years, it is also
-        enabled by default in VirtualBox. It can only be turned off on
-        the command line. See
-        <xref
-      linkend="vboxmanage-modifyvm" />.
+        enabled by default in &product-name;. ACPI can only be turned
+        off using the command line. See
+        <xref linkend="vboxmanage-modifyvm" />.
       </para>
 
@@ -884,8 +1355,8 @@
         <para>
           All Windows operating systems starting with Windows 2000
-          install different kernels depending on whether ACPI is
-          available, so ACPI <emphasis>must not be turned off</emphasis>
-          after installation of a Windows guest OS. Turning it on after
-          installation will have no effect however.
+          install different kernels, depending on whether ACPI is
+          available. This means that ACPI <emphasis>must not be turned
+          off</emphasis> after installation of a Windows guest OS.
+          However, turning it on after installation will have no effect.
         </para>
       </warning>
@@ -898,43 +1369,70 @@
 
       <para>
-        On the Processor tab, you can set how many virtual
-        <emphasis role="bold">CPU cores</emphasis> the guest operating
-        systems should see. Starting with version 3.0, VirtualBox
-        supports symmetrical multiprocessing (SMP) and can present up to
-        32 virtual CPU cores to each virtual machine.
-      </para>
-
-      <para>
-        You should not, however, configure virtual machines to use more
-        CPU cores than are available physically (real cores, no
-        hyperthreads).
-      </para>
-
-      <para>
-        On this tab you can also set the <emphasis role="bold">CPU
-        execution cap</emphasis>. This setting limits the amount of time
-        a host CPU spends to emulate a virtual CPU. The default setting
-        is 100% meaning that there is no limitation. A setting of 50%
-        implies a single virtual CPU can use up to 50% of a single host
-        CPU. Note that limiting the execution time of the virtual CPUs
-        may induce guest timing problems.
-      </para>
-
-      <para>
-        In addition, the <emphasis role="bold">Enable PAE/NX</emphasis>
-        setting determines whether the PAE and NX capabilities of the
-        host CPU will be exposed to the virtual machine. PAE stands for
-        "Physical Address Extension". Normally, if enabled and supported
-        by the operating system, then even a 32-bit x86 CPU can access
-        more than 4 GB of RAM. This is made possible by adding another 4
-        bits to memory addresses, so that with 36 bits, up to 64 GB can
-        be addressed. Some operating systems, such as Ubuntu Server,
-        require PAE support from the CPU and cannot be run in a virtual
-        machine without it.
-      </para>
+        On the <emphasis role="bold">Processor</emphasis> tab, you can
+        configure settings for the CPU used by the virtual machine.
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Processor(s):</emphasis> Sets the
+            number of virtual CPU cores the guest operating systems can
+            see. &product-name; supports symmetrical multiprocessing
+            (SMP) and can present up to 32 virtual CPU cores to each
+            virtual machine.
+          </para>
+
+          <para>
+            You should not configure virtual machines to use more CPU
+            cores than are available physically. This includes real
+            cores, with no hyperthreads.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Execution Cap:</emphasis> Configures
+            the CPU execution cap. This limits the amount of time a host
+            CPU spends to emulate a virtual CPU. The default setting is
+            100%, meaning that there is no limitation. A setting of 50%
+            implies a single virtual CPU can use up to 50% of a single
+            host CPU. Note that limiting the execution time of the
+            virtual CPUs may cause guest timing problems.
+          </para>
+
+          <para>
+            A warning is displayed at the bottom of the Processor tab if
+            an Execution Cap setting is made that may affect system
+            performance.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Enable PAE/NX:</emphasis> Determines
+            whether the PAE and NX capabilities of the host CPU will be
+            exposed to the virtual machine. To enable this feature,
+            select the <emphasis role="bold">Extended
+            Features</emphasis> check box.
+          </para>
+
+          <para>
+            PAE stands for Physical Address Extension. Normally, if
+            enabled and supported by the operating system, then even a
+            32-bit x86 CPU can access more than 4 GB of RAM. This is
+            made possible by adding another 4 bits to memory addresses,
+            so that with 36 bits, up to 64 GB can be addressed. Some
+            operating systems, such as Ubuntu Server, require PAE
+            support from the CPU and cannot be run in a virtual machine
+            without it.
+          </para>
+        </listitem>
+
+      </itemizedlist>
 
       <para>
         With virtual machines running modern server operating systems,
-        VirtualBox also supports CPU hot-plugging. For details, see
+        &product-name; also supports CPU hot-plugging. For details, see
         <xref linkend="cpuhotplug" />.
       </para>
@@ -947,60 +1445,71 @@
 
       <para>
-        On this page, you can determine whether and how VirtualBox
-        should use hardware virtualization extensions that your host CPU
-        may support. This is the case with most CPUs built after 2006.
-      </para>
-
-      <para>
-        You can select for each virtual machine individually whether
-        VirtualBox should use software or hardware virtualization.
-
-        <footnote>
-
-          <para>
-            Prior to VirtualBox version 2.2, software virtualization was
-            the default; starting with version 2.2, VirtualBox will
-            enable hardware virtualization by default for new virtual
-            machines that you create. Existing virtual machines are not
-            automatically changed for compatibility reasons, and the
-            default can of course be changed for each virtual machine.
-          </para>
-
-        </footnote>
-      </para>
-
-      <para>
-        In most cases, the default settings will be fine; VirtualBox
-        will have picked sensible defaults depending on the operating
-        system that you selected when you created the virtual machine.
-        In certain situations, however, you may want to change these
-        preconfigured defaults.
-      </para>
-
-      <para>
-        Advanced users may be interested in technical details about
-        software vs. hardware virtualization. See
-        <xref
-      linkend="hwvirt" />.
-      </para>
-
-      <para>
-        If your host's CPU supports the <emphasis role="bold">nested
-        paging</emphasis> (AMD-V) or
-        <emphasis role="bold">EPT</emphasis> (Intel VT-x) features, then
-        you can expect a significant performance increase by enabling
-        nested paging in addition to hardware virtualization. For
-        technical details, see <xref linkend="nestedpaging" />.
-      </para>
-
-      <para>
-        Starting with version 5.0, VirtualBox provides
-        paravirtualization interfaces to improve time-keeping accuracy
-        and performance of guest operating systems. The options
-        available are documented under the
-        <computeroutput>paravirtprovider</computeroutput> option in
-        <xref linkend="vboxmanage-modifyvm" />. For further details on
-        the paravirtualization providers, see
-        <xref linkend="gimproviders" />.
+        On this tab, you can configure &product-name; to use hardware
+        virtualization extensions that your host CPU supports.
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Paravirtualization
+            Interface:</emphasis> &product-name; provides
+            paravirtualization interfaces to improve time-keeping
+            accuracy and performance of guest operating systems. The
+            options available are documented under the
+            <computeroutput>paravirtprovider</computeroutput> option in
+            <xref linkend="vboxmanage-modifyvm" />. For further details
+            on the paravirtualization providers, see
+            <xref linkend="gimproviders" />.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Hardware Virtualization:</emphasis>
+            You can select for each virtual machine individually whether
+            &product-name; should use software or hardware
+            virtualization.
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Enable VT-x/AMD-V:</emphasis>
+                Enables Intel VT-x and AMD-V hardware extensions if the
+                host CPU supports them.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Enable Nested Paging:</emphasis>
+                If the host CPU supports the nested paging (AMD-V) or
+                EPT (Intel VT-x) features, then you can expect a
+                significant performance increase by enabling nested
+                paging in addition to hardware virtualization. For
+                technical details, see <xref linkend="nestedpaging" />.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para>
+            Advanced users may be interested in technical details about
+            software versus hardware virtualization. See
+            <xref linkend="hwvirt" />.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <para>
+        In most cases, the default settings on the
+        <emphasis role="bold">Acceleration</emphasis> tab will work
+        well. &product-name; selects sensible defaults, depending on the
+        operating system that you selected when you created the virtual
+        machine. In certain situations, however, you may want to change
+        the preconfigured defaults.
       </para>
 
@@ -1013,119 +1522,289 @@
     <title>Display Settings</title>
 
-    <itemizedlist>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Video memory size:</emphasis> Sets the
-          size of the memory provided by the virtual graphics card
-          available to the guest, in MB. As with the main memory, the
-          specified amount will be allocated from the host's resident
-          memory. Based on the amount of video memory, higher
-          resolutions and color depths may be available.
-        </para>
-
-        <para>
-          The GUI will show a warning if the amount of video memory is
-          too small to be able to switch the VM into full screen mode.
-          The minimum value depends on the number of virtual monitors,
-          the screen resolution and the color depth of the host display
-          as well as of the activation of <emphasis>3D
-          acceleration</emphasis> and <emphasis>2D video
-          acceleration</emphasis>. A rough estimate is (<emphasis>color
-          depth</emphasis> / 8) x <emphasis>vertical pixels</emphasis> x
-          <emphasis>horizontal pixels</emphasis> x <emphasis>number of
-          screens</emphasis> = <emphasis>number of bytes</emphasis>.
-          Like said above, there might be extra memory required for any
-          activated display acceleration setting.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Monitor count:</emphasis> With this
-          setting VirtualBox can provide more than one virtual monitor
-          to a virtual machine. If a guest operating system, such as
-          Windows, supports multiple attached monitors, VirtualBox can
-          pretend that multiple virtual monitors are present.
-
-          <footnote>
-
-            <para>
-              Multiple monitor support was added with VirtualBox 3.2.
-            </para>
-
-          </footnote>
-
-          Up to eight such virtual monitors are supported.
-        </para>
-
-        <para>
-          The output of the multiple monitors are displayed on the host
-          in multiple VM windows which are running side by side.
-        </para>
-
-        <para>
-          However, in full screen and seamless mode, they use the
-          available physical monitors attached to the host. As a result,
-          for full screen and seamless modes to work with multiple
-          monitors, you will need at least as many physical monitors as
-          you have virtual monitors configured, or VirtualBox will
-          report an error. You can configure the relationship between
-          guest and host monitors using the view menu by pressing Host
-          key + Home when you are in full screen or seamless mode.
-        </para>
-
-        <para>
-          See also <xref linkend="KnownIssues" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Enable 3D acceleration:</emphasis> If a
-          virtual machine has Guest Additions installed, you can select
-          here whether the guest should support accelerated 3D graphics.
-          See <xref linkend="guestadd-3d" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Enable 2D video acceleration:</emphasis>
-          If a virtual machine with Microsoft Windows has Guest
-          Additions installed, you can select here whether the guest
-          should support accelerated 2D video graphics. See
-          <xref
-          linkend="guestadd-2d" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Remote display:</emphasis> On the
-          <emphasis role="bold">Remote Display</emphasis> tab, if the
-          VirtualBox Remote Display Extension (VRDE) is installed, you
-          can enable the VRDP server that is built into VirtualBox. This
-          enables you to connect to the console of the virtual machine
-          remotely with any standard RDP viewer, such as
-          <computeroutput>mstsc.exe</computeroutput> that comes with
-          Microsoft Windows. On Linux and Solaris systems you can use
-          the standard open source
-          <computeroutput>rdesktop</computeroutput> program. These
-          features are described in <xref linkend="vrde" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Capture:</emphasis> On the
-          <emphasis role="bold">Capture</emphasis> tab you can
-          enable video and audio capturing, as well as changing related options
-          for this VM. Note that these features can also be enabled/disabled
-          while the VM is being executed.
-        </para>
-      </listitem>
-
-    </itemizedlist>
+    <para>
+      The following tabs are available for configuring the display for a
+      virtual machine.
+    </para>
+
+    <sect2 id="settings-screen">
+
+      <title>Screen Tab</title>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Video Memory:</emphasis> Sets the size
+            of the memory provided by the virtual graphics card
+            available to the guest, in MB. As with the main memory, the
+            specified amount will be allocated from the host's resident
+            memory. Based on the amount of video memory, higher
+            resolutions and color depths may be available.
+          </para>
+
+          <para>
+            The GUI will show a warning if the amount of video memory is
+            too small to be able to switch the VM into full screen mode.
+            The minimum value depends on the number of virtual monitors,
+            the screen resolution and the color depth of the host
+            display as well as on the use of <emphasis>3D
+            acceleration</emphasis> and <emphasis>2D video
+            acceleration</emphasis>. A rough estimate is
+            (<emphasis>color depth</emphasis> / 8) x <emphasis>vertical
+            pixels</emphasis> x <emphasis>horizontal pixels</emphasis> x
+            <emphasis>number of screens</emphasis> = <emphasis>number of
+            bytes</emphasis>. Extra memory may be required if display
+            acceleration is used.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Monitor Count:</emphasis> With this
+            setting, &product-name; can provide more than one virtual
+            monitor to a virtual machine. If a guest operating system
+            supports multiple attached monitors, &product-name; can
+            pretend that multiple virtual monitors are present. Up to
+            eight such virtual monitors are supported.
+          </para>
+
+          <para>
+            The output of the multiple monitors are displayed on the
+            host in multiple VM windows which are running side by side.
+            However, in full screen and seamless mode, they use the
+            available physical monitors attached to the host. As a
+            result, for full screen and seamless modes to work with
+            multiple monitors, you will need at least as many physical
+            monitors as you have virtual monitors configured, or
+            &product-name; will report an error.
+          </para>
+
+          <para>
+            You can configure the relationship between guest and host
+            monitors using the <emphasis role="bold">View</emphasis>
+            menu by pressing Host key + Home when you are in full screen
+            or seamless mode.
+          </para>
+
+          <para>
+            See also <xref linkend="KnownIssues" />.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Scale Factor:</emphasis> Enables
+            scaling of the display size. For multiple monitor displays,
+            you can set the scale factor for individual monitors, or
+            globally for all of the monitors. Use the slider to select a
+            scaling factor up to 200%.
+          </para>
+
+          <para>
+            You can set a default scale factor for all VMs. Use the
+            <emphasis role="bold">Display</emphasis> tab in the Global
+            Settings dialogs.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Enable 3D Acceleration:</emphasis> If
+            a virtual machine has Guest Additions installed, you can
+            select here whether the guest should support accelerated 3D
+            graphics. See <xref linkend="guestadd-3d" />.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Enable 2D Video
+            Acceleration:</emphasis> If a virtual machine with Microsoft
+            Windows has Guest Additions installed, you can select here
+            whether the guest should support accelerated 2D video
+            graphics. See <xref linkend="guestadd-2d" />.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Graphics Controller:</emphasis>
+            Specifies the graphics adapter type used by the VM. The
+            following options are available:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">VBoxSVGA:</emphasis> The default
+                graphics controller for new VMs that use Linux or
+                Windows 7 or later. Requires the Guest Additions.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">VBoxVGA:</emphasis> Used for
+                legacy guest operating systems. This was the default
+                graphics controller in previous releases.
+              </para>
+
+              <para>
+                For Windows versions before Windows 7, this is the
+                default option. Does not require the Guest Additions.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">VMSVGA:</emphasis> Used to emulate
+                a VMware SVGA graphic device. Requires the Guest
+                Additions.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">None:</emphasis> Do not emulate a
+                graphics adapter type.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+        </listitem>
+
+      </itemizedlist>
+
+    </sect2>
+
+    <sect2 id="settings-remote-display">
+
+      <title>Remote Display Tab</title>
+
+      <para>
+        On the <emphasis role="bold">Remote Display</emphasis> tab, if
+        the VirtualBox Remote Display Extension (VRDE) is installed, you
+        can enable the VRDP server that is built into &product-name;.
+        This enables you to connect to the console of the virtual
+        machine remotely with any standard RDP viewer, such as
+        <command>mstsc.exe</command> that comes with Microsoft Windows.
+        On Linux and Oracle Solaris systems you can use the standard
+        open source <command>rdesktop</command> program. These features
+        are described in <xref linkend="vrde" />.
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Enable Server:</emphasis> Select this
+            check box and configure settings for the remote display
+            connection.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+    </sect2>
+
+    <sect2 id="settings-capture">
+
+      <title>Recording Tab</title>
+
+      <remark>
+        Renamed to Recording tab? Check against RC version.
+      </remark>
+
+      <para>
+        On the <emphasis role="bold">Recording</emphasis> tab you can
+        enable video and audio recording for a virtual machine and
+        change related settings. Note that these features can be enabled
+        and disabled while a VM is running.
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Enable Capture:</emphasis> Select this
+            check box and select a <emphasis role="bold">Capture
+            Mode</emphasis> option.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Capture Mode:</emphasis> You can
+            choose to record video, audio, or both video and audio.
+          </para>
+
+          <para>
+            Some settings on the
+            <emphasis role="bold">Recording</emphasis> tab may be grayed
+            out, depending on the <emphasis role="bold">Capture
+            Mode</emphasis> setting.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">File Path:</emphasis> The file where
+            the recording is saved.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Frame Size:</emphasis> The video
+            resolution of the recorded video, in pixels. The drop-down
+            list enables you to select from common frame sizes.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Frame Rate:</emphasis> Use the slider
+            to set the maximum number of video frames per second (FPS)
+            to record. Frames that have a higher frequency are skipped.
+            Increasing this value reduces the number of skipped frames
+            and increases the file size.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Quality:</emphasis> Use the slider to
+            set the the bit rate of the video in kilobits per second.
+            Increasing this value improves the appearance of the video
+            at the cost of an increased file size.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Audio Quality:</emphasis> Use the
+            slider to set the quality of the audio recording. Increasing
+            this value improves the audio quality at the cost of an
+            increased file size.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Screens:</emphasis> For a multiple
+            monitor display, you can select which screens to record
+            video from.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <para>
+        As you adjust the video and audio recording settings, the
+        approximate output file size for a five minute video is shown.
+      </para>
+
+    </sect2>
 
   </sect1>
@@ -1136,27 +1815,25 @@
 
     <para>
-      The Storage category in the VM settings enables you to connect
-      virtual hard disk, CD/DVD, and floppy images and drives to your
-      virtual machine.
-    </para>
-
-    <para>
-      In a real PC, so-called "storage controllers" connect physical
-      disk drives to the rest of the computer. Similarly, VirtualBox
-      presents virtual storage controllers to a virtual machine. Under
-      each controller, the virtual devices, such as hard disks, CD/DVD
-      or floppy drives, attached to the controller are shown.
-
-      <note>
-        <para>
-          This section can only give you a quick introduction to the
-          VirtualBox storage settings. Since VirtualBox gives you an
-          enormous wealth of options in this area, we have dedicated an
-          entire chapter of this User Manual to explaining all the
-          details. See <xref
-        linkend="storage" />.
-        </para>
-      </note>
-    </para>
+      The <emphasis role="bold">Storage</emphasis> category in the VM
+      settings enables you to connect virtual hard disk, CD/DVD, and
+      floppy images and drives to your virtual machine.
+    </para>
+
+    <para>
+      In a real PC, so-called <emphasis>storage controllers</emphasis>
+      connect physical disk drives to the rest of the computer.
+      Similarly, &product-name; presents virtual storage controllers to
+      a virtual machine. Under each controller, the virtual devices,
+      such as hard disks, CD/DVD or floppy drives, attached to the
+      controller are shown.
+    </para>
+
+    <note>
+      <para>
+        This section gives a quick introduction to the &product-name;
+        storage settings. See <xref linkend="storage" /> for a full
+        description of the available storage settings in &product-name;.
+      </para>
+    </note>
 
     <para>
@@ -1166,5 +1843,6 @@
     </para>
 
-    <para>
+    <figure id="fig-storage-settings">
+      <title>Storage Settings for a Virtual Machine</title>
       <mediaobject>
         <imageobject>
@@ -1173,10 +1851,10 @@
         </imageobject>
       </mediaobject>
-    </para>
+    </figure>
 
     <para>
       Depending on the guest operating system type that you selected
-      when you created the VM, the typical layout of storage devices in
-      a new VM is as follows:
+      when you created the VM, a new VM includes the following storage
+      devices:
     </para>
 
@@ -1185,8 +1863,7 @@
       <listitem>
         <para>
-          You will see an <emphasis role="bold">IDE
-          controller</emphasis>, to which a virtual CD/DVD drive has
-          been attached to the "secondary master" port of the IDE
-          controller.
+          <emphasis role="bold">IDE controller.</emphasis> A virtual
+          CD/DVD drive is attached to the secondary master port of the
+          IDE controller.
         </para>
       </listitem>
@@ -1194,11 +1871,11 @@
       <listitem>
         <para>
-          You will also see a <emphasis role="bold">SATA
-          controller</emphasis>, which is a more modern type of storage
-          controller for higher hard disk data throughput, to which the
-          virtual hard disks are attached. Initially you will normally
-          have one such virtual disk, but as you can see in the above
-          screenshot, you can have more than one. Each is represented by
-          a disk image file, VDI files in this case.
+          <emphasis role="bold">SATA controller.</emphasis> This is a
+          modern type of storage controller for higher hard disk data
+          throughput, to which the virtual hard disks are attached.
+          Initially you will normally have one such virtual disk, but as
+          shown in the previous screenshot, you can have more than one.
+          Each is represented by a disk image file, such as a VDI file
+          in this example.
         </para>
       </listitem>
@@ -1207,17 +1884,16 @@
 
     <para>
-      If you created your VM with an older version of VirtualBox, the
-      default storage layout may differ. You might then only have an IDE
-      controller to which both the CD/DVD drive and the hard disks have
-      been attached. This might also apply if you selected an older
+      If you created your VM with an older version of &product-name;,
+      the default storage layout may differ. You might then only have an
+      IDE controller to which both the CD/DVD drive and the hard disks
+      have been attached. This might also apply if you selected an older
       operating system type when you created the VM. Since older
       operating systems do not support SATA without additional drivers,
-      VirtualBox will make sure that no such devices are present
-      initially. See <xref
-    linkend="harddiskcontrollers" />.
-    </para>
-
-    <para>
-      VirtualBox also provides a <emphasis role="bold">floppy
+      &product-name; will make sure that no such devices are present
+      initially. See <xref linkend="harddiskcontrollers" />.
+    </para>
+
+    <para>
+      &product-name; also provides a <emphasis>floppy
       controller</emphasis>. You cannot add devices other than floppy
       drives to this controller. Virtual floppy drives, like virtual
@@ -1243,5 +1919,5 @@
           CD/DVD or floppy drive</emphasis>, select the storage
           controller to which it should be added (IDE, SATA, SCSI, SAS,
-          floppy controller) and then click on the
+          floppy controller) and then click the
           <emphasis role="bold">Add Disk</emphasis> button below the
           tree. You can then either select <emphasis role="bold">Add
@@ -1261,13 +1937,11 @@
           <listitem>
             <para>
-              You can then select to which
-              <emphasis
-                role="bold">device
+              You can then select to which <emphasis role="bold">device
               slot</emphasis> of the controller the virtual disk should
               be connected to. IDE controllers have four slots which
-              have traditionally been called "primary master", "primary
-              slave", "secondary master" and "secondary slave". By
-              contrast, SATA and SCSI controllers offer you up to 30
-              slots to which virtual devices can be attached.
+              have traditionally been called primary master, primary
+              slave, secondary master, and secondary slave. By contrast,
+              SATA and SCSI controllers offer you up to 30 slots for
+              attaching virtual devices.
             </para>
           </listitem>
@@ -1291,13 +1965,16 @@
                   displays the <emphasis role="bold">Create New
                   Disk</emphasis> wizard, described in
-                  <xref
-                      linkend="gui-createvm" />.
+                  <xref linkend="gui-createvm" />.
+                </para>
+
+                <para>
+                  For virtual floppy drives, a dialog enables you to
+                  create and format a new floppy disk image
+                  automatically.
                 </para>
 
                 <para>
                   For details on the image file types that are
-                  supported, see
-                  <xref
-                      linkend="vdidetails" />.
+                  supported, see <xref linkend="vdidetails" />.
                 </para>
               </listitem>
@@ -1334,6 +2011,6 @@
 
                     <para>
-                      If you want to write (burn) CDs or DVDs using the
-                      host drive, you need to also enable the
+                      If you want to write, or burn, CDs or DVDs using
+                      the host drive, you need to also enable the
                       <emphasis role="bold">Passthrough</emphasis>
                       option. See <xref linkend="storage-cds" />.
@@ -1344,5 +2021,5 @@
                     <para>
                       If you select <emphasis role="bold">Remove Disk
-                      from Virtual Drive</emphasis>, VirtualBox will
+                      from Virtual Drive</emphasis>, &product-name; will
                       present an empty CD/DVD drive to the guest into
                       which no media has been inserted.
@@ -1372,7 +2049,8 @@
     <para>
       Removable media, such as CD/DVDs and floppies, can be changed
-      while the guest is running. Since the Settings dialog is not
-      available at that time, you can also access these settings from
-      the <emphasis role="bold">Devices</emphasis> menu of your virtual
+      while the guest is running. Since the
+      <emphasis role="bold">Settings</emphasis> dialog is not available
+      at that time, you can also access these settings from the
+      <emphasis role="bold">Devices</emphasis> menu of your virtual
       machine window.
     </para>
@@ -1385,40 +2063,57 @@
 
     <para>
-      The Audio section in a virtual machine's Settings window
-      determines whether the VM will see a sound card connected, and
-      whether the audio output should be heard on the host system.
-    </para>
-
-    <para>
-      If audio is enabled for a guest, you can choose between the
-      emulation of an Intel AC'97 controller, an Intel HD Audio
-      controller
-
-      <footnote>
-
-        <para>
-          Intel HD Audio support was added with VirtualBox 4.0 because
-          Windows 7 and later (as well as 64-bit Windows Vista) do not
-          support the Intel AC'97 controller out of the box.
-        </para>
-
-      </footnote>
-
-      or a SoundBlaster 16 card. In any case, you can select what audio
-      driver VirtualBox will use on the host.
-    </para>
-
-    <para>
-      On a Linux host, depending on your host configuration, you can
-      also select between the OSS, ALSA, or the PulseAudio subsystem. On
-      newer Linux distributions, the PulseAudio subsystem should be
-      preferred.
-    </para>
-
-    <para>
-      Since VirtualBox 5.0 only OSS is supported on Solaris hosts. The
-      "Solaris Audio" audio backend is no longer supported on Solaris
-      hosts.
-    </para>
+      The <emphasis role="bold">Audio</emphasis> section in a virtual
+      machine's <emphasis role="bold">Settings</emphasis> window
+      determines whether the VM will detect a connected sound card, and
+      if the audio output should be played on the host system.
+    </para>
+
+    <para>
+      To enable audio for a guest, select the
+      <emphasis role="bold">Enable Audio</emphasis> check box. The
+      following settings are available:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Host Audio Driver:</emphasis> The audio
+          driver that &product-name; uses on the host. On a Linux host,
+          depending on your host configuration, you can select between
+          the OSS, ALSA, or the PulseAudio subsystem. On newer Linux
+          distributions, the PulseAudio subsystem is preferred.
+        </para>
+
+        <para>
+          Only OSS is supported on Oracle Solaris hosts. The Oracle
+          Solaris Audio audio backend is no longer supported on Oracle
+          Solaris hosts.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Audio Controller:</emphasis> You can
+          choose between the emulation of an Intel AC'97 controller, an
+          Intel HD Audio controller, or a SoundBlaster 16 card.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Enable Audio Output:</emphasis> Enables
+          audio output only for the VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Enable Audio Input:</emphasis> Enables
+          audio input only for the VM.
+        </para>
+      </listitem>
+
+    </itemizedlist>
 
   </sect1>
@@ -1429,11 +2124,12 @@
 
     <para>
-      The Network section in a virtual machine's Settings window enables
-      you to configure how VirtualBox presents virtual network cards to
-      your VM, and how they operate.
-    </para>
-
-    <para>
-      When you first create a virtual machine, VirtualBox by default
+      The <emphasis role="bold">Network</emphasis> section in a virtual
+      machine's <emphasis role="bold">Settings</emphasis> window enables
+      you to configure how &product-name; presents virtual network cards
+      to your VM, and how they operate.
+    </para>
+
+    <para>
+      When you first create a virtual machine, &product-name; by default
       enables one virtual network card and selects the Network Address
       Translation (NAT) mode for it. This way the guest can connect to
@@ -1444,16 +2140,16 @@
 
     <para>
-      This default setup is good for the majority of VirtualBox users.
-      However, VirtualBox is extremely flexible in how it can virtualize
-      networking. It supports many virtual network cards per virtual
-      machine, the first four of which can be configured in detail in
-      the Manager window. Additional network cards can be configured on
-      the command line with VBoxManage.
-    </para>
-
-    <para>
-      Because of the vast array of options available, we have dedicated
-      an entire chapter of this manual to discussing networking
-      configuration. See <xref linkend="networkingdetails" />.
+      This default setup is good for the majority of &product-name;
+      users. However, &product-name; is extremely flexible in how it can
+      virtualize networking. It supports many virtual network cards per
+      virtual machine. The first four virtual network cards can be
+      configured in detail in the VirtualBox Manager window. Additional
+      network cards can be configured using the
+      <command>VBoxManage</command> command.
+    </para>
+
+    <para>
+      Many networking options are available. See
+      <xref linkend="networkingdetails" /> for more information.
     </para>
 
@@ -1465,14 +2161,6 @@
 
     <para>
-      VirtualBox fully supports virtual serial ports in a virtual
-      machine in an easy-to-use manner.
-
-      <footnote>
-
-        <para>
-          Serial port support was added with VirtualBox 1.5.
-        </para>
-
-      </footnote>
+      &product-name; supports the use of virtual serial ports in a
+      virtual machine.
     </para>
 
@@ -1486,5 +2174,5 @@
 
     <para>
-      While serial ports are no longer as ubiquitous as they used to be,
+      While serial ports are no longer as common as they used to be,
       there are still some important uses left for them. For example,
       serial ports can be used to set up a primitive network over a
@@ -1499,24 +2187,24 @@
     <para>
       If a virtual serial port is enabled, the guest operating system
-      sees a standard 16550A compatible UART device. Both receiving and
-      transmitting data is supported. How this virtual serial port is
-      then connected to the host is configurable, and the details depend
-      on your host operating system.
-    </para>
-
-    <para>
-      You can use either the graphical user interface or the
-      command-line <computeroutput>VBoxManage</computeroutput> tool to
-      set up virtual serial ports. For the latter, see
-      <xref
-    linkend="vboxmanage-modifyvm" /> for information on the
-      <computeroutput>--uart</computeroutput> and
-      <computeroutput>--uartmode</computeroutput> options.
-    </para>
-
-    <para>
-      In either case, you can configure up to four virtual serial ports
-      per virtual machine. For each such device, you will need to
-      determine the following:
+      sees a standard 16550A compatible UART device. Other UART types
+      can be configured using the <command>VBoxManage modifyvm</command>
+      command. Both receiving and transmitting data is supported. How
+      this virtual serial port is then connected to the host is
+      configurable, and the details depend on your host operating
+      system.
+    </para>
+
+    <para>
+      You can use either the Settings tabs or the
+      <command>VBoxManage</command> command to set up virtual serial
+      ports. For the latter, see <xref linkend="vboxmanage-modifyvm" />
+      for information on the <computeroutput>--uart</computeroutput>,
+      <computeroutput>--uartmode</computeroutput> and
+      <computeroutput>--uarttype</computeroutput> options.
+    </para>
+
+    <para>
+      You can configure up to four virtual serial ports per virtual
+      machine. For each device, you must set the following:
     </para>
 
@@ -1525,17 +2213,54 @@
       <listitem>
         <para>
-          What kind of serial port the virtual machine should see, by
-          selecting an I/O base address and interrupt (IRQ). For these,
-          we recommend you use the traditional values, as follows:
-
-          <footnote>
-
-            <para>
-              See, for example,
-              <ulink
+          <emphasis role="bold">Port Number:</emphasis> This determines
+          the serial port that the virtual machine should see. For best
+          results, use the traditional values as follows:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              COM1: I/O base 0x3F8, IRQ 4
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              COM2: I/O base 0x2F8, IRQ 3
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              COM3: I/O base 0x3E8, IRQ 4
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              COM4: I/O base 0x2E8, IRQ 3
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+        <para>
+          You can also configure a user-defined serial port. Enter an
+          I/O base address and interrupt (IRQ).
+        </para>
+
+        <para>
+          See also
+          <ulink
               url="http://en.wikipedia.org/wiki/COM_(hardware_interface)">http://en.wikipedia.org/wiki/COM_(hardware_interface)</ulink>.
-            </para>
-
-          </footnote>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Port Mode:</emphasis> What the virtual
+          port is connected to. For each virtual serial port, you have
+          the following options:
         </para>
 
@@ -1544,63 +2269,29 @@
           <listitem>
             <para>
-              COM1: I/O base 0x3F8, IRQ 4
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              COM2: I/O base 0x2F8, IRQ 3
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              COM3: I/O base 0x3E8, IRQ 4
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              COM4: I/O base 0x2E8, IRQ 3
-            </para>
-          </listitem>
-
-        </itemizedlist>
-      </listitem>
-
-      <listitem>
-        <para>
-          Then, you will need to determine what this virtual port should
-          be connected to. For each virtual serial port, you have the
-          following options:
-        </para>
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              You can configure the virtual serial port to be
-              "disconnected". This means that the guest will see the
-              device, but it will behave as if no cable had been
-              connected to it.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              You can connect the virtual serial port to a physical
-              serial port on your host. On a Windows host, this will be
-              a name like <computeroutput>COM1</computeroutput>. On
-              Linux or Solaris hosts, it will be a device node like
-              <computeroutput>/dev/ttyS0</computeroutput>. VirtualBox
-              will then simply redirect all data received from and sent
-              to the virtual serial port to the physical device.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              You can tell VirtualBox to connect the virtual serial port
-              to a software pipe on the host. This depends on your host
+              <emphasis role="bold">Disconnected:</emphasis> The guest
+              will see the device, but it will behave as if no cable had
+              been connected to it.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">Host Device:</emphasis> Connects the
+              virtual serial port to a physical serial port on your
+              host. On a Windows host, this will be a name like
+              <computeroutput>COM1</computeroutput>. On Linux or Oracle
+              Solaris hosts, it will be a device node like
+              <computeroutput>/dev/ttyS0</computeroutput>.
+              &product-name; will then simply redirect all data received
+              from and sent to the virtual serial port to the physical
+              device.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">Host Pipe:</emphasis> Configure
+              &product-name; to connect the virtual serial port to a
+              software pipe on the host. This depends on your host
               operating system, as follows:
             </para>
@@ -1622,10 +2313,10 @@
               <listitem>
                 <para>
-                  On a Mac, Linux, or Solaris host, a local domain
-                  socket is used instead. The socket filename must be
-                  chosen such that the user running VirtualBox has
-                  sufficient privileges to create and write to it. The
-                  <computeroutput>/tmp</computeroutput> directory is
-                  often a good candidate.
+                  On a Mac, Linux, or Oracle Solaris host, a local
+                  domain socket is used instead. The socket filename
+                  must be chosen such that the user running
+                  &product-name; has sufficient privileges to create and
+                  write to it. The <computeroutput>/tmp</computeroutput>
+                  directory is often a good candidate.
                 </para>
 
@@ -1642,10 +2333,10 @@
 
             <para>
-              In this case, you can configure whether VirtualBox should
-              create the named pipe (or, on non-Windows hosts, the local
-              domain socket) itself or whether VirtualBox should assume
-              that the pipe or socket exists already. With the
-              <computeroutput>VBoxManage</computeroutput> command-line
-              options, this is referred to as "server" or "client" mode,
+              In this case, you can configure whether &product-name;
+              should create the named pipe, or the local domain socket
+              non-Windows hosts, itself or whether &product-name; should
+              assume that the pipe or socket exists already. With the
+              <command>VBoxManage</command> command-line options, this
+              is referred to as server mode or client mode,
               respectively.
             </para>
@@ -1654,24 +2345,26 @@
               For a direct connection between two virtual machines,
               corresponding to a null-modem cable, simply configure one
-              VM to create a pipe/socket and another to attach to it.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              You can send the virtual serial port output to a file.
-              This option is very useful for capturing diagnostic output
-              from a guest. Any file may be used for this purpose, as
-              long as the user running VirtualBox has sufficient
-              privileges to create and write to the file.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              TCP Socket: Useful for forwarding serial traffic over
-              TCP/IP, acting as a server, or it can act as a TCP client
-              connecting to other servers. It allows a remote machine to
-              directly connect to the guest's serial port via TCP.
+              VM to create a pipe or socket and another to attach to it.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">Raw File:</emphasis> Send the
+              virtual serial port output to a file. This option is very
+              useful for capturing diagnostic output from a guest. Any
+              file may be used for this purpose, as long as the user
+              running &product-name; has sufficient privileges to create
+              and write to the file.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">TCP Socket:</emphasis> Useful for
+              forwarding serial traffic over TCP/IP, acting as a server,
+              or it can act as a TCP client connecting to other servers.
+              This option enables a remote machine to directly connect
+              to the guest's serial port using TCP.
             </para>
 
@@ -1680,8 +2373,10 @@
               <listitem>
                 <para>
-                  TCP Server: Uncheck the <emphasis>Connect to existing
-                  pipe/socket</emphasis> checkbox and specify the
-                  <emphasis role="bold"><computeroutput>port</computeroutput></emphasis>
-                  number. Typically 23 or 2023. Note that on UNIX-like
+                  <emphasis role="bold">TCP Server:</emphasis> Deselect
+                  the <emphasis role="bold">Connect to Existing
+                  Pipe/Socket</emphasis> check box and specify the port
+                  number in the
+                  <emphasis role="bold">Path/Address</emphasis> field.
+                  This is typically 23 or 2023. Note that on UNIX-like
                   systems you will have to use a port a number greater
                   than 1024 for regular users.
@@ -1690,7 +2385,7 @@
                 <para>
                   The client can use software such as
-                  <computeroutput>PuTTY</computeroutput> or the
-                  <computeroutput>telnet</computeroutput> command line
-                  tool to access the TCP Server.
+                  <command>PuTTY</command> or the
+                  <command>telnet</command> command line tool to access
+                  the TCP Server.
                 </para>
               </listitem>
@@ -1698,11 +2393,12 @@
               <listitem>
                 <para>
-                  TCP Client: To create a virtual null-modem cable over
-                  the Internet or LAN, the other side can connect via
-                  TCP by specifying
-                  <computeroutput>hostname:port</computeroutput>. The
-                  TCP socket will act in client mode if you check the
-                  <emphasis role="bold">Connect to existing
-                  pipe/socket</emphasis> checkbox.
+                  <emphasis role="bold">TCP Client:</emphasis> To create
+                  a virtual null-modem cable over the Internet or LAN,
+                  the other side can connect using TCP by specifying
+                  <computeroutput>hostname:port</computeroutput> in the
+                  <emphasis role="bold">Path/Address</emphasis> field.
+                  The TCP socket will act in client mode if you select
+                  the <emphasis role="bold">Connect to Existing
+                  Pipe/Socket</emphasis> check box.
                 </para>
               </listitem>
@@ -1719,5 +2415,5 @@
       Up to four serial ports can be configured per virtual machine, but
       you can pick any port numbers out of the above. However, serial
-      ports cannot reliably share interrupts; if both ports are to be
+      ports cannot reliably share interrupts. If both ports are to be
       used at the same time, they must use different interrupt levels,
       for example COM1 and COM2, but not COM1 and COM3.
@@ -1735,14 +2431,16 @@
 
       <para>
-        The USB section in a virtual machine's Settings window enables
-        you to configure VirtualBox's sophisticated USB support.
-      </para>
-
-      <para>
-        VirtualBox can enable virtual machines to access the USB devices
-        on your host directly. To achieve this, VirtualBox presents the
-        guest operating system with a virtual USB controller. As soon as
-        the guest system starts using a USB device, it will appear as
-        unavailable on the host.
+        The <emphasis role="bold">USB</emphasis> section in a virtual
+        machine's <emphasis role="bold">Settings</emphasis> window
+        enables you to configure &product-name;'s sophisticated USB
+        support.
+      </para>
+
+      <para>
+        &product-name; can enable virtual machines to access the USB
+        devices on your host directly. To achieve this, &product-name;
+        presents the guest operating system with a virtual USB
+        controller. As soon as the guest system starts using a USB
+        device, it will appear as unavailable on the host.
       </para>
 
@@ -1753,5 +2451,5 @@
             <para>
               Be careful with USB devices that are currently in use on
-              the host! For example, if you allow your guest to connect
+              the host. For example, if you allow your guest to connect
               to your USB hard disk that is currently mounted on the
               host, when the guest is activated, it will be disconnected
@@ -1763,6 +2461,6 @@
           <listitem>
             <para>
-              Solaris hosts have a few known limitations regarding USB
-              support. See <xref linkend="KnownIssues" />.
+              Oracle Solaris hosts have a few known limitations
+              regarding USB support. See <xref linkend="KnownIssues" />.
             </para>
           </listitem>
@@ -1773,53 +2471,13 @@
       <para>
         In addition to allowing a guest access to your local USB
-        devices, VirtualBox even allows your guests to connect to remote
-        USB devices by use of the VirtualBox Remote Desktop Extension
-        (VRDE). See <xref linkend="usb-over-rdp" />.
-      </para>
-
-      <para>
-        In the Settings dialog, you can first configure whether USB is
-        available in the guest at all, and then choose the level of USB
-        support: OHCI for USB 1.1, EHCI (which will also enable OHCI)
-        for USB 2.0, or xHCI for all USB speeds.
-      </para>
-
-      <note>
-        <para>
-          The xHCI and EHCI controllers are shipped as a VirtualBox
-          extension package, which must be installed separately. See
-          <xref
-          linkend="intro-installing" />.
-        </para>
-      </note>
-
-      <para>
-        When USB support is enabled for a VM, you can determine in
-        detail which devices will be automatically attached to the
-        guest. For this, you can create so-called "filters" by
-        specifying certain properties of the USB device. USB devices
-        with a matching filter will be automatically passed to the guest
-        once they are attached to the host. USB devices without a
-        matching filter can be passed manually to the guest, for example
-        by using the <emphasis role="bold">Devices</emphasis>,
-        <emphasis role="bold">USB</emphasis> menu.
-      </para>
-
-      <para>
-        Clicking on the <emphasis role="bold">+</emphasis> button to the
-        right of the <emphasis role="bold">USB Device Filters</emphasis>
-        window creates a new filter. You can give the filter a name, for
-        later reference, and specify the filter criteria. The more
-        criteria you specify, the more precisely devices will be
-        selected. For instance, if you specify only a vendor ID of 046d,
-        all devices produced by Logitech will be available to the guest.
-        If you fill in all fields, on the other hand, the filter will
-        only apply to a particular device model from a particular
-        vendor, and not even to other devices of the same type with a
-        different revision and serial number.
-      </para>
-
-      <para>
-        In detail, the following criteria are available:
+        devices, &product-name; even enables your guests to connect to
+        remote USB devices by use of the VirtualBox Remote Desktop
+        Extension (VRDE). See <xref linkend="usb-over-rdp" />.
+      </para>
+
+      <para>
+        To enable USB for a VM, select the <emphasis role="bold">Enable
+        USB Controller</emphasis> check box. The following settings are
+        available:
       </para>
 
@@ -1828,56 +2486,153 @@
         <listitem>
           <para>
-            <emphasis role="bold">Vendor and product ID</emphasis>. With
-            USB, each vendor of USB products carries an identification
-            number that is unique world-wide, called the
-            <emphasis>vendor ID</emphasis>. Similarly, each line of
-            products is assigned a <emphasis>product ID</emphasis>
-            number. Both numbers are commonly written in hexadecimal
-            (that is, they are composed of the numbers 0-9 and the
-            letters A-F), and a colon separates the vendor from the
-            product ID. For example,
-            <computeroutput>046d:c016</computeroutput> stands for
-            Logitech as a vendor, and the M-UV69a Optical Wheel Mouse
-            product.
-          </para>
-
-          <para>
-            Alternatively, you can also specify
-            <emphasis
-          role="bold">Manufacturer</emphasis> and
-            <emphasis
-          role="bold">Product</emphasis> by name.
-          </para>
-
-          <para>
-            To list all the USB devices that are connected to your host
-            machine with their respective vendor IDs and product IDs,
-            use the following command:
+            <emphasis role="bold">USB Controller:</emphasis> Selects a
+            controller with the specified level of USB support, as
+            follows:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                OHCI for USB 1.1
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                EHCI for USB 2.0. This also enables OHCI.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                xHCI for USB 3.0. This supports all USB speeds.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <note>
+            <para>
+              The xHCI and EHCI controllers are shipped as an
+              &product-name; extension package, which must be installed
+              separately. See <xref linkend="intro-installing" />.
+            </para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">USB Device Filters:</emphasis> When
+            USB support is enabled for a VM, you can determine in detail
+            which devices will be automatically attached to the guest.
+            For this, you can create filters by specifying certain
+            properties of the USB device. USB devices with a matching
+            filter will be automatically passed to the guest once they
+            are attached to the host. USB devices without a matching
+            filter can be passed manually to the guest, for example by
+            using the <emphasis role="bold">Devices</emphasis>,
+            <emphasis role="bold">USB</emphasis> menu.
+          </para>
+
+          <para>
+            Clicking on the <emphasis role="bold">+</emphasis> button to
+            the right of the <emphasis role="bold">USB Device
+            Filters</emphasis> window creates a new filter. You can give
+            the filter a name, for later reference, and specify the
+            filter criteria. The more criteria you specify, the more
+            precisely devices will be selected. For instance, if you
+            specify only a vendor ID of 046d, all devices produced by
+            Logitech will be available to the guest. If you fill in all
+            fields, on the other hand, the filter will only apply to a
+            particular device model from a particular vendor, and not
+            even to other devices of the same type with a different
+            revision and serial number.
+          </para>
+
+          <para>
+            In detail, the following criteria are available:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Vendor and Product ID.</emphasis>
+                With USB, each vendor of USB products carries an
+                identification number that is unique world-wide, called
+                the <emphasis>vendor ID</emphasis>. Similarly, each line
+                of products is assigned a <emphasis>product
+                ID</emphasis> number. Both numbers are commonly written
+                in hexadecimal, and a colon separates the vendor from
+                the product ID. For example,
+                <computeroutput>046d:c016</computeroutput> stands for
+                Logitech as a vendor, and the M-UV69a Optical Wheel
+                Mouse product.
+              </para>
+
+              <para>
+                Alternatively, you can also specify
+                <emphasis role="bold">Manufacturer</emphasis> and
+                <emphasis role="bold">Product</emphasis> by name.
+              </para>
+
+              <para>
+                To list all the USB devices that are connected to your
+                host machine with their respective vendor IDs and
+                product IDs, use the following command:
+              </para>
 
 <screen>VBoxManage list usbhost</screen>
-          </para>
-
-          <para>
-            On Windows, you can also see all USB devices that are
-            attached to your system in the Device Manager. On Linux, you
-            can use the <computeroutput>lsusb</computeroutput> command.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <emphasis role="bold">Serial number</emphasis>. While vendor
-            ID and product ID are quite specific to identify USB
-            devices, if you have two identical devices of the same brand
-            and product line, you will also need their serial numbers to
-            filter them out correctly.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <emphasis role="bold">Remote</emphasis>. This setting
-            specifies whether the device will be local only, remote only
-            (such as over VRDP), or either.
+
+              <para>
+                On Windows, you can also see all USB devices that are
+                attached to your system in the Device Manager. On Linux,
+                you can use the <command>lsusb</command> command.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Serial Number.</emphasis> While
+                vendor ID and product ID are quite specific to identify
+                USB devices, if you have two identical devices of the
+                same brand and product line, you will also need their
+                serial numbers to filter them out correctly.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Remote.</emphasis> This setting
+                specifies whether the device will be local only, remote
+                only, such as over VRDP, or either.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para>
+            On a Windows host, you will need to unplug and reconnect a
+            USB device to use it after creating a filter for it.
+          </para>
+
+          <para>
+            As an example, you could create a new USB filter and specify
+            a vendor ID of 046d for Logitech, Inc, a manufacturer index
+            of 1, and "not remote". Then any USB devices on the host
+            system produced by Logitech, Inc with a manufacturer index
+            of 1 will be visible to the guest system.
+          </para>
+
+          <para>
+            Several filters can select a single device. For example, a
+            filter which selects all Logitech devices, and one which
+            selects a particular webcam.
+          </para>
+
+          <para>
+            You can deactivate filters without deleting them by
+            deselecting the check box next to the filter name.
           </para>
         </listitem>
@@ -1885,28 +2640,4 @@
       </itemizedlist>
 
-      <para>
-        On a Windows host, you will need to unplug and reconnect a USB
-        device to use it after creating a filter for it.
-      </para>
-
-      <para>
-        As an example, you could create a new USB filter and specify a
-        vendor ID of 046d (Logitech, Inc), a manufacturer index of 1,
-        and "not remote". Then any USB devices on the host system
-        produced by Logitech, Inc with a manufacturer index of 1 will be
-        visible to the guest system.
-      </para>
-
-      <para>
-        Several filters can select a single device. For example, a
-        filter which selects all Logitech devices, and one which selects
-        a particular webcam.
-      </para>
-
-      <para>
-        You can deactivate filters without deleting them by clicking in
-        the checkbox next to the filter name.
-      </para>
-
     </sect2>
 
@@ -1917,17 +2648,17 @@
       <para>
         On Windows hosts, a kernel mode device driver provides USB proxy
-        support. It implements both a USB monitor, which allows
-        VirtualBox to capture devices when they are plugged in, and a
-        USB device driver to claim USB devices for a particular virtual
-        machine. As opposed to VirtualBox versions before 1.4.0, system
-        reboots are no longer necessary after installing the driver.
-        Also, you no longer need to replug devices for VirtualBox to
-        claim them.
-      </para>
-
-      <para>
-        On newer Linux hosts, VirtualBox accesses USB devices through
-        special files in the file system. When VirtualBox is installed,
-        these are made available to all users in the
+        support. It implements both a USB monitor, which enables
+        &product-name; to capture devices when they are plugged in, and
+        a USB device driver to claim USB devices for a particular
+        virtual machine. As opposed to &product-name; versions before
+        1.4.0, system reboots are no longer necessary after installing
+        the driver. Also, you no longer need to replug devices for
+        &product-name; to claim them.
+      </para>
+
+      <para>
+        On newer Linux hosts, &product-name; accesses USB devices
+        through special files in the file system. When &product-name; is
+        installed, these are made available to all users in the
         <computeroutput>vboxusers</computeroutput> system group. In
         order to be able to access USB from guest systems, make sure
@@ -1938,12 +2669,13 @@
         On older Linux hosts, USB devices are accessed using the
         <computeroutput>usbfs</computeroutput> file system. Therefore,
-        the user executing VirtualBox needs read and write permission to
-        the USB file system. Most distributions provide a group (e.g.
-        <computeroutput>usbusers</computeroutput>) which the VirtualBox
-        user needs to be added to. Also, VirtualBox can only proxy to
-        virtual machines USB devices which are not claimed by a Linux
-        host USB driver. The <computeroutput>Driver=</computeroutput>
-        entry in <computeroutput>/proc/bus/usb/devices</computeroutput>
-        will show you which devices are currently claimed. See also
+        the user executing &product-name; needs read and write
+        permission to the USB file system. Most distributions provide a
+        group, such as <computeroutput>usbusers</computeroutput>, which
+        the &product-name; user needs to be added to. Also,
+        &product-name; can only proxy to virtual machines USB devices
+        which are not claimed by a Linux host USB driver. The
+        <computeroutput>Driver=</computeroutput> entry in
+        <computeroutput>/proc/bus/usb/devices</computeroutput> will show
+        you which devices are currently claimed. See also
         <xref
       linkend="ts_usb-linux" /> for details about
@@ -1962,6 +2694,6 @@
       Shared folders enable you to easily exchange data between a
       virtual machine and your host. This feature requires that the
-      VirtualBox Guest Additions be installed in a virtual machine and
-      is described in detail in <xref linkend="sharedfolders" />.
+      &product-name; Guest Additions be installed in a virtual machine
+      and is described in detail in <xref linkend="sharedfolders" />.
     </para>
 
@@ -1973,6 +2705,7 @@
 
     <para>
-      The User Interface section allows you to change certain aspects of
-      the user interface of this VM.
+      The <emphasis role="bold">User Interface</emphasis> section
+      enables you to change certain aspects of the user interface of
+      this VM.
     </para>
 
@@ -1983,7 +2716,7 @@
           <emphasis role="bold">Menu Bar:</emphasis> This widget enables
           you to disable menus by clicking on the menu to release it,
-          menu entries by unchecking the checkbox of the entry to
-          disable it and the complete menu bar by unchecking the
-          rightmost checkbox.
+          menu entries by deselecting the check box of the entry to
+          disable it and the complete menu bar by deselecting the
+          rightmost check box.
         </para>
       </listitem>
@@ -1992,11 +2725,11 @@
         <para>
           <emphasis role="bold">Mini ToolBar:</emphasis> In full screen
-          or seamless mode, VirtualBox can display a small toolbar that
-          contains some of the items that are normally available from
-          the virtual machine's menu bar. This toolbar reduces itself to
-          a small gray line unless you move the mouse over it. With the
-          toolbar, you can return from full screen or seamless mode,
-          control machine execution or enable certain devices. If you do
-          not want to see the toolbar, disable this setting.
+          or seamless mode, &product-name; can display a small toolbar
+          that contains some of the items that are normally available
+          from the virtual machine's menu bar. This toolbar reduces
+          itself to a small gray line unless you move the mouse over it.
+          With the toolbar, you can return from full screen or seamless
+          mode, control machine execution or enable certain devices. If
+          you do not want to see the toolbar, disable this setting.
         </para>
 
@@ -2010,8 +2743,8 @@
         <para>
           <emphasis role="bold">Status Bar:</emphasis> This widget
-          allows you to disable icons on the status bar by unchecking
-          the checkbox of an icon to disable it, to rearrange icons by
+          enables you to disable icons on the status bar by deselecting
+          the check box of an icon to disable it, to rearrange icons by
           dragging and dropping the icon, and to disable the complete
-          status bar by unchecking the leftmost checkbox.
+          status bar by deselecting the leftmost check box.
         </para>
       </listitem>
@@ -2026,18 +2759,18 @@
 
     <para>
-      Starting with release 3.1, VirtualBox includes experimental
-      support for the Extensible Firmware Interface (EFI), which is a
-      new industry standard intended to eventually replace the legacy
-      BIOS as the primary interface for bootstrapping computers and
-      certain system services later.
-    </para>
-
-    <para>
-      By default, VirtualBox uses the BIOS firmware for virtual
+      &product-name; includes experimental support for the Extensible
+      Firmware Interface (EFI), which is a new industry standard
+      intended to eventually replace the legacy BIOS as the primary
+      interface for bootstrapping computers and certain system services
+      later.
+    </para>
+
+    <para>
+      By default, &product-name; uses the BIOS firmware for virtual
       machines. To use EFI for a given virtual machine, you can enable
-      EFI in the machine's Settings dialog. See
-      <xref linkend="settings-motherboard" />. Alternatively, use the
-      <computeroutput>VBoxManage</computeroutput> command line interface
-      as follows:
+      EFI in the machine's <emphasis role="bold">Settings</emphasis>
+      dialog. See <xref linkend="settings-motherboard"/>. Alternatively,
+      use the <command>VBoxManage</command> command line interface as
+      follows:
     </para>
 
@@ -2051,19 +2784,20 @@
 
     <para>
-      One notable user of EFI is Apple's Mac OS X, but more recent
-      Linuxes and Windows, starting with Vista, offer special versions
-      that can be booted using EFI as well.
-    </para>
-
-    <para>
-      Another possible use of EFI in VirtualBox is development and
+      One notable user of EFI is Apple Mac OS X. More recent Linux
+      versions and Windows releases, starting with Vista, also offer
+      special versions that can be booted using EFI.
+    </para>
+
+    <para>
+      Another possible use of EFI in &product-name; is development and
       testing of EFI applications, without booting any OS.
     </para>
 
     <para>
-      Note that the VirtualBox EFI support is experimental and will be
-      enhanced as EFI matures and becomes more widespread. Mac OS X,
+      Note that the &product-name; EFI support is experimental and will
+      be enhanced as EFI matures and becomes more widespread. Mac OS X,
       Linux, and newer Windows guests are known to work fine. Windows 7
-      guests are unable to boot with the VirtualBox EFI implementation.
+      guests are unable to boot with the &product-name; EFI
+      implementation.
     </para>
 
@@ -2076,7 +2810,7 @@
         Protocol) and UGA (Universal Graphics Adapter). Modern operating
         systems, such as Mac OS X, generally use GOP, while some older
-        ones still use UGA. VirtualBox provides a configuration option
-        to control the graphics resolution for both interfaces, making
-        the difference mostly irrelevant for users.
+        ones still use UGA. &product-name; provides a configuration
+        option to control the graphics resolution for both interfaces,
+        making the difference mostly irrelevant for users.
       </para>
 
@@ -2084,5 +2818,5 @@
         The default resolution is 1024x768. To select a graphics
         resolution for EFI, use the following
-        <computeroutput>VBoxManage</computeroutput> command:
+        <command>VBoxManage</command> command:
       </para>
 
@@ -2473,7 +3207,7 @@
         If this list of default resolution does not cover your needs,
         see <xref linkend="customvesa" />. Note that the color depth
-        value specified in a custom video mode must be specified (8, 16,
-        24 and 32 are accepted), but it is silently assumed to be 32 by
-        EFI.
+        value specified in a custom video mode must be specified. Color
+        depths of 8, 16, 24, and 32 are accepted. EFI assumes a color
+        depth of 32 by default.
       </para>
 
@@ -2496,8 +3230,8 @@
         "VBoxInternal2/EfiBootArgs" extradata can be passed to a VM in
         order to set the "boot-args" variable. To change the "boot-args"
-        EFI variable:
+        EFI variable, use the following command:
+      </para>
 
 <screen>VBoxManage setextradata "VM name" VBoxInternal2/EfiBootArgs &lt;value&gt;</screen>
-      </para>
 
     </sect2>
Index: trunk/doc/manual/en_US/user_ChangeLog.xml
===================================================================
--- trunk/doc/manual/en_US/user_ChangeLog.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_ChangeLog.xml	(revision 76078)
@@ -5,16 +5,22 @@
 %all.entities;
 ]>
+<chapter id="ChangeLog">
 
-<chapter id="ChangeLog">
   <title>Change Log</title>
 
-  <para>This section summarizes the changes between VirtualBox versions. Note
-  that this change log is not exhaustive and not all changes are listed.</para>
+  <para>
+    This section summarizes the changes between VirtualBox versions.
+    Note that this change log is not exhaustive and not all changes are
+    listed.
+  </para>
 
-  <para>VirtualBox version numbers consist of three numbers separated by dots
-  where the first and second number represent the major version and the 3rd number
-  the minor version. Minor version numbers of official releases are always even.
-  An odd minor version number represents an internal development or test build.
-  In addition, each build contains a revision number.</para>
+  <para>
+    VirtualBox version numbers consist of three numbers separated by
+    dots where the first and second number represent the major version
+    and the third number the minor version. Minor version numbers of
+    official releases are always even. An odd minor version number
+    represents an internal development or test build. In addition, each
+    build contains a revision number.
+  </para>
 
   <xi:include href="user_ChangeLogImpl.xml" xpointer="xpointer(/chapter/*)"
@@ -22,8 +28,20 @@
 
   <sect1 id="change-log-older">
-    <title>Older Change Log Details</title>
-    <para>With VirtualBox 5.0, changelog information for versions before 4.3
-    was removed in order to save space. To access this information, please
-    consult the User Manual of VirtualBox version 4.3 or earlier.</para>
+
+    <title>Change Logs for Legacy Versions</title>
+
+    <para>
+      To view the change log for a legacy version of VirtualBox see the
+      documentation for the relevant VirtualBox release.
+    </para>
+
+    <para>
+      Change logs are also available at:
+    </para>
+
+    <para>
+      <ulink url="https://www.virtualbox.org/wiki/Changelog">https://www.virtualbox.org/wiki/Changelog</ulink>.
+    </para>
+
   </sect1>
 
Index: trunk/doc/manual/en_US/user_Frontends.xml
===================================================================
--- trunk/doc/manual/en_US/user_Frontends.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_Frontends.xml	(revision 76078)
@@ -14,6 +14,6 @@
 
     <para>
-      VirtualBox can display virtual machines remotely, meaning that a
-      virtual machine can execute on one computer even though the
+      &product-name; can display virtual machines remotely, meaning that
+      a virtual machine can execute on one computer even though the
       machine will be displayed on a second computer, and the machine
       will be controlled from there as well, as if the virtual machine
@@ -22,21 +22,20 @@
 
     <para>
-      For maximum flexibility, starting with VirtualBox 4.0, VirtualBox
-      implements remote machine display through a generic extension
-      interface, the VirtualBox Remote Desktop Extension (VRDE). The
-      base open source VirtualBox package only provides this interface,
-      while implementations can be supplied by third parties with
-      VirtualBox extension packages, which must be installed separately
-      from the base package. See
-      <xref
-    linkend="intro-installing" />.
+      For maximum flexibility, &product-name; implements remote machine
+      display through a generic extension interface called the
+      VirtualBox Remote Desktop Extension (VRDE). The base open source
+      &product-name; package only provides this interface, while
+      implementations can be supplied by third parties with
+      &product-name; extension packages, which must be installed
+      separately from the base package. See
+      <xref linkend="intro-installing" />.
     </para>
 
     <para>
       Oracle provides support for the VirtualBox Remote Display Protocol
-      (VRDP) in such a VirtualBox extension package. When this package
-      is installed, VirtualBox versions 4.0 and later support VRDP the
-      same way as binary (non-open source) versions of VirtualBox before
-      4.0 did.
+      (VRDP) in such an &product-name; extension package. When this
+      package is installed, &product-name; versions 4.0 and later
+      support VRDP the same way as binary, non-open source, versions of
+      &product-name; before 4.0 did.
     </para>
 
@@ -50,8 +49,8 @@
       Even when the extension is installed, the VRDP server is disabled
       by default. It can easily be enabled on a per-VM basis either in
-      the VirtualBox Manager in the Display settings, see
-      <xref
-    linkend="settings-display" />, or with
-      <computeroutput>VBoxManage</computeroutput>:
+      the VirtualBox Manager in the
+      <emphasis role="bold">Display</emphasis> settings, see
+      <xref linkend="settings-display" />, or with the
+      <command>VBoxManage</command> command, as follows:
     </para>
 
@@ -70,30 +69,30 @@
 
     <para>
-      The port can be changed either in the Display settings of the
-      graphical user interface or with
-      <computeroutput>--vrdeport</computeroutput> option of the
-      <computeroutput>VBoxManage modifyvm</computeroutput> command. You
-      can specify a comma-separated list of ports or ranges of ports.
-      Use a dash between two port numbers to specify a range. The VRDP
-      server will bind to <emphasis>one</emphasis> of the available
-      ports from the specified list. For example,
-      <computeroutput>VBoxManage modifyvm "VM name" --vrdeport
-      5000,5010-5012</computeroutput> will configure the server to bind
-      to one of the ports 5000, 5010, 5011, or 5012. See
-      <xref
-    linkend="vboxmanage-modifyvm-vrde" />.
+      The port can be changed either in the
+      <emphasis role="bold">Display</emphasis> settings of the graphical
+      user interface or with the <option>--vrdeport</option> option of
+      the <command>VBoxManage modifyvm</command> command. You can
+      specify a comma-separated list of ports or ranges of ports. Use a
+      dash between two port numbers to specify a range. The VRDP server
+      will bind to <emphasis>one</emphasis> of the available ports from
+      the specified list. For example, <computeroutput>VBoxManage
+      modifyvm "VM name" --vrdeport 5000,5010-5012</computeroutput> will
+      configure the server to bind to one of the ports 5000, 5010, 5011,
+      or 5012. See <xref linkend="vboxmanage-modifyvm-vrde" />.
     </para>
 
     <para>
       The actual port used by a running VM can be either queried with
-      the <computeroutput>VBoxManage showvminfo</computeroutput> command
-      or seen in the GUI on the Runtime tab of the Session Information
-      dialog, which is accessible via the Machine menu of the VM window.
-    </para>
-
-    <para>
-      Support for IPv6 has been implemented in VirtualBox 4.3. If the
-      host OS supports IPv6 the VRDP server will automatically listen
-      for IPv6 connections in addition to IPv4.
+      the <command>VBoxManage showvminfo</command> command or seen in
+      the GUI on the <emphasis role="bold">Runtime</emphasis> tab of the
+      <emphasis role="bold">Session Information</emphasis> dialog, which
+      is accessible from the <emphasis role="bold">Machine</emphasis>
+      menu of the VM window.
+    </para>
+
+    <para>
+      Support for IPv6 has been implemented in &product-name; 4.3. If
+      the host OS supports IPv6 the VRDP server will automatically
+      listen for IPv6 connections in addition to IPv4.
     </para>
 
@@ -120,15 +119,14 @@
           <para>
             On Windows, you can use the Microsoft Terminal Services
-            Connector, <computeroutput>mstsc.exe</computeroutput>, that
-            is included with Windows. Press the
-            <emphasis role="bold">Windows key + R</emphasis>, to display
-            the Run dialog. Enter <command>mstsc</command> to start the
-            program. You can also find the program in
-            <emphasis role="bold">Start</emphasis>,
+            Connector, <command>mstsc.exe</command>, that is included
+            with Windows. Press the Windows key + R, to display the
+            <emphasis role="bold">Run</emphasis> dialog. Enter
+            <command>mstsc</command> to start the program. You can also
+            find the program in <emphasis role="bold">Start</emphasis>,
             <emphasis role="bold">All Programs</emphasis>,
             <emphasis role="bold">Accessories</emphasis>,
             <emphasis role="bold">Remote Desktop Connection</emphasis>.
-            If you use the Run dialog, you can type in options directly.
-            For example:
+            If you use the <emphasis role="bold">Run</emphasis> dialog,
+            you can enter options directly. For example:
           </para>
 
@@ -158,6 +156,6 @@
                   <computeroutput>localhost</computeroutput> and
                   <computeroutput>127.0.0.1</computeroutput> might not
-                  work using <computeroutput>mstsc.exe</computeroutput>.
-                  Instead, the address
+                  work using <command>mstsc.exe</command>. Instead, the
+                  address
                   <computeroutput>127.0.0.2[:3389]</computeroutput> has
                   to be used.
@@ -172,13 +170,13 @@
           <para>
             On other systems, you can use the standard open source
-            <computeroutput>rdesktop</computeroutput> program. This
-            ships with most Linux distributions, but VirtualBox also
-            comes with a modified variant of rdesktop for remote USB
-            support. See <xref
-            linkend="usb-over-rdp" />.
-          </para>
-
-          <para>
-            With rdesktop, use a command line such as the following:
+            <command>rdesktop</command> program. This ships with most
+            Linux distributions, but &product-name; also comes with a
+            modified variant of <command>rdesktop</command> for remote
+            USB support. See <xref linkend="usb-over-rdp" />.
+          </para>
+
+          <para>
+            With <command>rdesktop</command>, use a command line such as
+            the following:
           </para>
 
@@ -200,4 +198,12 @@
         <listitem>
           <para>
+            The Remmina remote desktop client can be used with VRDP.
+            This application is included with some Linux distributions,
+            such as Debian and Ubuntu.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             If you run the KDE desktop, you can use
             <computeroutput>krdc</computeroutput>, the KDE RDP viewer. A
@@ -218,7 +224,7 @@
           <para>
             With Sun Ray thin clients you can use
-            <computeroutput>uttsc</computeroutput>, which is part of the
-            Sun Ray Windows Connector package. See the Sun Ray
-            documentation for details.
+            <command>uttsc</command>, which is part of the Sun Ray
+            Windows Connector package. See the Sun Ray documentation for
+            details.
           </para>
         </listitem>
@@ -240,28 +246,26 @@
         all your VMs are supposed to run remotely over VRDP, then it is
         pointless to have a graphical user interface on the server at
-        all. This is especially true for Linux or Solaris hosts, as the
-        VirtualBox manager comes with dependencies on the Qt and SDL
-        libraries. This is inconvenient if you would rather not have the
-        X Window system on your server at all.
-      </para>
-
-      <para>
-        VirtualBox therefore comes with a front-end called
+        all. This is especially true for Linux or Oracle Solaris hosts,
+        as the VirtualBox Manager comes with dependencies on the Qt and
+        SDL libraries. This is inconvenient if you would rather not have
+        the X Window system on your server at all.
+      </para>
+
+      <para>
+        &product-name; therefore comes with a front-end called
         <computeroutput>VBoxHeadless</computeroutput>, which produces no
         visible output on the host at all, but still can deliver VRDP
         data. This front-end has no dependencies on the X Window system
-        on Linux and Solaris hosts.
-
-        <footnote>
-
-          <para>
-            Before VirtualBox 1.6, the headless server was called
-            <computeroutput>VBoxVRDP</computeroutput>. For the sake of
-            backwards compatibility, the VirtualBox installation still
-            installs an executable with that name as well.
-          </para>
-
-        </footnote>
-      </para>
+        on Linux and Oracle Solaris hosts.
+      </para>
+
+      <note>
+        <para>
+          Before &product-name; 1.6, the headless server was called
+          <computeroutput>VBoxVRDP</computeroutput>. For the sake of
+          backwards compatibility, the &product-name; installation still
+          installs an executable with that name as well.
+        </para>
+      </note>
 
       <para>
@@ -275,6 +279,5 @@
         <listitem>
           <para>
-            Use the <computeroutput>VBoxManage</computeroutput> command,
-            as follows:
+            Use the <command>VBoxManage</command> command, as follows:
           </para>
 
@@ -283,5 +286,5 @@
           <para>
             The <computeroutput>--type</computeroutput> option causes
-            VirtualBox to use
+            &product-name; to use
             <computeroutput>VBoxHeadless</computeroutput> as the
             front-end to the internal virtualization engine, instead of
@@ -292,6 +295,5 @@
         <listitem>
           <para>
-            Use the <computeroutput>VBoxHeadless</computeroutput>
-            command, as follows:
+            Use the <command>VBoxHeadless</command> command, as follows:
           </para>
 
@@ -300,12 +302,12 @@
           <para>
             This way of starting the VM helps troubleshooting problems
-            reported by <computeroutput>VBoxManage startvm
-            </computeroutput>, because you can sometimes see more
-            detailed error messages, especially for early failures
-            before the VM execution is started. In normal situations
-            <computeroutput>VBoxManage startvm</computeroutput> is
-            preferred, since it runs the VM directly as a background
-            process which has to be done explicitly when directly
-            starting <computeroutput>VBoxHeadless</computeroutput>.
+            reported by <command>VBoxManage startvm</command>, because
+            you can sometimes see more detailed error messages,
+            especially for early failures before the VM execution is
+            started. In normal situations <command>VBoxManage
+            startvm</command> is preferred, since it runs the VM
+            directly as a background process which has to be done
+            explicitly when directly starting with
+            <computeroutput>VBoxHeadless</computeroutput>.
           </para>
         </listitem>
@@ -314,5 +316,5 @@
           <para>
             Start <computeroutput>VBoxHeadless</computeroutput> from the
-            VirtualBox Manager GUI, by holding the Shift key when
+            VirtualBox Manager GUI, by pressing the Shift key when
             starting a virtual machine or by selecting
             <emphasis role="bold">Headless Start</emphasis> from the
@@ -324,31 +326,35 @@
 
       <para>
-        Since VirtualBox version 5.0, when you use
-        <computeroutput>VBoxHeadless</computeroutput> to start a VM, the
-        VRDP server will be enabled according to the VM configuration.
-        You can override the VM's setting using
+        When you use the <computeroutput>VBoxHeadless</computeroutput>
+        command to start a VM, the VRDP server will be enabled according
+        to the VM configuration. You can override the VM's setting using
         <computeroutput>--vrde</computeroutput> command line parameter.
-        To enable the VRDP server start the VM like this:
+        To enable the VRDP server, start the VM as follows:
+      </para>
 
 <screen>VBoxHeadless --startvm &lt;uuid|name&gt; --vrde on</screen>
 
+      <para>
         To disable the VRDP server:
+      </para>
 
 <screen>VBoxHeadless --startvm &lt;uuid|name&gt; --vrde off</screen>
 
+      <para>
         To have the VRDP server enabled depending on the VM
-        configuration, as the other front-ends would, you can use:
+        configuration, as for other front-ends:
+      </para>
 
 <screen>VBoxHeadless --startvm &lt;uuid|name&gt; --vrde config</screen>
 
-        This command is the same as:
+      <para>
+        This command is the same as the following:
+      </para>
 
 <screen>VBoxHeadless --startvm &lt;uuid|name&gt;</screen>
-      </para>
-
-      <para>
-        If you start the VM with <computeroutput>VBoxManage
-        startvm</computeroutput> then the configuration settings of the
-        VM are always used.
+
+      <para>
+        If you start the VM with <command>VBoxManage startvm</command>
+        then the configuration settings of the VM are always used.
       </para>
 
@@ -372,8 +378,8 @@
         <listitem>
           <para>
-            VirtualBox on a server machine with a supported host
-            operating system. The VirtualBox extension pack for the VRDP
-            server must be installed, see <xref linkend="vrde"/>. The
-            procedures assume a Linux server is used.
+            &product-name; on a server machine with a supported host
+            operating system. The &product-name; Extension Pack for the
+            VRDP server must be installed, see <xref linkend="vrde"/>.
+            The procedures assume a Linux server is used.
           </para>
         </listitem>
@@ -407,6 +413,5 @@
       <para>
         Note that on the server machine, since we will only use the
-        headless server, Qt, SDL, and the X Window system are not
-        required.
+        headless server, Qt and the X Window system are not required.
       </para>
 
@@ -424,6 +429,6 @@
             If you do not specify
             <computeroutput>--register</computeroutput>, you will have
-            to manually use the
-            <computeroutput>registervm</computeroutput> command later.
+            to manually use the <command>registervm</command> command
+            later.
           </para>
 
@@ -500,5 +505,5 @@
           <para>
             Start the virtual machine using the
-            <computeroutput>VBoxHeadless</computeroutput> command:
+            <command>VBoxHeadless</command> command:
           </para>
 
@@ -534,15 +539,15 @@
 
       <para>
-        As a special feature additional to the VRDP support, VirtualBox
-        also supports remote USB devices over the wire. That is, the
-        VirtualBox guest that runs on one computer can access the USB
-        devices of the remote computer on which the VRDP data is being
-        displayed the same way as USB devices that are connected to the
-        actual host. This allows for running virtual machines on a
-        VirtualBox host that acts as a server, where a client can
-        connect from elsewhere that needs only a network adapter and a
-        display capable of running an RDP viewer. When USB devices are
-        plugged into the client, the remote VirtualBox server can access
-        them.
+        As a special feature additional to the VRDP support,
+        &product-name; also supports remote USB devices over the wire.
+        That is, an &product-name; guest that runs on one computer can
+        access the USB devices of the remote computer on which the VRDP
+        data is being displayed the same way as USB devices that are
+        connected to the actual host. This enables running of virtual
+        machines on an &product-name; host that acts as a server, where
+        a client can connect from elsewhere that needs only a network
+        adapter and a display capable of running an RDP viewer. When USB
+        devices are plugged into the client, the remote &product-name;
+        server can access them.
       </para>
 
@@ -556,27 +561,28 @@
       <para>
         Accessing remote USB devices is only possible if the RDP client
-        supports this extension. On Linux and Solaris hosts, the
-        VirtualBox installation provides a suitable VRDP client called
-        <computeroutput>rdesktop-vrdp</computeroutput>. Recent versions
-        of <computeroutput>uttsc</computeroutput>, a client tailored for
-        the use with Sun Ray thin clients, also support accessing remote
-        USB devices. RDP clients for other platforms will be provided in
-        future VirtualBox versions.
+        supports this extension. On Linux and Oracle Solaris hosts, the
+        &product-name; installation provides a suitable VRDP client
+        called <command>rdesktop-vrdp</command>. Recent versions of
+        <command>uttsc</command>, a client tailored for the use with Sun
+        Ray thin clients, also support accessing remote USB devices. RDP
+        clients for other platforms will be provided in future
+        &product-name; versions.
       </para>
 
       <para>
         To make a remote USB device available to a VM,
-        <computeroutput>rdesktop-vrdp</computeroutput> should be started
-        as follows:
+        <command>rdesktop-vrdp</command> should be started as follows:
+      </para>
 
 <screen>rdesktop-vrdp -r usb -a 16 -N my.host.address</screen>
 
-        Please refer to <xref linkend="ts_usb-linux" /> for further
-        details on how to properly set up the permissions for USB
-        devices. Furthermore it is advisable to disable automatic
-        loading of any host driver on the remote host which might work
-        on USB devices to ensure that the devices are accessible by the
-        RDP client. If the setup was properly done on the remote host,
-        plug/unplug events are visible on the VBox.log file of the VM.
+      <para>
+        See <xref linkend="ts_usb-linux" /> for further details on how
+        to properly set up the permissions for USB devices. Furthermore
+        it is advisable to disable automatic loading of any host driver
+        on the remote host which might work on USB devices to ensure
+        that the devices are accessible by the RDP client. If the setup
+        was properly done on the remote host, plug and unplug events are
+        visible in the VBox.log file of the VM.
       </para>
 
@@ -588,12 +594,11 @@
 
       <para>
-        For each virtual machine that is remotely accessible via RDP,
+        For each virtual machine that is remotely accessible using RDP,
         you can individually determine if and how client connections are
-        authenticated. For this, use <computeroutput>VBoxManage
-        modifyvm</computeroutput> command with the
-        <computeroutput>--vrdeauthtype</computeroutput> option. See
-        <xref
-      linkend="vboxmanage-modifyvm" />. The following
-        methods of authentication are available:
+        authenticated. For this, use the <command>VBoxManage
+        modifyvm</command> command with the
+        <option>--vrdeauthtype</option> option. See
+        <xref linkend="vboxmanage-modifyvm" />. The following methods of
+        authentication are available:
       </para>
 
@@ -613,6 +618,6 @@
             The <emphasis role="bold">external</emphasis> method
             provides external authentication through a special
-            authentication library. VirtualBox ships with two special
-            authentication libraries:
+            authentication library. &product-name; ships with two
+            special authentication libraries:
           </para>
 
@@ -652,12 +657,4 @@
                     authenticates users against the host's directory
                     service.
-
-                    <footnote>
-
-                      <para>
-                        Support for Mac OS X was added in version 3.2.
-                      </para>
-
-                    </footnote>
                   </para>
                 </listitem>
@@ -718,6 +715,6 @@
                     <computeroutput>extradata</computeroutput> section
                     the password needs to be written, is a plain text
-                    file, VirtualBox uses hashes to encrypt passwords.
-                    The following command must be used:
+                    file, &product-name; uses hashes to encrypt
+                    passwords. The following command must be used:
                   </para>
 
@@ -746,7 +743,8 @@
 
                   <para>
-                    You then use VBoxManage setextradata to store this
-                    value in the machine's
-                    <computeroutput>extradata</computeroutput> section.
+                    You then use <command>VBoxManage
+                    setextradata</command> to store this value in the
+                    machine's <computeroutput>extradata</computeroutput>
+                    section.
                   </para>
 
@@ -789,9 +787,8 @@
         In addition to the methods described above, you can replace the
         default external authentication module with any other module.
-        For this, VirtualBox provides a well-defined interface that
-        allows you to write your own authentication module. This is
-        described in detail in the VirtualBox Software Development Kit
-        (SDK) reference. See <xref
-      linkend="VirtualBoxAPI" />.
+        For this, &product-name; provides a well-defined interface that
+        enables you to write your own authentication module. This is
+        described in detail in the &product-name; Software Development
+        Kit (SDK) reference. See <xref linkend="VirtualBoxAPI" />.
       </para>
 
@@ -820,5 +817,5 @@
             perform any checks in order to verify the identity of the
             server it connects to. Since user credentials can be
-            obtained using a "man in the middle" (MITM) attack, RDP4
+            obtained using a man in the middle (MITM) attack, RDP4
             authentication is insecure and should generally not be used.
           </para>
@@ -875,4 +872,13 @@
                 Security is accepted. The client must support TLS.
               </para>
+
+              <para>
+                The OpenSSL library version determines which versions of
+                TLS are supported. The &product-name; clients include at
+                least Version 1.1.0 of the OpenSSL library. This library
+                supports TLS versions 1.0, 1.1, and 1.2. Some clients
+                might include newer versions of the OpenSSL library and
+                thus support additional TLS versions.
+              </para>
             </listitem>
 
@@ -880,5 +886,5 @@
 
           <para>
-            For example, the following command allows a client to use
+            For example, the following command enables a client to use
             either Standard or Enhanced RDP Security connection:
           </para>
@@ -946,6 +952,7 @@
       <para>
         As the client that connects to the server determines what type
-        of encryption will be used, with rdesktop, the Linux RDP viewer,
-        use the <computeroutput>-4</computeroutput> or
+        of encryption will be used, with <command>rdesktop</command>,
+        the Linux RDP viewer, use the
+        <computeroutput>-4</computeroutput> or
         <computeroutput>-5</computeroutput> options.
       </para>
@@ -958,5 +965,5 @@
 
       <para>
-        The VRDP server of VirtualBox supports multiple simultaneous
+        The VRDP server of &product-name; supports multiple simultaneous
         connections to the same running VM from different clients. All
         connected clients see the same screen output and share a mouse
@@ -968,7 +975,7 @@
       <para>
         The following command enables multiple connection mode:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --vrdemulticon on</screen>
-      </para>
 
     </sect2>
@@ -981,14 +988,13 @@
         To access two or more remote VM displays you have to enable the
         VRDP multiconnection mode. See
-        <xref
-      linkend="vrde-multiconnection" />.
+        <xref linkend="vrde-multiconnection"/>.
       </para>
 
       <para>
         The RDP client can select the virtual monitor number to connect
-        to using the <computeroutput>domain</computeroutput> logon
+        to using the <computeroutput>domain</computeroutput> login
         parameter (<computeroutput>-d</computeroutput>). If the
         parameter ends with <computeroutput>@</computeroutput> followed
-        by a number, VirtualBox interprets this number as the screen
+        by a number, &product-name; interprets this number as the screen
         index. The primary guest screen is selected with
         <computeroutput>@1</computeroutput>, the first secondary screen
@@ -998,7 +1004,7 @@
       <para>
         The Microsoft RDP6 client does not let you specify a separate
-        domain name. Instead, use
+        domain name. Instead, enter
         <computeroutput>domain\username</computeroutput> in the
-        <computeroutput>Username:</computeroutput> field. For example,
+        <emphasis role="bold">Username</emphasis> field. For example,
         <computeroutput>@2\name</computeroutput>.
         <computeroutput>name</computeroutput> must be supplied, and must
@@ -1015,10 +1021,9 @@
 
       <para>
-        Starting with VirtualBox 3.2, the VRDP server can redirect video
-        streams from the guest to the RDP client. Video frames are
-        compressed using the JPEG algorithm allowing a higher
-        compression ratio than standard RDP bitmap compression methods.
-        It is possible to increase the compression ratio by lowering the
-        video quality.
+        The VRDP server can redirect video streams from the guest to the
+        RDP client. Video frames are compressed using the JPEG algorithm
+        allowing a higher compression ratio than standard RDP bitmap
+        compression methods. It is possible to increase the compression
+        ratio by lowering the video quality.
       </para>
 
@@ -1040,7 +1045,7 @@
       <para>
         The following command enables video redirection:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --vrdevideochannel on</screen>
-      </para>
 
       <para>
@@ -1049,7 +1054,7 @@
         numbers mean lower quality but higher compression. The quality
         can be changed using the following command:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --vrdevideochannelquality 75</screen>
-      </para>
 
     </sect2>
@@ -1060,5 +1065,5 @@
 
       <para>
-        With VirtualBox 4.0 it is possible to disable display output,
+        With &product-name; it is possible to disable display output,
         mouse and keyboard input, audio, remote USB, or clipboard
         individually in the VRDP server.
@@ -1066,5 +1071,5 @@
 
       <para>
-        The following commands change corresponding server settings:
+        The following commands change the corresponding server settings:
       </para>
 
@@ -1077,28 +1082,9 @@
 
       <para>
-        To reenable a feature use a similar command without the trailing
-        1. For example:
+        To reenable a feature, use a similar command without the
+        trailing 1. For example:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --vrdeproperty Client/DisableDisplay=</screen>
-      </para>
-
-      <para>
-        These properties were introduced with VirtualBox 3.2.10.
-        However, in the 3.2.x series, it was necessary to use the
-        following commands to alter these settings instead:
-      </para>
-
-<screen>VBoxManage setextradata "VM name" "VRDP/Feature/Client/DisableDisplay" 1
-VBoxManage setextradata "VM name" "VRDP/Feature/Client/DisableInput" 1
-VBoxManage setextradata "VM name" "VRDP/Feature/Client/DisableUSB" 1
-VBoxManage setextradata "VM name" "VRDP/Feature/Client/DisableAudio" 1
-VBoxManage setextradata "VM name" "VRDP/Feature/Client/DisableClipboard" 1</screen>
-
-      <para>
-        To reenable a feature use a similar command without the trailing
-        1. For example:
-
-<screen>VBoxManage setextradata "VM name" "VRDP/Feature/Client/DisableDisplay"</screen>
-      </para>
 
     </sect2>
@@ -1111,10 +1097,10 @@
 
     <para>
-      Starting with version 3.1, VirtualBox supports
-      <emphasis>teleporting</emphasis>. Teleporting is moving a virtual
-      machine over a network from one VirtualBox host to another, while
-      the virtual machine is running. This works regardless of the host
-      operating system that is running on the hosts. You can teleport
-      virtual machines between Solaris and Mac hosts, for example.
+      &product-name; supports <emphasis>teleporting</emphasis>.
+      Teleporting is moving a virtual machine over a network from one
+      &product-name; host to another, while the virtual machine is
+      running. This works regardless of the host operating system that
+      is running on the hosts. You can teleport virtual machines between
+      Oracle Solaris and Mac hosts, for example.
     </para>
 
@@ -1145,5 +1131,5 @@
         <para>
           On the target host, you must configure a virtual machine in
-          VirtualBox with exactly the same hardware settings as the
+          &product-name; with exactly the same hardware settings as the
           machine on the source that you want to teleport. This does not
           apply to settings which are merely descriptive, such as the VM
@@ -1161,5 +1147,5 @@
           CD/DVD images. This means that they either use the same iSCSI
           targets or that the storage resides somewhere on the network
-          and both hosts have access to it via NFS or SMB/CIFS.
+          and both hosts have access to it using NFS or SMB/CIFS.
         </para>
 
@@ -1183,5 +1169,6 @@
           machine to wait for a teleport request to arrive when it is
           started, instead of actually attempting to start the machine.
-          This is done with the following VBoxManage command:
+          This is done with the following <command>VBoxManage</command>
+          command:
         </para>
 
@@ -1194,6 +1181,5 @@
           number to be used on both the source and the target hosts. For
           example, use 6000. See
-          <xref
-          linkend="vboxmanage-modifyvm-teleport" />.
+          <xref linkend="vboxmanage-modifyvm-teleport" />.
         </para>
       </listitem>
@@ -1218,6 +1204,6 @@
         <para>
           where <computeroutput>&lt;sourcevmname&gt;</computeroutput> is
-          the name of the virtual machine on the source host (the
-          machine that is currently running),
+          the name of the virtual machine on the source host, which is
+          the machine that is currently running.
           <computeroutput>&lt;targethost&gt;</computeroutput> is the
           host or IP name of the target host on which the machine is
@@ -1225,6 +1211,5 @@
           <computeroutput>&lt;port&gt;</computeroutput> must be the same
           number as specified in the command on the target host. See
-          <xref
-          linkend="vboxmanage-controlvm" />.
+          <xref linkend="vboxmanage-controlvm" />.
         </para>
       </listitem>
@@ -1245,11 +1230,10 @@
         application software that is highly optimized to run on a
         particular CPU without correctly checking that certain CPU
-        features are actually present. VirtualBox filters what CPU
+        features are actually present. &product-name; filters what CPU
         capabilities are presented to the guest operating system.
         Advanced users can attempt to restrict these virtual CPU
-        capabilities with the <computeroutput>VBoxManage --modifyvm
+        capabilities with the <computeroutput>VBoxManage modifyvm
         --cpuid</computeroutput> command. See
-        <xref
-        linkend="vboxmanage-modifyvm-teleport" />.
+        <xref linkend="vboxmanage-modifyvm-teleport" />.
       </para>
     </note>
Index: trunk/doc/manual/en_US/user_Glossary.xml
===================================================================
--- trunk/doc/manual/en_US/user_Glossary.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_Glossary.xml	(revision 76078)
@@ -18,6 +18,6 @@
           Advanced Configuration and Power Interface, an industry
           specification for BIOS and hardware extensions to configure PC
-          hardware and perform power management. Windows 2000 and higher
-          as well as Linux 2.4 and higher support ACPI. Windows can only
+          hardware and perform power management. Windows 2000 and later,
+          as well as Linux 2.4 and later support ACPI. Windows can only
           enable or disable ACPI support at installation time.
         </para>
@@ -77,7 +77,7 @@
           systems also contain an I/O APIC (input output APIC) as a
           separate chip which provides more than 16 IRQs. Windows 2000
-          and higher use a different kernel if they detect an I/O APIC
-          during installation. Therefore an I/O APIC must not be removed
-          after installation.
+          and later use a different kernel if they detect an I/O APIC
+          during installation. Therefore, an I/O APIC must not be
+          removed after installation.
         </para>
 
@@ -115,5 +115,5 @@
           personal computers which is responsible of initializing the
           hardware after the computer has been turned on and then
-          booting an operating system. VirtualBox ships with its own
+          booting an operating system. &product-name; ships with its own
           virtual BIOS that runs when a virtual machine is started.
         </para>
@@ -135,8 +135,8 @@
         <para>
           Microsoft Component Object Model, a programming infrastructure
-          for modular software. COM allows applications to provide
+          for modular software. COM enables applications to provide
           application programming interfaces which can be accessed from
           various other programming languages and applications.
-          VirtualBox makes use of COM both internally and externally to
+          &product-name; makes use of COM both internally and externally to
           provide a comprehensive API to 3rd party developers.
         </para>
@@ -157,9 +157,9 @@
 
         <para>
-          Dynamic Host Configuration Protocol. This allows a networking
+          Dynamic Host Configuration Protocol. This enables a networking
           device in a network to acquire its IP address and other
           networking details automatically, in order to avoid having to
           configure all devices in a network with fixed IP addresses.
-          VirtualBox has a built-in DHCP server that delivers an IP
+          &product-name; has a built-in DHCP server that delivers an IP
           addresses to a virtual machine when networking is configured
           to NAT. See <xref
@@ -219,9 +219,9 @@
         <para>
           Graphical User Interface. Commonly used as an antonym to a
-          "command line interface". In the context of VirtualBox, we
+          "command line interface". In the context of &product-name;, we
           sometimes refer to the main graphical
           <computeroutput>VirtualBox</computeroutput> program as the
           "GUI", to differentiate it from the
-          <computeroutput>VBoxManage</computeroutput> interface.
+          <command>VBoxManage</command> interface.
         </para>
 
@@ -316,5 +316,5 @@
           As opposed to traditional pin-based interrupts, with MSI, a
           small amount of data can accompany the actual interrupt
-          message. This reduces the amount of hardware pins required,
+          message. This reduces the amount of hardware pins required and
           allows for more interrupts and better performance.
         </para>
@@ -339,5 +339,5 @@
           target IP addresses of network packets according to specific
           rules. Commonly employed by routers and firewalls to shield an
-          internal network from the Internet, VirtualBox can use NAT to
+          internal network from the Internet, &product-name; can use NAT to
           easily share a host's physical networking hardware with its
           virtual machines. See <xref
@@ -380,6 +380,6 @@
 
         <para>
-          Physical Address Extension. This allows accessing more than 4
-          GB of RAM even in 32-bit environments. See
+          Physical Address Extension. This enables access to more than 4
+          GB of RAM, even in 32-bit environments. See
           <xref
         linkend="settings-general-advanced" />.
@@ -435,5 +435,5 @@
           transferred in both directions. Typically graphics updates and
           audio are sent from the remote machine and keyboard and mouse
-          input events are sent from the client. A VirtualBox extension
+          input events are sent from the client. An &product-name; extension
           package by Oracle provides VRDP, an enhanced implementation of
           the relevant standards which is largely compatible with
@@ -535,5 +535,5 @@
           A widely used file format for archiving. Originally, this
           stood for Tape ARchive and was already supported by very early
-          Unix versions for backing up data on tape. The file format is
+          UNIX versions for backing up data on tape. The file format is
           still widely used today. For example, with OVF archives using
           an <computeroutput>.ova</computeroutput> file extension. See
@@ -561,5 +561,5 @@
           and letters which can be computed dynamically and is
           guaranteed to be unique. Generally, it is used as a global
-          handle to identify entities. VirtualBox makes use of UUIDs to
+          handle to identify entities. &product-name; makes use of UUIDs to
           identify VMs, Virtual Disk Images (VDI files), and other
           entities.
@@ -581,5 +581,5 @@
 
         <para>
-          Virtual Machine. A virtual computer that VirtualBox enables
+          Virtual Machine. A virtual computer that &product-name; enables
           you to run on top of your actual hardware. See
           <xref
@@ -596,8 +596,8 @@
 
         <para>
-          Virtual Machine Manager. The component of VirtualBox that
+          Virtual Machine Manager. The component of &product-name; that
           controls VM execution. See
           <xref linkend="technical-components" /> for a list of
-          VirtualBox components.
+          &product-name; components.
         </para>
 
@@ -612,6 +612,6 @@
         <para>
           VirtualBox Remote Desktop Extension. This interface is built
-          into VirtualBox to allow VirtualBox extension packages to
-          supply remote access to virtual machines. A VirtualBox
+          into &product-name; to allow &product-name; extension packages to
+          supply remote access to virtual machines. An &product-name;
           extension package by Oracle provides VRDP support. See
           <xref linkend="vrde" />.
@@ -688,7 +688,7 @@
           Mozilla Cross Platform Component Object Model, a programming
           infrastructure developed by the Mozilla browser project which
-          is similar to Microsoft COM and allows applications to provide
-          a modular programming interface. VirtualBox makes use of XPCOM
-          on Linux both internally and externally to provide a
+          is similar to Microsoft COM and enables applications to
+          provide a modular programming interface. &product-name; makes use
+          of XPCOM on Linux both internally and externally to provide a
           comprehensive API to third-party developers.
         </para>
Index: trunk/doc/manual/en_US/user_GuestAdditions.xml
===================================================================
--- trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 76078)
@@ -10,10 +10,10 @@
 
   <para>
-    The previous chapter covered getting started with VirtualBox and
+    The previous chapter covered getting started with &product-name; and
     installing operating systems in a virtual machine. For any serious
-    and interactive use, the VirtualBox Guest Additions will make your
-    life much easier by providing closer integration between host and
-    guest and improving the interactive performance of guest systems.
-    This chapter describes the Guest Additions in detail.
+    and interactive use, the &product-name; Guest Additions will make
+    your life much easier by providing closer integration between host
+    and guest and improving the interactive performance of guest
+    systems. This chapter describes the Guest Additions in detail.
   </para>
 
@@ -28,17 +28,17 @@
       consist of device drivers and system applications that optimize
       the guest operating system for better performance and usability.
-      See <xref
-    linkend="guestossupport" /> for details on what
-      guest operating systems are fully supported with Guest Additions
-      by VirtualBox.
-    </para>
-
-    <para>
-      The VirtualBox Guest Additions for all supported guest operating
-      systems are provided as a single CD-ROM image file which is called
-      <computeroutput>VBoxGuestAdditions.iso</computeroutput>. This
-      image file is located in the installation directory of VirtualBox.
-      To install the Guest Additions for a particular VM, you mount this
-      ISO file in your VM as a virtual CD-ROM and install from there.
+      See <xref linkend="guestossupport" /> for details on what guest
+      operating systems are fully supported with Guest Additions by
+      &product-name;.
+    </para>
+
+    <para>
+      The &product-name; Guest Additions for all supported guest
+      operating systems are provided as a single CD-ROM image file which
+      is called <computeroutput>VBoxGuestAdditions.iso</computeroutput>.
+      This image file is located in the installation directory of
+      &product-name;. To install the Guest Additions for a particular
+      VM, you mount this ISO file in your VM as a virtual CD-ROM and
+      install from there.
     </para>
 
@@ -68,6 +68,6 @@
           an easy way to exchange files between the host and the guest.
           Much like ordinary Windows network shares, you can tell
-          VirtualBox to treat a certain host directory as a shared
-          folder, and VirtualBox will make it available to the guest
+          &product-name; to treat a certain host directory as a shared
+          folder, and &product-name; will make it available to the guest
           operating system as a network share, irrespective of whether
           guest actually has a network. See
@@ -80,7 +80,7 @@
         <para>
           <emphasis role="bold">Better video support.</emphasis> While
-          the virtual graphics card which VirtualBox emulates for any
-          guest operating system provides all the basic features, the
-          custom video drivers that are installed with the Guest
+          the virtual graphics card which &product-name; emulates for
+          any guest operating system provides all the basic features,
+          the custom video drivers that are installed with the Guest
           Additions provide you with extra high and non-standard video
           modes, as well as accelerated video performance.
@@ -88,11 +88,11 @@
 
         <para>
-          In addition, with Windows, Linux, and Solaris guests, you can
-          resize the virtual machine's window if the Guest Additions are
-          installed. The video resolution in the guest will be
-          automatically adjusted, as if you had manually entered an
-          arbitrary resolution in the guest's display settings. See
-          <xref
-            linkend="intro-resize-window" />.
+          In addition, with Windows, Linux, and Oracle Solaris guests,
+          you can resize the virtual machine's window if the Guest
+          Additions are installed. The video resolution in the guest
+          will be automatically adjusted, as if you had manually entered
+          an arbitrary resolution in the guest's
+          <emphasis role="bold">Display</emphasis> settings. See
+          <xref linkend="intro-resize-window" />.
         </para>
 
@@ -100,6 +100,5 @@
           If the Guest Additions are installed, 3D graphics and 2D video
           for guest applications can be accelerated. See
-          <xref
-            linkend="guestadd-video" />.
+          <xref linkend="guestadd-video" />.
         </para>
       </listitem>
@@ -135,7 +134,7 @@
         <para>
           <emphasis role="bold">Time synchronization.</emphasis> With
-          the Guest Additions installed, VirtualBox can ensure that the
-          guest's system time is better synchronized with that of the
-          host.
+          the Guest Additions installed, &product-name; can ensure that
+          the guest's system time is better synchronized with that of
+          the host.
         </para>
 
@@ -143,8 +142,8 @@
           For various reasons, the time in the guest might run at a
           slightly different rate than the time on the host. The host
-          could be receiving updates via NTP and its own time might not
-          run linearly. A VM could also be paused, which stops the flow
-          of time in the guest for a shorter or longer period of time.
-          When the wall clock time between the guest and host only
+          could be receiving updates through NTP and its own time might
+          not run linearly. A VM could also be paused, which stops the
+          flow of time in the guest for a shorter or longer period of
+          time. When the wall clock time between the guest and host only
           differs slightly, the time synchronization service attempts to
           gradually and smoothly adjust the guest time in small
@@ -173,5 +172,5 @@
       <listitem>
         <para>
-          <emphasis role="bold">Automated logons.</emphasis> Also called
+          <emphasis role="bold">Automated logins.</emphasis> Also called
           credentials passing. See <xref linkend="autologon" />.
         </para>
@@ -181,19 +180,18 @@
 
     <para>
-      Each version of VirtualBox, even minor releases, ship with their
-      own version of the Guest Additions. While the interfaces through
-      which the VirtualBox core communicates with the Guest Additions
-      are kept stable so that Guest Additions already installed in a VM
-      should continue to work when VirtualBox is upgraded on the host,
-      for best results, it is recommended to keep the Guest Additions at
-      the same version.
-    </para>
-
-    <para>
-      Starting with VirtualBox 3.1, the Windows and Linux Guest
-      Additions therefore check automatically whether they have to be
-      updated. If the host is running a newer VirtualBox version than
-      the Guest Additions, a notification with further instructions is
-      displayed in the guest.
+      Each version of &product-name;, even minor releases, ship with
+      their own version of the Guest Additions. While the interfaces
+      through which the &product-name; core communicates with the Guest
+      Additions are kept stable so that Guest Additions already
+      installed in a VM should continue to work when &product-name; is
+      upgraded on the host, for best results, it is recommended to keep
+      the Guest Additions at the same version.
+    </para>
+
+    <para>
+      The Windows and Linux Guest Additions therefore check
+      automatically whether they have to be updated. If the host is
+      running a newer &product-name; version than the Guest Additions, a
+      notification with further instructions is displayed in the guest.
     </para>
 
@@ -215,6 +213,6 @@
     <para>
       Guest Additions are available for virtual machines running
-      Windows, Linux, Solaris, or OS/2. The following sections describe
-      the specifics of each variant in detail.
+      Windows, Linux, Oracle Solaris, or OS/2. The following sections
+      describe the specifics of each variant in detail.
     </para>
 
@@ -224,5 +222,5 @@
 
       <para>
-        The VirtualBox Windows Guest Additions are designed to be
+        The &product-name; Windows Guest Additions are designed to be
         installed in a virtual machine running a Windows operating
         system. The following versions of Windows guests are supported:
@@ -298,12 +296,16 @@
 
         <para>
-          In the Devices menu in the virtual machine's menu bar,
-          VirtualBox has a menu item <emphasis role="bold">Insert Guest
-          Additions CD Image</emphasis>, which mounts the Guest
-          Additions ISO file inside your virtual machine. A Windows
-          guest should then automatically start the Guest Additions
-          installer, which installs the Guest Additions into your
-          Windows guest. Other guest operating systems, or if automatic
-          start of software on CD is disabled, need a manual start of
+          In the <emphasis role="bold">Devices</emphasis> menu in the
+          virtual machine's menu bar, &product-name; has a menu item
+          <emphasis role="bold">Insert Guest Additions CD
+          Image</emphasis>, which mounts the Guest Additions ISO file
+          inside your virtual machine. A Windows guest should then
+          automatically start the Guest Additions installer, which
+          installs the Guest Additions on your Windows guest.
+        </para>
+
+        <para>
+          For other guest operating systems, or if automatic start of
+          software on a CD is disabled, you need to do a manual start of
           the installer.
         </para>
@@ -313,16 +315,9 @@
             For the basic Direct3D acceleration to work in a Windows
             guest, you have to install the WDDM video driver available
-            for Windows Vista or higher.
-
-            <footnote>
-
-              <para>
-                An experimental WDDM driver was added with VirtualBox
-                4.1.
-              </para>
-
-            </footnote>
-
-            For Windows 8 and higher only the WDDM Direct3D video driver
+            for Windows Vista or later.
+          </para>
+
+          <para>
+            For Windows 8 and later, only the WDDM Direct3D video driver
             is available. For basic Direct3D acceleration to work in
             Windows XP guests, you have to install the Guest Additions
@@ -349,8 +344,9 @@
             <para>
               Select <emphasis role="bold">Mount CD/DVD-ROM</emphasis>
-              from the Devices menu in the virtual machine's menu bar
-              and then <emphasis role="bold">CD/DVD-ROM
-              Image</emphasis>. This displays the Virtual Media Manager,
-              described in <xref
+              from the <emphasis role="bold">Devices</emphasis> menu in
+              the virtual machine's menu bar and then
+              <emphasis role="bold">CD/DVD-ROM Image</emphasis>. This
+              displays the Virtual Media Manager, described in
+              <xref
             linkend="vdis" />.
             </para>
@@ -370,5 +366,5 @@
               <listitem>
                 <para>
-                  On a Windows host, this file is in the VirtualBox
+                  On a Windows host, this file is in the &product-name;
                   installation directory, usually in
                   <computeroutput>C:\Program
@@ -380,8 +376,9 @@
                 <para>
                   On Mac OS X hosts, this file is in the application
-                  bundle of VirtualBox. Right-click on the VirtualBox
-                  icon in Finder and choose <emphasis role="bold">Show
-                  Package Contents</emphasis>. The file is located in
-                  the <computeroutput>Contents/MacOS</computeroutput>
+                  bundle of &product-name;. Right-click on the
+                  &product-name; icon in Finder and choose
+                  <emphasis role="bold">Show Package
+                  Contents</emphasis>. The file is located in the
+                  <computeroutput>Contents/MacOS</computeroutput>
                   folder.
                 </para>
@@ -392,5 +389,5 @@
                   On a Linux host, this file is in the
                   <computeroutput>additions</computeroutput> folder
-                  where you installed VirtualBox, usually
+                  where you installed &product-name;, usually
                   <computeroutput>/opt/VirtualBox/</computeroutput>.
                 </para>
@@ -399,7 +396,7 @@
               <listitem>
                 <para>
-                  On Solaris hosts, this file is in the
+                  On Oracle Solaris hosts, this file is in the
                   <computeroutput>additions</computeroutput> folder
-                  where you installed VirtualBox, usually
+                  where you installed &product-name;, usually
                   <computeroutput>/opt/VirtualBox</computeroutput>.
                 </para>
@@ -422,5 +419,5 @@
         <para>
           Unless you have the Autostart feature disabled in your Windows
-          guest, Windows will now autostart the VirtualBox Guest
+          guest, Windows will now autostart the &product-name; Guest
           Additions installation program from the Additions ISO. If the
           Autostart feature has been turned off, choose
@@ -468,5 +465,5 @@
           <listitem>
             <para>
-              VirtualBox Graphics Adapter
+              &product-name; Graphics Adapter
             </para>
           </listitem>
@@ -474,5 +471,5 @@
           <listitem>
             <para>
-              VirtualBox System Device
+              &product-name; System Device
             </para>
           </listitem>
@@ -493,17 +490,17 @@
 
         <para>
-          As a prerequisite for avoid popups while performing an
-          unattended installation of the VirtualBox Guest Additions, the
-          code signing certificates used to sign the drivers needs to be
-          installed in the right certificates stores in the guest
-          system. Failing to do this will cause a typical windows
-          installation to pop up a dialog asking whether its allowable
-          to install each driver.
+          To avoid popups when performing an unattended installation of
+          the &product-name; Guest Additions, the code signing
+          certificates used to sign the drivers needs to be installed in
+          the correct certificate stores on the guest operating system.
+          Failure to do this will cause a typical Windows installation
+          to display multiple dialogs asking whether you want to install
+          a particular driver.
         </para>
 
         <note>
           <para>
-            On some Windows versions like Windows 2000 and Windows XP
-            the user intervention popups mentioned above always will be
+            On some Windows versions, such as Windows 2000 and Windows
+            XP, the user intervention popups mentioned above are always
             displayed, even after importing the Oracle certificates.
           </para>
@@ -511,9 +508,13 @@
 
         <para>
-          Since VirtualBox 4.2, installing the code signing certificates
-          on a Windows guest can be done in an automated fashion using
-          the <computeroutput>VBoxCertUtil.exe</computeroutput> utility
-          found on the Guest Additions installation CD in the
-          <computeroutput>cert</computeroutput> folder:
+          Installing the code signing certificates on a Windows guest
+          can be done automatically. Use the
+          <computeroutput>VBoxCertUtil.exe</computeroutput> utility from
+          the <computeroutput>cert</computeroutput> folder on the Guest
+          Additions installation CD.
+        </para>
+
+        <para>
+          Use the following steps:
         </para>
 
@@ -528,5 +529,5 @@
           <listitem>
             <para>
-              Mount the VirtualBox Guest Additions .ISO.
+              Mount the &product-name; Guest Additions .ISO.
             </para>
           </listitem>
@@ -536,5 +537,5 @@
               Open a command line window on the guest and change to the
               <computeroutput>cert</computeroutput> folder on the
-              VirtualBox Guest Additions CD.
+              &product-name; Guest Additions CD.
             </para>
           </listitem>
@@ -557,166 +558,6 @@
 
         <para>
-          Prior to VirtualBox 4.2 the code signing certificates need to
-          be imported in more manual style using the
-          <computeroutput>certutil.exe</computeroutput> utility, which
-          is shipped since Windows Vista. For Windows versions before
-          Vista you need to download and install
-          <computeroutput>certutil.exe</computeroutput> manually. Since
-          the certificates are not accompanied on the VirtualBox Guest
-          Additions CD-ROM prior to 4.2, these need to get extracted
-          from a signed VirtualBox executable first.
-        </para>
-
-        <para>
-          In the following examples the required certificates are
-          extracted from the VirtualBox Windows Guest Additions
-          installer on the CD-ROM.
-        </para>
-
-        <para>
-          For a VeriSign Code Signing CA certificate, do the following:
-        </para>
-
-        <orderedlist>
-
-          <listitem>
-            <para>
-              Open the Windows Explorer.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Right click on
-              VBoxWindowsAdditions-<replaceable>arch</replaceable>.exe,
-              and choose <emphasis role="bold">Properties</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Go to the Digital Signatures tab, choose
-              <emphasis role="bold">Oracle Corporation</emphasis> and
-              click on <emphasis role="bold">Details</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              On the General tab, click on <emphasis role="bold">View
-              Certificate</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              On the Certification Path tab, select
-              <emphasis role="bold">VeriSign Class 3 Public Primary
-              CA</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Click <emphasis role="bold">View Certificate</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              On the Details tab, click <emphasis role="bold">Copy to
-              File</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              In the displayed wizard choose <emphasis role="bold">DER
-              Encoded Binary X.509 (.CER)</emphasis> and save the
-              certificate file to a local path. Close the wizard.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Close the certificate dialog for Verisign Class 3 Code
-              Signing 2010 CA.
-            </para>
-          </listitem>
-
-        </orderedlist>
-
-        <para>
-          For an Oracle Corporation CA certificate, do the following:
-        </para>
-
-        <orderedlist>
-
-          <listitem>
-            <para>
-              Open the Windows Explorer.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Right-click on
-              VBoxWindowsAdditions-<replaceable>arch</replaceable>.exe
-              and choose <emphasis role="bold">Properties</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Go to the Digital Signatures tab, choose
-              <emphasis role="bold">Oracle Corporation</emphasis> and
-              click on <emphasis role="bold">Details</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              On the General tab, click on <emphasis role="bold">View
-              Certificate</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              On the Details tab, click on <emphasis role="bold">Copy to
-              File</emphasis>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              In the displayed wizard choose <emphasis role="bold">DER
-              Encoded Binary X.509 (.CER)</emphasis> and save the
-              certificate file to a local path. Close the wizard
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Close the certificate dialog for Oracle Corporation.
-            </para>
-          </listitem>
-
-        </orderedlist>
-
-        <para>
-          After exporting the two certificates above they can be
-          imported into the certificate store using the
-          <computeroutput>certutil.exe</computeroutput> utility, as
-          follows:
-        </para>
-
-<screen>certutil -addstore -f Root "&lt;Path to
-          exported certificate file&gt;"</screen>
-
-        <para>
-          In order to allow for completely unattended guest
-          installations, you can specify a command line parameter to the
-          install launcher:
+          To allow for completely unattended guest installations, you
+          can specify a command line parameter to the install launcher:
         </para>
 
@@ -725,5 +566,5 @@
         <para>
           This automatically installs the right files and drivers for
-          the corresponding platform, 32-bit or 64-bit.
+          the corresponding platform, either 32-bit or 64-bit.
         </para>
 
@@ -760,10 +601,10 @@
       <sect3 id="windows-guest-file-extraction">
 
-        <title>Manual file Extraction</title>
+        <title>Manual File Extraction</title>
 
         <para>
           If you would like to install the files and drivers manually,
           you can extract the files from the Windows Guest Additions
-          setup as follows
+          setup as follows:
         </para>
 
@@ -790,7 +631,8 @@
 
       <para>
-        Like the Windows Guest Additions, the VirtualBox Guest Additions
-        for Linux are a set of device drivers and system applications
-        which may be installed in the guest operating system.
+        Like the Windows Guest Additions, the &product-name; Guest
+        Additions for Linux are a set of device drivers and system
+        applications which may be installed in the guest operating
+        system.
       </para>
 
@@ -848,14 +690,14 @@
       <para>
         Note that some Linux distributions already come with all or part
-        of the VirtualBox Guest Additions. You may choose to keep the
-        distribution's version of the Guest Additions but these are
+        of the &product-name; Guest Additions. You may choose to keep
+        the distribution's version of the Guest Additions but these are
         often not up to date and limited in functionality, so we
         recommend replacing them with the Guest Additions that come with
-        VirtualBox. The VirtualBox Linux Guest Additions installer tries
-        to detect existing installation and replace them but depending
-        on how the distribution integrates the Guest Additions, this may
-        require some manual interaction. It is highly recommended to
-        take a snapshot of the virtual machine before replacing
-        pre-installed Guest Additions.
+        &product-name;. The &product-name; Linux Guest Additions
+        installer tries to detect an existing installation and replace
+        them but depending on how the distribution integrates the Guest
+        Additions, this may require some manual interaction. It is
+        highly recommended to take a snapshot of the virtual machine
+        before replacing preinstalled Guest Additions.
       </para>
 
@@ -865,11 +707,11 @@
 
         <para>
-          The VirtualBox Guest Additions for Linux are provided on the
-          same virtual CD-ROM file as the Guest Additions for Windows.
-          See <xref linkend="mountingadditionsiso"/>. They also come
-          with an installation program that guides you through the setup
-          process. However, due to the significant differences between
-          Linux distributions, installation may be slightly more complex
-          when compared to Windows.
+          The &product-name; Guest Additions for Linux are provided on
+          the same virtual CD-ROM file as the Guest Additions for
+          Windows. See <xref linkend="mountingadditionsiso"/>. They also
+          come with an installation program that guides you through the
+          setup process. However, due to the significant differences
+          between Linux distributions, installation may be slightly more
+          complex when compared to Windows.
         </para>
 
@@ -885,7 +727,6 @@
               guest system for building external kernel modules. This
               works as described in
-              <xref
-            linkend="externalkernelmodules" />,
-              except that this step must be performed in your Linux
+              <xref linkend="externalkernelmodules" />, except that this
+              step must be performed in your Linux
               <emphasis>guest</emphasis> instead of on a Linux host
               system.
@@ -907,6 +748,5 @@
               file into your Linux guest's virtual CD-ROM drive, as
               described for a Windows guest in
-              <xref
-            linkend="mountingadditionsiso" />.
+              <xref linkend="mountingadditionsiso" />.
             </para>
           </listitem>
@@ -930,22 +770,22 @@
 
         <para>
-          In Linux and Solaris guests, VirtualBox graphics and mouse
-          integration goes through the X Window System. VirtualBox can
-          use the X.Org variant of the system, or XFree86 version 4.3
-          which is identical to the first X.Org release. During the
-          installation process, the X.Org display server will be set up
-          to use the graphics and mouse drivers which come with the
-          Guest Additions.
+          In Linux and Oracle Solaris guests, &product-name; graphics
+          and mouse integration goes through the X Window System.
+          &product-name; can use the X.Org variant of the system, or
+          XFree86 version 4.3 which is identical to the first X.Org
+          release. During the installation process, the X.Org display
+          server will be set up to use the graphics and mouse drivers
+          which come with the Guest Additions.
         </para>
 
         <para>
           After installing the Guest Additions into a fresh installation
-          of a supported Linux distribution or Solaris system, many
-          unsupported systems will work correctly too, the guest's
-          graphics mode will change to fit the size of the VirtualBox
-          window on the host when it is resized. You can also ask the
-          guest system to switch to a particular resolution by sending a
-          video mode hint using the
-          <computeroutput>VBoxManage</computeroutput> tool.
+          of a supported Linux distribution or Oracle Solaris system,
+          many unsupported systems will work correctly too, the guest's
+          graphics mode will change to fit the size of the
+          &product-name; window on the host when it is resized. You can
+          also ask the guest system to switch to a particular resolution
+          by sending a video mode hint using the
+          <command>VBoxManage</command> tool.
         </para>
 
@@ -988,11 +828,11 @@
           virtual machine and wish to remove it without installing new
           ones, you can do so by inserting the Guest Additions CD image
-          into the virtual CD-ROM drive as described above and running
-          the installer for the current Guest Additions with the
+          into the virtual CD-ROM drive as described above. Then run the
+          installer for the current Guest Additions with the
           <computeroutput>uninstall</computeroutput> parameter from the
-          path that the CD image is mounted on in the guest:
+          path that the CD image is mounted on in the guest, as follows:
+        </para>
 
 <screen>sh ./VBoxLinuxAdditions.run uninstall</screen>
-        </para>
 
         <para>
@@ -1006,6 +846,5 @@
 
         <para>
-          Starting with version 3.1.0, you can uninstall the Additions
-          as follows:
+          You can uninstall the Additions as follows:
         </para>
 
@@ -1024,15 +863,16 @@
     <sect2 id="additions-solaris">
 
-      <title>Guest Additions for Solaris</title>
-
-      <para>
-        Like the Windows Guest Additions, the VirtualBox Guest Additions
-        for Solaris take the form of a set of device drivers and system
-        applications which may be installed in the guest operating
-        system.
-      </para>
-
-      <para>
-        The following Solaris distributions are officially supported:
+      <title>Guest Additions for Oracle Solaris</title>
+
+      <para>
+        Like the Windows Guest Additions, the &product-name; Guest
+        Additions for Oracle Solaris take the form of a set of device
+        drivers and system applications which may be installed in the
+        guest operating system.
+      </para>
+
+      <para>
+        The following Oracle Solaris distributions are officially
+        supported:
       </para>
 
@@ -1041,11 +881,11 @@
         <listitem>
           <para>
-            Solaris 11, including Solaris 11 Express
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Solaris 10 u5 and higher
+            Oracle Solaris 11, including Oracle Solaris 11 Express
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Oracle Solaris 10 4/08 and later
           </para>
         </listitem>
@@ -1060,11 +900,11 @@
       <sect3 id="additions-solaris-install">
 
-        <title>Installing the Solaris Guest Additions</title>
-
-        <para>
-          The VirtualBox Guest Additions for Solaris are provided on the
-          same ISO CD-ROM as the Additions for Windows and Linux. They
-          come with an installation program that guides you through the
-          setup process.
+        <title>Installing the Oracle Solaris Guest Additions</title>
+
+        <para>
+          The &product-name; Guest Additions for Oracle Solaris are
+          provided on the same ISO CD-ROM as the Additions for Windows
+          and Linux. They come with an installation program that guides
+          you through the setup process.
         </para>
 
@@ -1079,6 +919,6 @@
               Mount the
               <computeroutput>VBoxGuestAdditions.iso</computeroutput>
-              file as your Solaris guest's virtual CD-ROM drive, exactly
-              the same way as described for a Windows guest in
+              file as your Oracle Solaris guest's virtual CD-ROM drive,
+              exactly the same way as described for a Windows guest in
               <xref
             linkend="mountingadditionsiso" />.
@@ -1087,6 +927,6 @@
             <para>
               If the CD-ROM drive on the guest does not get mounted, as
-              seen with some versions of Solaris 10, run the following
-              command as root:
+              seen with some versions of Oracle Solaris 10, run the
+              following command as root:
             </para>
 
@@ -1118,15 +958,13 @@
       <sect3 id="additions-solaris-uninstall">
 
-        <title>Uninstalling the Solaris Guest Additions</title>
-
-        <para>
-          The Solaris Guest Additions can be safely removed by removing
-          the package from the guest. Open a root terminal session and
-          run the following command:
-        </para>
-
-        <para>
+        <title>Uninstalling the Oracle Solaris Guest Additions</title>
+
+        <para>
+          The Oracle Solaris Guest Additions can be safely removed by
+          removing the package from the guest. Open a root terminal
+          session and run the following command:
+        </para>
+
 <screen>pkgrm SUNWvboxguest</screen>
-        </para>
 
       </sect3>
@@ -1134,5 +972,5 @@
       <sect3 id="additions-solaris-updating">
 
-        <title>Updating the Solaris Guest Additions</title>
+        <title>Updating the Oracle Solaris Guest Additions</title>
 
         <para>
@@ -1152,9 +990,10 @@
 
       <para>
-        VirtualBox also ships with a set of drivers that improve running
-        OS/2 in a virtual machine. Due to restrictions of OS/2 itself,
-        this variant of the Guest Additions has a limited feature set.
-        See <xref
-      linkend="KnownIssues" /> for details.
+        &product-name; also ships with a set of drivers that improve
+        running OS/2 in a virtual machine. Due to restrictions of OS/2
+        itself, this variant of the Guest Additions has a limited
+        feature set. See <xref
+      linkend="KnownIssues" /> for
+        details.
       </para>
 
@@ -1182,26 +1021,29 @@
 
     <para>
-      With the <emphasis>shared folders</emphasis> feature of VirtualBox, you
-      can access files of your host system from within the guest system. This
-      is similar how you would use network shares in Windows networks, except
-      that shared folders do not require networking, only the Guest Additions.
-      Shared Folders are supported with Windows 2000 or later, Linux, and
-      Solaris guests.  (There are also experimental support for Mac OS X and
-      OS/2 guests shipping with VirtualBox 6.0.)
-    </para>
-
-    <para>
-      Shared folders physically reside on the <emphasis>host</emphasis> and are
-      then shared with the guest, which uses a special file system driver in
-      the Guest Addition to talk to the host.  For Windows guests, shared
-      folders are implemented as a pseudo-network redirector.  For Linux and
-      Solaris guests, the Guest Additions provide a virtual file system.
-    </para>
-
-    <para>
-      To share a host folder with a virtual machine in VirtualBox, you
-      must specify the path of that folder and choose a <emphasis>share name</emphasis>
-      for it.  This happens on the host.   In the guest you then uses the name
-      connect to it and access the files.
+      With the <emphasis>shared folders</emphasis> feature of
+      &product-name;, you can access files of your host system from
+      within the guest system. This is similar to how you would use
+      network shares in Windows networks, except that shared folders do
+      not require networking, only the Guest Additions. Shared folders
+      are supported with Windows 2000 or later, Linux, and Oracle
+      Solaris guests. &product-name; release 6.0 includes experimental
+      support for Mac OS X and OS/2 guests.
+    </para>
+
+    <para>
+      Shared folders physically reside on the <emphasis>host</emphasis>
+      and are then shared with the guest, which uses a special file
+      system driver in the Guest Additions to talk to the host. For
+      Windows guests, shared folders are implemented as a pseudo-network
+      redirector. For Linux and Oracle Solaris guests, the Guest
+      Additions provide a virtual file system.
+    </para>
+
+    <para>
+      To share a host folder with a virtual machine in &product-name;,
+      you must specify the path of the folder and choose a
+      <emphasis>share name</emphasis> that the guest can use to access
+      the shared folder. This happens on the host. In the guest you can
+      then use the share name to connect to it and access files.
     </para>
 
@@ -1225,5 +1067,6 @@
         <para>
           If a VM is not currently running, you can configure shared
-          folders in the virtual machine's Settings dialog.
+          folders in the virtual machine's
+          <emphasis role="bold">Settings</emphasis> dialog.
         </para>
       </listitem>
@@ -1232,5 +1075,5 @@
         <para>
           From the command line, you can create shared folders using
-          VBoxManage, as follows:
+          <command>VBoxManage</command>, as follows:
         </para>
 
@@ -1248,9 +1091,9 @@
     </para>
 
-    <orderedlist>
+    <itemizedlist>
 
       <listitem>
         <para>
-          Permanent shares that are saved with the VM settings.
+          Permanent shares, that are saved with the VM settings.
         </para>
       </listitem>
@@ -1258,33 +1101,36 @@
       <listitem>
         <para>
-          Transient shares that are added at runtime and disappear when the VM
-          is powered off.  There is a checkbox for this in the GUI and
-          VBoxManage has a <computeroutput>--transient</computeroutput> option
-          for it.
+          Transient shares, that are added at runtime and disappear when
+          the VM is powered off. These can be created using a checkbox
+          in the VirtualBox Manager, or by using the
+          <computeroutput>--transient</computeroutput> option of the
+          <command>VBoxManage sharedfolder add</command> command.
         </para>
       </listitem>
 
-    </orderedlist>
-
-    <para>
-      Shared folders can either be read-write or read-only, meaning the guest
-      is either allowed to both read and write or just read files on the host.
-      There is a checkbox for read-only in the GUI, default being read-write,
-      and similarly a <computeroutput>--readonly</computeroutput> option for
-      VBoxManage.
-    </para>
-
-    <para>
-      Starting with version 4.0, VirtualBox shared folders also support
-      symbolic links (<emphasis>symlinks</emphasis>), under the
-      following conditions:
-    </para>
-
-    <orderedlist>
+    </itemizedlist>
+
+    <para>
+      Shared folders can either be read-write or read-only. This means
+      that the guest is either allowed to both read and write, or just
+      read files on the host. By default, shared folders are read-write.
+      Read-only folders can be created using a checkbox in the
+      VirtualBox Manager, or with the
+      <computeroutput>--readonly</computeroutput> option of the
+      <command>VBoxManage sharedfolder add</command> command.
+    </para>
+
+    <para>
+      &product-name; shared folders also support symbolic links, also
+      called <emphasis>symlinks</emphasis>, under the following
+      conditions:
+    </para>
+
+    <itemizedlist>
 
       <listitem>
         <para>
           The host operating system must support symlinks. For example,
-          a Mac OS X, Linux, or Solaris host is required.
+          a Mac OS X, Linux, or Oracle Solaris host is required.
         </para>
       </listitem>
@@ -1292,6 +1138,6 @@
       <listitem>
         <para>
-          Currently only Linux and Solaris Guest Additions support
-          symlinks.
+          Currently only Linux and Oracle Solaris Guest Additions
+          support symlinks.
         </para>
       </listitem>
@@ -1308,5 +1154,5 @@
       </listitem>
 
-    </orderedlist>
+    </itemizedlist>
 
     <sect2 id="sf_mount_manual">
@@ -1328,9 +1174,9 @@
             and look for the folder in <emphasis role="bold">My
             Networking Place</emphasis>s, <emphasis role="bold">Entire
-            Network</emphasis>, <emphasis role="bold">VirtualBox Shared
-            Folders</emphasis>. By right-clicking on a shared folder and
-            selecting <emphasis role="bold">Map Network Drive</emphasis>
-            from the menu that pops up, you can assign a drive letter to
-            that shared folder.
+            Network</emphasis>, <emphasis role="bold">&product-name;
+            Shared Folders</emphasis>. By right-clicking on a shared
+            folder and selecting <emphasis role="bold">Map Network
+            Drive</emphasis> from the menu that pops up, you can assign
+            a drive letter to that shared folder.
           </para>
 
@@ -1348,5 +1194,5 @@
             the drive letter that you want to use for the share, and
             <replaceable>sharename</replaceable> with the share name
-            specified with <computeroutput>VBoxManage</computeroutput>.
+            specified with <command>VBoxManage</command>.
           </para>
         </listitem>
@@ -1369,5 +1215,5 @@
         <listitem>
           <para>
-            In a Solaris guest, use the following command:
+            In a Oracle Solaris guest, use the following command:
           </para>
 
@@ -1377,7 +1223,7 @@
             Replace <replaceable>sharename</replaceable>, use a
             lowercase string, with the share name specified with
-            <computeroutput>VBoxManage</computeroutput> or the GUI.
-            Replace <replaceable>mountpoint</replaceable> with the path
-            where you want the share to be mounted on the guest, such as
+            <command>VBoxManage</command> or the GUI. Replace
+            <replaceable>mountpoint</replaceable> with the path where
+            you want the share to be mounted on the guest, such as
             <computeroutput>/mnt/share</computeroutput>. The usual mount
             rules apply. For example, create this directory first if it
@@ -1387,5 +1233,5 @@
           <para>
             Here is an example of mounting the shared folder for the
-            user jack on Solaris:
+            user jack on Oracle Solaris:
           </para>
 
@@ -1401,6 +1247,6 @@
           <para>
             Beyond the standard options supplied by the
-            <computeroutput>mount</computeroutput> command, the
-            following are available:
+            <command>mount</command> command, the following are
+            available:
           </para>
 
@@ -1438,16 +1284,19 @@
         <listitem>
           <para>
-            In an OS/2 guest, use VBoxControl to manage shared folders:
+            In an OS/2 guest, use the <command>VBoxControl</command>
+            command to manage shared folders. For example:
           </para>
 
 <screen>VBoxControl sharedfolder use D: MyShareName
-VBoxControl sharedfolder unuse D:
+VBoxControl sharedfolder unuse D: 
 VBoxControl sharedfolder list</screen>
 
-          <para>Like for Windows guests, shared folders can also be accessed via
-            UNC using <computeroutput>\\VBoxSF\</computeroutput>,
+          <para>
+            As with Windows guests, shared folders can also be accessed
+            via UNC using <computeroutput>\\VBoxSF\</computeroutput>,
             <computeroutput>\\VBoxSvr\</computeroutput> or
-            <computeroutput>\\VBoxSrv\</computeroutput> as the server name and
-            the shared folder name as share.
+            <computeroutput>\\VBoxSrv\</computeroutput> as the server
+            name and the shared folder name as
+            <replaceable>sharename</replaceable>.
           </para>
         </listitem>
@@ -1462,16 +1311,18 @@
 
       <para>
-        VirtualBox provides the option to mount shared folders
-        automatically.   When automatic mounting is enabled for a shared
-        folder, the guest additions service will mount it for you.  A
-        preferred drive letter (Windows, OS/2) or mount point directory
-        (Linux, Solaris) can also be specified if desired.</para>
-
-      <para>
-        When no drive letter or mount point is given, or should it be
-        in use already, an alternative location will be found
-
-        the service will search for an alternative
-        location depending on the guest OS:</para>
+        &product-name; provides the option to mount shared folders
+        automatically. When automatic mounting is enabled for a shared
+        folder, the Guest Additions service will mount it for you
+        automatically. For Windows or OS/2, a preferred drive letter can
+        also be specified. For Linux or Oracle Solaris, a mount point
+        directory can also be specified.
+      </para>
+
+      <para>
+        If a drive letter or mount point is not specified, or is in use
+        already, an alternative location is found by the Guest Additions
+        service. The service searches for an alternative location
+        depending on the guest OS, as follows:
+      </para>
 
       <itemizedlist>
@@ -1479,37 +1330,45 @@
         <listitem>
           <para>
-            <emphasis role="bold">Windows and OS/2 guests:</emphasis>
-            Search for a free drive letter starting at
-            <computeroutput>Z:</computeroutput>.  If all drive letter are
-            assigned, the folder will not be mounted.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <emphasis role="bold">Linux and Solaris guests:</emphasis>
-            Folders are mounted under the <computeroutput>/media</computeroutput>
-            directory.  The folder name is normalized (no spaces, slashes,
-            colons) and prefixed with <computeroutput>sf_</computeroutput>.
-            Say you have a shared folder called <computeroutput>myfiles</computeroutput>
-            it will appear as <computeroutput>/media/sf_myfiles</computeroutput> in the guest.
+            <emphasis role="bold">Windows and OS/2 guests.</emphasis>
+            Search for a free drive letter, starting at
+            <computeroutput>Z:</computeroutput>. If all drive letters
+            are assigned, the folder is not mounted.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Linux and Oracle Solaris
+            guests.</emphasis> Folders are mounted under the
+            <computeroutput>/media</computeroutput> directory. The
+            folder name is normalized (no spaces, slashes or colons) and
+            is prefixed with <computeroutput>sf_</computeroutput>.
+          </para>
+
+          <para>
+            For example, if you have a shared folder called
+            <computeroutput>myfiles</computeroutput>, it will appear as
+            <computeroutput>/media/sf_myfiles</computeroutput> in the
+            guest.
           </para>
 
           <para>
             The guest properties
-            <computeroutput>/VirtualBox/GuestAdd/SharedFolders/MountDir</computeroutput> and
+            <computeroutput>/VirtualBox/GuestAdd/SharedFolders/MountDir</computeroutput>
+            and
             <computeroutput>/VirtualBox/GuestAdd/SharedFolders/MountPrefix</computeroutput>
-            can be used override the automatic mount directory and prefix.
-            See <xref linkend="guestadd-guestprops" />.
-          </para>
-
-        </listitem>
+            can be used to override the automatic mount directory and
+            prefix. See <xref linkend="guestadd-guestprops" />.
+          </para>
+        </listitem>
+
       </itemizedlist>
 
       <para>
-        Access to an automatically mounted shared folder is granted to everyone
-        in a Windows guest, that includes the Guest user.  For Linux and Solaris
-        guests the access is restricted to members of the group
-        <computeroutput>vboxsf</computeroutput> and <computeroutput>root</computeroutput>.
+        Access to an automatically mounted shared folder is granted to
+        everyone in a Windows guest, including the guest user. For Linux
+        and Oracle Solaris guests, access is restricted to members of
+        the group <computeroutput>vboxsf</computeroutput> and the
+        <computeroutput>root</computeroutput> user.
       </para>
 
@@ -1523,7 +1382,7 @@
 
     <para>
-      Starting with version 5.0, VirtualBox enables you to drag and drop
-      content from the host to the guest, and vice versa. For this to
-      work the latest Guest Additions must be installed on the guest.
+      &product-name; enables you to drag and drop content from the host
+      to the guest, and vice versa. For this to work the latest Guest
+      Additions must be installed on the guest.
     </para>
 
@@ -1531,5 +1390,5 @@
       Drag and drop transparently allows copying or opening files,
       directories, and even certain clipboard formats from one end to
-      the other. for example, from the host to the guest or from the
+      the other. For example, from the host to the guest or from the
       guest to the host. You then can perform drag and drop operations
       between the host and a VM, as it would be a native drag and drop
@@ -1543,5 +1402,5 @@
       most common one, XDND, is supported for now. Applications using
       other protocols, such as Motif or OffiX, will not be recognized by
-      VirtualBox.
+      &product-name;.
     </para>
 
@@ -1553,14 +1412,12 @@
       Transferring data from the source to the target can be done in
       various ways, such as copying, moving, or linking.
-
-      <footnote>
-
-        <para>
-          At the moment only copying of data is supported. Moving or
-          linking is not yet implemented.
-        </para>
-
-      </footnote>
-    </para>
+    </para>
+
+    <note>
+      <para>
+        At the moment only copying of data is supported. Moving or
+        linking is not yet implemented.
+      </para>
+    </note>
 
     <para>
@@ -1574,9 +1431,11 @@
       For security reasons drag and drop can be configured at runtime on
       a per-VM basis either using the <emphasis role="bold">Drag and
-      Drop</emphasis> menu item in the "Devices" menu of the virtual
-      machine or VBoxManage. The following modes are available:
-    </para>
-
-    <para>
+      Drop</emphasis> menu item in the
+      <emphasis role="bold">Devices</emphasis> menu of the virtual
+      machine, as shown below, or the <command>VBoxManage</command>.
+    </para>
+
+    <figure id="fig-drag-drop-options">
+      <title>Drag and Drop Menu Options</title>
       <mediaobject>
         <imageobject>
@@ -1585,4 +1444,8 @@
         </imageobject>
       </mediaobject>
+    </figure>
+
+    <para>
+      The following drag and drop modes are available:
     </para>
 
@@ -1592,6 +1455,6 @@
         <para>
           <emphasis role="bold">Disabled.</emphasis> Disables the drag
-          and drop feature entirely. This is the default when creating
-          new VMs.
+          and drop feature entirely. This is the default when creating a
+          new VM.
         </para>
       </listitem>
@@ -1614,6 +1477,6 @@
         <para>
           <emphasis role="bold">Bidirectional.</emphasis> Enables drag
-          and drop operations in both directions. From from the host to
-          the guest, and from the guest to the host.
+          and drop operations in both directions: from the host to the
+          guest, and from the guest to the host.
         </para>
       </listitem>
@@ -1630,10 +1493,9 @@
 
     <para>
-      To use VBoxManage for controlling the current drag and drop mode,
-      see <xref
-    linkend="vboxmanage" />. The commands
-      <computeroutput>modifyvm</computeroutput> and
-      <computeroutput>controlvm</computeroutput> allow setting of the
-      VM's current drag and drop mode via the command line.
+      To use the <command>VBoxManage</command> command to control the
+      current drag and drop mode, see <xref linkend="vboxmanage" />. The
+      <command>modifyvm</command> and <command>controlvm</command>
+      commands enable setting of a VM's current drag and drop mode from
+      the command line.
     </para>
 
@@ -1643,7 +1505,7 @@
 
       <para>
-        As VirtualBox can run on a variety of host operating systems and
-        also supports a wide range of guests, certain data formats must
-        be translated after transfer. This is so that the target
+        As &product-name; can run on a variety of host operating systems
+        and also supports a wide range of guests, certain data formats
+        must be translated after transfer. This is so that the target
         operating system, which receiving the data, is able to handle
         them in an appropriate manner.
@@ -1660,5 +1522,5 @@
 
       <para>
-        The following formats are handled by the VirtualBox drag and
+        The following formats are handled by the &product-name; drag and
         drop service:
       </para>
@@ -1704,7 +1566,7 @@
         UAC-elevated (User Account Control) programs and
         non-UAC-elevated programs is not allowed. If you start
-        VirtualBox with Administrator privileges then drag and drop will
-        not work with Windows Explorer, which runs with regular user
-        privileges by default.
+        &product-name; with Administrator privileges then drag and drop
+        will not work with Windows Explorer, which runs with regular
+        user privileges by default.
       </para>
 
@@ -1722,19 +1584,6 @@
 
       <para>
-        The VirtualBox Guest Additions contain experimental hardware 3D
-        support for Windows, Linux, and Solaris guests.
-
-        <footnote>
-
-          <para>
-            OpenGL support for Windows guests was added with VirtualBox
-            2.1; support for Linux and Solaris followed with VirtualBox
-            2.2. With VirtualBox 3.0, Direct3D 8/9 support was added for
-            Windows guests. OpenGL 2.0 is now supported as well. With
-            VirtualBox 4.1 Windows Aero theme support is added for
-            Windows Vista and Windows 7 guests (experimental)
-          </para>
-
-        </footnote>
+        The &product-name; Guest Additions contain experimental hardware
+        3D support for Windows, Linux, and Oracle Solaris guests.
       </para>
 
@@ -1743,8 +1592,8 @@
         uses 3D features through the OpenGL or Direct3D 8/9 programming
         interfaces, instead of emulating them in software, which would
-        be slow, VirtualBox will attempt to use your host's 3D hardware.
-        This works for all supported host platforms, provided that your
-        host operating system can make use of your accelerated 3D
-        hardware in the first place.
+        be slow, &product-name; will attempt to use your host's 3D
+        hardware. This works for all supported host platforms, provided
+        that your host operating system can make use of your accelerated
+        3D hardware in the first place.
       </para>
 
@@ -1758,6 +1607,6 @@
         <listitem>
           <para>
-            It is only available for certain Windows, Linux, and Solaris
-            guests. In particular:
+            It is only available for certain Windows, Linux, and Oracle
+            Solaris guests. In particular:
           </para>
 
@@ -1767,7 +1616,7 @@
               <para>
                 3D acceleration with Windows guests requires Windows
-                2000, Windows XP, Vista or Windows 7. Both OpenGL and
-                Direct3D 8/9 (not with Windows 2000) are supported
-                (experimental).
+                2000, Windows XP, Vista, or Windows 7. Apart from on
+                Windows 2000 guests, both OpenGL and Direct3D 8/9 are
+                supported on an experimental basis.
               </para>
             </listitem>
@@ -1775,8 +1624,7 @@
             <listitem>
               <para>
-                OpenGL on Linux requires kernel 2.6.27 and higher as
-                well as X.org server version 1.5 and higher. Ubuntu
-                10.10 and Fedora 14 have been tested and confirmed as
-                working.
+                OpenGL on Linux requires kernel 2.6.27 or later, as well
+                as X.org server version 1.5 or later. Ubuntu 10.10 and
+                Fedora 14 have been tested and confirmed as working.
               </para>
             </listitem>
@@ -1784,6 +1632,6 @@
             <listitem>
               <para>
-                OpenGL on Solaris guests requires X.org server version
-                1.5 and higher.
+                OpenGL on Oracle Solaris guests requires X.org server
+                version 1.5 or later.
               </para>
             </listitem>
@@ -1800,12 +1648,12 @@
             <para>
               For the basic Direct3D acceleration to work in a Windows
-              Guest, VirtualBox needs to replace Windows system files in
-              the virtual machine. As a result, the Guest Additions
-              installation program offers Direct3D acceleration as an
-              option that must be explicitly enabled. Also, you must
-              install the Guest Additions in Safe Mode. This does
-              <emphasis>not</emphasis> apply to the WDDM Direct3D video
-              driver available for Vista and higher. See
-              <xref linkend="KnownIssues" /> for details.
+              Guest, &product-name; needs to replace Windows system
+              files in the virtual machine. As a result, the Guest
+              Additions installation program offers Direct3D
+              acceleration as an option that must be explicitly enabled.
+              Also, you must install the Guest Additions in Safe Mode.
+              This does <emphasis>not</emphasis> apply to the WDDM
+              Direct3D video driver available for Windows Vista and
+              later. See <xref linkend="KnownIssues" /> for details.
             </para>
           </note>
@@ -1824,6 +1672,6 @@
             <para>
               Untrusted guest systems should not be allowed to use
-              VirtualBox's 3D acceleration features, just as untrusted
-              host software should not be allowed to use 3D
+              &product-name;'s 3D acceleration features, just as
+              untrusted host software should not be allowed to use 3D
               acceleration. Drivers for 3D hardware are generally too
               complex to be made properly secure and any software which
@@ -1831,7 +1679,7 @@
               operating system running them. In addition, enabling 3D
               acceleration gives the guest direct access to a large body
-              of additional program code in the VirtualBox host process
-              which it might conceivably be able to use to crash the
-              virtual machine.
+              of additional program code in the &product-name; host
+              process which it might conceivably be able to use to crash
+              the virtual machine.
             </para>
           </note>
@@ -1841,10 +1689,10 @@
 
       <para>
-        To enable Aero theme support, the VirtualBox WDDM video driver
-        must be installed, which is available with the Guest Additions
-        installation. The WDDM driver is not installed by default for
-        Vista and Windows 7 guest and must be <emphasis>manually
-        selected</emphasis> in the Guest Additions installer by clicking
-        <emphasis role="bold">No</emphasis> in the
+        To enable Aero theme support, the &product-name; WDDM video
+        driver must be installed, which is available with the Guest
+        Additions installation. The WDDM driver is not installed by
+        default for Vista and Windows 7 guest and must be
+        <emphasis>manually selected</emphasis> in the Guest Additions
+        installer by clicking <emphasis role="bold">No</emphasis> in the
         <emphasis role="bold">Would You Like to Install Basic Direct3D
         Support</emphasis> dialog displayed when the Direct3D feature is
@@ -1865,8 +1713,9 @@
             <emphasis role="bold">Personalize</emphasis>, then select
             <emphasis role="bold">Windows Color and
-            Appearance</emphasis> in the Personalization window. In the
-            Appearance Settings dialog, select
-            <emphasis role="bold">Windows Aero</emphasis> and click
-            <emphasis role="bold">OK</emphasis>.
+            Appearance</emphasis> in the
+            <emphasis role="bold">Personalization</emphasis> window. In
+            the <emphasis role="bold">Appearance Settings</emphasis>
+            dialog, select <emphasis role="bold">Windows Aero</emphasis>
+            and click <emphasis role="bold">OK</emphasis>.
           </para>
         </listitem>
@@ -1877,5 +1726,6 @@
             Right-click on the desktop and select
             <emphasis role="bold">Personalize</emphasis>. Select any
-            Aero theme in the Personalization window.
+            Aero theme in the
+            <emphasis role="bold">Personalization</emphasis> window.
           </para>
         </listitem>
@@ -1884,15 +1734,15 @@
 
       <para>
-        Technically, VirtualBox implements this by installing an
+        Technically, &product-name; implements this by installing an
         additional hardware 3D driver inside your guest when the Guest
         Additions are installed. This driver acts as a hardware 3D
         driver and reports to the guest operating system that the
-        (virtual) hardware is capable of 3D hardware acceleration. When
-        an application in the guest then requests hardware acceleration
+        virtual hardware is capable of 3D hardware acceleration. When an
+        application in the guest then requests hardware acceleration
         through the OpenGL or Direct3D programming interfaces, these are
         sent to the host through a special communication tunnel
-        implemented by VirtualBox, and then the
+        implemented by &product-name;, and then the
         <emphasis>host</emphasis> performs the requested 3D operation
-        via the host's programming interfaces.
+        using the host's programming interfaces.
       </para>
 
@@ -1904,7 +1754,6 @@
 
       <para>
-        Starting with version 3.1, the VirtualBox Guest Additions
-        contain experimental hardware 2D video acceleration support for
-        Windows guests.
+        The &product-name; Guest Additions contain experimental hardware
+        2D video acceleration support for Windows guests.
       </para>
 
@@ -1912,5 +1761,5 @@
         With this feature, if an application such as a video player
         inside your Windows VM uses 2D video overlays to play a movie
-        clip, then VirtualBox will attempt to use your host's video
+        clip, then &product-name; will attempt to use your host's video
         acceleration hardware instead of performing overlay stretching
         and color conversion in software, which would be slow. This
@@ -1929,5 +1778,6 @@
         <listitem>
           <para>
-            Only available for Windows guests (XP or later).
+            Only available for Windows guests, running Windows XP or
+            later.
           </para>
         </listitem>
@@ -1952,10 +1802,10 @@
 
       <para>
-        Technically, VirtualBox implements this by exposing video
+        Technically, &product-name; implements this by exposing video
         overlay DirectDraw capabilities in the Guest Additions video
         driver. The driver sends all overlay commands to the host
         through a special communication tunnel implemented by
-        VirtualBox. On the host side, OpenGL is then used to implement
-        color space transformation and scaling
+        &product-name;. On the host side, OpenGL is then used to
+        implement color space transformation and scaling
       </para>
 
@@ -1970,6 +1820,6 @@
     <para>
       With the <emphasis>seamless windows</emphasis> feature of
-      VirtualBox, you can have the windows that are displayed within a
-      virtual machine appear side by side next to the windows of your
+      &product-name;, you can have the windows that are displayed within
+      a virtual machine appear side by side next to the windows of your
       host. This feature is supported for the following guest operating
       systems, provided that the Guest Additions are installed:
@@ -1980,5 +1830,5 @@
       <listitem>
         <para>
-          Windows guests (support added with VirtualBox 1.5)
+          Windows guests. Support was added in &product-name; 1.5.
         </para>
       </listitem>
@@ -1986,6 +1836,6 @@
       <listitem>
         <para>
-          Supported Linux or Solaris guests running the X Window System
-          (added with VirtualBox 1.6)
+          Supported Linux or Oracle Solaris guests running the X Window
+          System. Support was added with &product-name; 1.6.
         </para>
       </listitem>
@@ -1994,5 +1844,5 @@
 
     <para>
-      After seamless windows are enabled, VirtualBox suppresses the
+      After seamless windows are enabled, &product-name; suppresses the
       display of the desktop background of your guest, allowing you to
       run the windows of your guest operating system seamlessly next to
@@ -2000,9 +1850,12 @@
     </para>
 
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="images/seamless.png" width="14cm" />
-      </imageobject>
-    </mediaobject>
+    <figure id="fig-seamless-windows">
+      <title>Seamless Windows on a Host Desktop</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="images/seamless.png" width="14cm" />
+        </imageobject>
+      </mediaobject>
+    </figure>
 
     <para>
@@ -2023,8 +1876,8 @@
 
     <para>
-      Starting with version 2.1, VirtualBox enables requesting of
-      certain properties from a running guest, provided that the
-      VirtualBox Guest Additions are installed and the VM is running.
-      This provides the following advantages:
+      &product-name; enables requests of some properties from a running
+      guest, provided that the &product-name; Guest Additions are
+      installed and the VM is running. This provides the following
+      advantages:
     </para>
 
@@ -2034,6 +1887,6 @@
         <para>
           A number of predefined VM characteristics are automatically
-          maintained by VirtualBox and can be retrieved on the host. For
-          example, to monitor VM performance and statistics.
+          maintained by &product-name; and can be retrieved on the host.
+          For example, to monitor VM performance and statistics.
         </para>
       </listitem>
@@ -2049,11 +1902,11 @@
 
     <para>
-      To accomplish this, VirtualBox establishes a private communication
-      channel between the VirtualBox Guest Additions and the host, and
-      software on both sides can use this channel to exchange string
-      data for arbitrary purposes. Guest properties are simply string
-      keys to which a value is attached. They can be set, or written to,
-      by either the host and the guest. They can also be read from both
-      sides.
+      To accomplish this, &product-name; establishes a private
+      communication channel between the &product-name; Guest Additions
+      and the host, and software on both sides can use this channel to
+      exchange string data for arbitrary purposes. Guest properties are
+      simply string keys to which a value is attached. They can be set,
+      or written to, by either the host and the guest. They can also be
+      read from both sides.
     </para>
 
@@ -2061,5 +1914,5 @@
       In addition to establishing the general mechanism of reading and
       writing values, a set of predefined guest properties is
-      automatically maintained by the VirtualBox Guest Additions to
+      automatically maintained by the &product-name; Guest Additions to
       allow for retrieving interesting guest data such as the guest's
       exact operating system and service pack level, the installed
@@ -2074,12 +1927,12 @@
       Some of this runtime information is shown when you select
       <emphasis role="bold">Session Information Dialog</emphasis> from a
-      virtual machine's Machine menu.
-    </para>
-
-    <para>
-      A more flexible way to use this channel is via the
-      <computeroutput>VBoxManage guestproperty</computeroutput> command.
-      See <xref linkend="vboxmanage-guestproperty" />. For example, to
-      have <emphasis>all</emphasis> the available guest properties for a
+      virtual machine's <emphasis role="bold">Machine</emphasis> menu.
+    </para>
+
+    <para>
+      A more flexible way to use this channel is with the
+      <command>VBoxManage guestproperty</command> command. See
+      <xref linkend="vboxmanage-guestproperty" />. For example, to have
+      <emphasis>all</emphasis> the available guest properties for a
       given running VM listed with their respective values, use this
       command:
@@ -2158,7 +2011,7 @@
       To add or change guest properties from the guest, use the tool
       <computeroutput>VBoxControl</computeroutput>. This tool is
-      included in the Guest Additions of VirtualBox 2.2 or later. When
-      started from a Linux guest, this tool requires root privileges for
-      security reasons:
+      included in the Guest Additions of &product-name; 2.2 or later.
+      When started from a Linux guest, this tool requires root
+      privileges for security reasons:
     </para>
 
@@ -2175,5 +2028,5 @@
 
     <para>
-      For more complex needs, you can use the VirtualBox programming
+      For more complex needs, you can use the &product-name; programming
       interfaces. See <xref linkend="VirtualBoxAPI" />.
     </para>
@@ -2181,11 +2034,125 @@
   </sect1>
 
+  <sect1 id="guestadd-gc-file-manager">
+
+    <title>Guest Control File Manager</title>
+
+    <para>
+      The Guest Control File Manager is a feature of the Guest Additions
+      that enables easy copying and moving of files between a guest and
+      the host system.
+    </para>
+
+    <para>
+      Other file management operations are supported, such as creating
+      new folders and renaming files or deleting files.
+    </para>
+
+    <figure id="fig-guest-control-fm">
+      <title>Guest Control File Manager</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="images/guest-fm.png"
+            width="10cm" />
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <para>
+      The Guest Control File Manager works by mounting the host file
+      system. Guest users must authenticate and create a guest session
+      before they can transfer files.
+    </para>
+
+    <sect2 id="guestadd-gc-file-manager-using">
+
+      <title>Using the Guest Control File Manager</title>
+
+      <para>
+        The following steps describe how to use the Guest Control File
+        Manager.
+      </para>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Display the Guest Control File Manager.
+          </para>
+
+          <para>
+            In the guest VM, select
+            <emphasis role="bold">Machine</emphasis>,
+            <emphasis role="bold">File Manager</emphasis>.
+          </para>
+
+          <para>
+            The Guest Control File Manager is displayed. Files on the
+            host system are shown in the left pane.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Create a guest session.
+          </para>
+
+          <para>
+            In the panel at the bottom of the Guest Control File
+            Manager, enter authentication credentials for a user on the
+            guest system.
+          </para>
+
+          <para>
+            Click <emphasis role="bold">Create Session</emphasis>.
+          </para>
+
+          <para>
+            The guest VM file system is shown in the right pane of the
+            Guest Control File Manager.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Transfer files between the guest and the host.
+          </para>
+
+          <para>
+            Use the file transfer icons to copy or move files between
+            the guest and host.
+          </para>
+
+          <para>
+            You can copy and move files from guest to host, or from host
+            to guest.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Close down the Guest Control File Manager.
+          </para>
+
+          <para>
+            Click <emphasis role="bold">Close</emphasis>. The guest
+            session is ended and the Guest Control File Manager is
+            closed down.
+          </para>
+        </listitem>
+
+      </orderedlist>
+
+    </sect2>
+
+  </sect1>
+
   <sect1 id="guestadd-guestcontrol">
 
-    <title>Guest Control</title>
-
-    <para>
-      Starting with version 3.2, the Guest Additions of VirtualBox allow
-      starting applications inside a VM from the host system.
+    <title>Guest Control of Applications</title>
+
+    <para>
+      The Guest Additions enable starting of applications inside a VM
+      from the host system.
     </para>
 
@@ -2205,15 +2172,13 @@
 
     <para>
-      Starting with version 4.0, the Guest Additions for Windows allow
-      for automatic updating. This applies for already installed Guest
-      Additions version 4.0 or later. Also, copying files from host to
-      the guest as well as remotely creating guest directories is
-      available.
-    </para>
-
-    <para>
-      To use these features, use the VirtualBox command line. See
-      <xref
-    linkend="vboxmanage-guestcontrol" />.
+      The Guest Additions for Windows allow for automatic updating. This
+      applies for already installed Guest Additions version 4.0 or
+      later. Also, copying files from host to the guest as well as
+      remotely creating guest directories is available.
+    </para>
+
+    <para>
+      To use these features, use the &product-name; command line. See
+      <xref linkend="vboxmanage-guestcontrol" />.
     </para>
 
@@ -2237,8 +2202,8 @@
 
       <para>
-        Starting with version 3.2, the Guest Additions of VirtualBox can
-        change the amount of host memory that a VM uses while the
-        machine is running. Because of how this is implemented, this
-        feature is called <emphasis>memory ballooning</emphasis>.
+        The Guest Additions can change the amount of host memory that a
+        VM uses, while the machine is running. Because of how this is
+        implemented, this feature is called <emphasis>memory
+        ballooning</emphasis>.
       </para>
 
@@ -2248,5 +2213,5 @@
           <listitem>
             <para>
-              VirtualBox supports memory ballooning only on 64-bit
+              &product-name; supports memory ballooning only on 64-bit
               hosts. It is not supported on Mac OS X hosts.
             </para>
@@ -2274,5 +2239,5 @@
 
       <para>
-        When memory ballooning is requested, the VirtualBox Guest
+        When memory ballooning is requested, the &product-name; Guest
         Additions, which run inside the guest, allocate physical memory
         from the guest operating system on the kernel level and lock
@@ -2280,5 +2245,5 @@
         not use that memory any longer. No guest applications can
         allocate it, and the guest kernel will not use it either.
-        VirtualBox can then reuse this memory and give it to another
+        &product-name; can then reuse this memory and give it to another
         virtual machine.
       </para>
@@ -2286,5 +2251,5 @@
       <para>
         The memory made available through the ballooning mechanism is
-        only available for reuse by VirtualBox. It is
+        only available for reuse by &product-name;. It is
         <emphasis>not</emphasis> returned as free memory to the host.
         Requesting balloon memory from a running guest will therefore
@@ -2301,7 +2266,7 @@
       <para>
         At this time, memory ballooning is only supported through
-        VBoxManage. Use the following command to increase or decrease
-        the size of the memory balloon within a running virtual machine
-        that has Guest Additions installed:
+        <command>VBoxManage</command>. Use the following command to
+        increase or decrease the size of the memory balloon within a
+        running virtual machine that has Guest Additions installed:
       </para>
 
@@ -2320,7 +2285,7 @@
         requested from the VM every time after it has started up with
         the following command:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --guestmemoryballoon n</screen>
-      </para>
 
       <para>
@@ -2345,16 +2310,15 @@
 
       <para>
-        In a server environment running several similar VMs, for example
-        with identical operating systems, on the same host, lots of
-        memory pages are identical. VirtualBox's Page Fusion technology,
-        introduced with VirtualBox 3.2, is a novel technique to
-        efficiently identify these identical memory pages and share them
-        between multiple VMs.
+        In a server environment running several similar VMs on the same
+        host, lots of memory pages are identical. For example, if the
+        VMs are using identical operating systems. &product-name;'s Page
+        Fusion technology can efficiently identify these identical
+        memory pages and share them between multiple VMs.
       </para>
 
       <note>
         <para>
-          VirtualBox supports Page Fusion only on 64-bit hosts, and it
-          is not supported on Mac OS X hosts. Page Fusion currently
+          &product-name; supports Page Fusion only on 64-bit hosts, and
+          it is not supported on Mac OS X hosts. Page Fusion currently
           works only with Windows 2000 and later guests.
         </para>
@@ -2391,23 +2355,23 @@
           <para>
             Traditional hypervisors scan <emphasis>all</emphasis> guest
-            memory and compute checksums (hashes) for every single
-            memory page. Then, they look for pages with identical hashes
-            and compare the entire content of those pages. If two pages
-            produce the same hash, it is very likely that the pages are
-            identical in content. This process can take rather long,
-            especially if the system is not idling. As a result, the
-            additional memory only becomes available after a significant
-            amount of time, such as hours or sometimes days. Even worse,
-            this kind of page sharing algorithm generally consumes
-            significant CPU resources and increases the virtualization
-            overhead by 10 to 20%.
-          </para>
-
-          <para>
-            Page Fusion in VirtualBox uses logic in the VirtualBox Guest
-            Additions to quickly identify memory cells that are most
-            likely identical across VMs. It can therefore achieve most
-            of the possible savings of page sharing almost immediately
-            and with almost no overhead.
+            memory and compute checksums, also called hashes, for every
+            single memory page. Then, they look for pages with identical
+            hashes and compare the entire content of those pages. If two
+            pages produce the same hash, it is very likely that the
+            pages are identical in content. This process can take rather
+            long, especially if the system is not idling. As a result,
+            the additional memory only becomes available after a
+            significant amount of time, such as hours or sometimes days.
+            Even worse, this kind of page sharing algorithm generally
+            consumes significant CPU resources and increases the
+            virtualization overhead by 10 to 20%.
+          </para>
+
+          <para>
+            Page Fusion in &product-name; uses logic in the
+            &product-name; Guest Additions to quickly identify memory
+            cells that are most likely identical across VMs. It can
+            therefore achieve most of the possible savings of page
+            sharing almost immediately and with almost no overhead.
           </para>
         </listitem>
@@ -2427,6 +2391,6 @@
       <para>
         At this time, Page Fusion can only be controlled with
-        VBoxManage, and only while a VM is shut down. To enable Page
-        Fusion for a VM, use the following command:
+        <command>VBoxManage</command>, and only while a VM is shut down.
+        To enable Page Fusion for a VM, use the following command:
       </para>
 
@@ -2448,5 +2412,7 @@
           Enabling Page Fusion might indirectly increase the chances for
           malicious guests to successfully attack other VMs running on
-          the same host. See <xref linkend="pot-insecure"/>.
+          the same host.
+
+<!--See <xref linkend="pot-insecure"/>.-->
         </para>
       </note>
Index: trunk/doc/manual/en_US/user_Installation.xml
===================================================================
--- trunk/doc/manual/en_US/user_Installation.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_Installation.xml	(revision 76078)
@@ -8,10 +8,8 @@
 
   <title>Installation Details</title>
-
   <para>
-    As installation of VirtualBox varies depending on your host
-    operating system, we provide installation instructions in four
-    separate chapters for Windows, Mac OS X, Linux and Solaris,
-    respectively.
+    As installation of &product-name; varies depending on your host
+    operating system, the following sections provide installation
+    instructions for Windows, Mac OS X, Linux, and Oracle Solaris.
   </para>
 
@@ -32,5 +30,5 @@
 
       <para>
-        In addition, Windows Installer 1.1 or higher must be present on
+        In addition, Windows Installer 1.1 or later must be present on
         your system. This should be the case if you have all recent
         Windows updates installed.
@@ -44,5 +42,5 @@
 
       <para>
-        The VirtualBox installation can be started in either of the
+        The &product-name; installation can be started in either of the
         following ways:
       </para>
@@ -76,8 +74,9 @@
 
       <para>
-        Using either way displays the installation Welcome dialog and
-        enables you to choose where to install VirtualBox, and which
-        components to install. In addition to the VirtualBox
-        application, the following components are available:
+        Using either way displays the installation
+        <emphasis role="bold">Welcome</emphasis> dialog and enables you
+        to choose where to install &product-name;, and which components to
+        install. In addition to the &product-name; application, the
+        following components are available:
       </para>
 
@@ -88,5 +87,5 @@
             <emphasis role="bold">USB support.</emphasis> This package
             contains special drivers for your Windows host that
-            VirtualBox requires to fully support USB devices inside your
+            &product-name; requires to fully support USB devices inside your
             virtual machines.
           </para>
@@ -97,5 +96,5 @@
             <emphasis role="bold">Networking.</emphasis> This package
             contains extra networking drivers for your Windows host that
-            VirtualBox needs to support Bridged Networking. This enables
+            &product-name; needs to support Bridged Networking. This enables
             your VM's virtual network cards to be accessed from other
             machines on your physical network.
@@ -106,5 +105,5 @@
           <para>
             <emphasis role="bold">Python support.</emphasis> This
-            package contains Python scripting support for the VirtualBox
+            package contains Python scripting support for the &product-name;
             API, see <xref linkend="VirtualBoxAPI" />. For this to work,
             an already working Windows Python installation on the system
@@ -120,5 +119,5 @@
           <note>
             <para>
-              Python version at least 2.6 is required. Since VirtualBox
+              Python version at least 2.6 is required. Since &product-name;
               5.1, Python 3 is also supported.
             </para>
@@ -132,16 +131,16 @@
         about unsigned drivers, or similar. Click
         <emphasis role="bold">Continue</emphasis> for these warnings, as
-        otherwise VirtualBox might not function correctly after
+        otherwise &product-name; might not function correctly after
         installation.
       </para>
 
       <para>
-        The installer will create a VirtualBox group in the Windows
-        Start menu, which allows you to launch the application and
-        access its documentation.
-      </para>
-
-      <para>
-        With standard settings, VirtualBox will be installed for all
+        The installer will create a &product-name; group in the Windows
+        <emphasis role="bold">Start</emphasis> menu, which enables you
+        to launch the application and access its documentation.
+      </para>
+
+      <para>
+        With standard settings, &product-name; will be installed for all
         users on the local system. If this is not wanted, you must
         invoke the installer by first extracting as follows:
@@ -152,5 +151,5 @@
       <para>
         Then, run either of the following commands on the extracted .MSI
-        files. This will install VirtualBox only for the current user.
+        files. This will install &product-name; only for the current user.
       </para>
 
@@ -160,5 +159,5 @@
 
       <para>
-        If you do not want to install all features of VirtualBox, you
+        If you do not want to install all features of &product-name;, you
         can set the optional <computeroutput>ADDLOCAL</computeroutput>
         parameter to explicitly name the features to be installed. The
@@ -175,14 +174,14 @@
           <listitem>
             <para>
-              Main binaries of VirtualBox.
-
-              <note>
-                <para>
-                  This feature must not be absent, since it contains the
-                  minimum set of files to have working VirtualBox
-                  installation.
-                </para>
-              </note>
+              Main binaries of &product-name;.
             </para>
+
+            <note>
+              <para>
+                This feature must not be absent, since it contains the
+                minimum set of files to have working &product-name;
+                installation.
+              </para>
+            </note>
           </listitem>
         </varlistentry>
@@ -250,5 +249,5 @@
               <para>
                 Python version at least 2.6 is required. Since
-                VirtualBox 5.1, Python 3 is also supported.
+                &product-name; 5.1, Python 3 is also supported.
               </para>
             </note>
@@ -293,6 +292,6 @@
 
       <para>
-        As VirtualBox uses the standard Microsoft Windows installer,
-        VirtualBox can be safely uninstalled at any time. Click the
+        As &product-name; uses the standard Microsoft Windows installer,
+        &product-name; can be safely uninstalled at any time. Click the
         program entry in the <emphasis role="bold">Add/Remove
         Programs</emphasis> list in the Windows Control Panel.
@@ -317,5 +316,5 @@
 
       <para>
-        Public properties can be specified via MSI API, to control
+        Public properties can be specified with the MSI API, to control
         additional behavior and features of the Windows host installer.
         Use either of the following commands:
@@ -338,5 +337,5 @@
 
           <para>
-            Specifies whether or not a VirtualBox icon on the desktop
+            Specifies whether or not an &product-name; icon on the desktop
             should be created.
           </para>
@@ -354,5 +353,5 @@
 
           <para>
-            Specifies whether or not a VirtualBox icon in the Quick
+            Specifies whether or not an &product-name; icon in the Quick
             Launch Bar should be created.
           </para>
@@ -372,6 +371,6 @@
             Specifies whether or not the file extensions .vbox,
             .vbox-extpack, .ovf, .ova, .vdi, .vmdk, .vhd and .vdd should
-            be associated with VirtualBox. Files of these types then
-            will be opened with VirtualBox.
+            be associated with &product-name;. Files of these types then
+            will be opened with &product-name;.
           </para>
 
@@ -388,5 +387,5 @@
 
           <para>
-            Specifies whether or not VirtualBox should be started right
+            Specifies whether to start &product-name; right
             after successful installation.
           </para>
@@ -413,7 +412,7 @@
 
       <para>
-        For Mac OS X hosts, VirtualBox ships in a disk image
-        (<computeroutput>dmg</computeroutput>) file. Perform the
-        following steps to install on a Mac OS X host:
+        For Mac OS X hosts, &product-name; ships in a
+        <computeroutput>dmg</computeroutput> disk image file. Perform
+        the following steps to install on a Mac OS X host:
       </para>
 
@@ -437,6 +436,6 @@
         <listitem>
           <para>
-            This will start the installer, which allows you to select
-            where to install VirtualBox.
+            This will start the installer, which enables you to select
+            where to install &product-name;.
           </para>
         </listitem>
@@ -445,5 +444,5 @@
 
       <para>
-        After installation, you can find a VirtualBox icon in the
+        After installation, you can find an &product-name; icon in the
         "Applications" folder in the Finder.
       </para>
@@ -456,5 +455,5 @@
 
       <para>
-        To uninstall VirtualBox, open the disk image
+        To uninstall &product-name;, open the disk image
         <computeroutput>dmg</computeroutput> file and double-click on
         the uninstall icon shown.
@@ -468,12 +467,12 @@
 
       <para>
-        To perform a non-interactive installation of VirtualBox you can
+        To perform a non-interactive installation of &product-name; you can
         use the command line version of the installer application.
       </para>
 
       <para>
-        Mount the disk image (<computeroutput>dmg</computeroutput>)
-        file, as described in the installation procedure, or use the
-        following command line:
+        Mount the <computeroutput>dmg</computeroutput> disk image file,
+        as described in the installation procedure, or use the following
+        command line:
       </para>
 
@@ -507,5 +506,5 @@
         You will need to install the following packages on your Linux
         system before starting the installation. Some systems will do
-        this for you automatically when you install VirtualBox.
+        this for you automatically when you install &product-name;.
       </para>
 
@@ -514,11 +513,11 @@
         <listitem>
           <para>
-            Qt 5.3.2 or higher. Qt 5.6.2 or higher is recommended.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            SDL 1.2.7 or higher. This graphics library is typically
+            Qt 5.3.2 or later. Qt 5.6.2 or later is recommended.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            SDL 1.2.7 or later. This graphics library is typically
             called <computeroutput>libsdl</computeroutput> or similar.
           </para>
@@ -530,11 +529,9 @@
         <para>
           These packages are only required if you want to run the
-          VirtualBox graphical user interfaces. In particular,
+          &product-name; graphical user interfaces. In particular,
           <computeroutput>VirtualBox</computeroutput>, the graphical
-          VirtualBox manager, requires both Qt and SDL.
-          <computeroutput>VBoxSDL</computeroutput>, the simplified GUI,
-          requires only SDL. If you only want to run
-          <computeroutput>VBoxHeadless</computeroutput>, neither Qt nor
-          SDL are required.
+          VirtualBox Manager, requires both Qt and SDL.
+          If you only want to run <command>VBoxHeadless</command>,
+          neither Qt nor SDL are required.
         </para>
       </note>
@@ -544,9 +541,9 @@
     <sect2 id="externalkernelmodules">
 
-      <title>The VirtualBox Driver Modules</title>
+      <title>The &product-name; Driver Modules</title>
 
       <para>
         In order to run other operating systems in virtual machines
-        alongside your main operating system, VirtualBox needs to
+        alongside your main operating system, &product-name; needs to
         integrate very tightly into the system. To do this it installs a
         driver module called <computeroutput>vboxdrv</computeroutput>
@@ -554,5 +551,5 @@
         the part of the operating system which controls your processor
         and physical hardware. Without this kernel module, you can still
-        use the VirtualBox manager to configure virtual machines, but
+        use the VirtualBox Manager to configure virtual machines, but
         they will not start. It also installs network drivers called
         <computeroutput>vboxnetflt</computeroutput> and
@@ -577,9 +574,9 @@
         list includes some instructions for common distributions. For
         most of them you may want to start by finding the version name
-        of your kernel, using the command <computeroutput>uname
-        -r</computeroutput> in a terminal. The instructions assume that
-        you have not changed too much from the original installation,
-        particularly not installed a different kernel type. If you have,
-        then you will need to determine yourself what to set up.
+        of your kernel, using the command <command>uname -r</command> in
+        a terminal. The instructions assume that you have not changed
+        too much from the original installation, particularly not
+        installed a different kernel type. If you have, then you will
+        need to determine yourself what to set up.
       </para>
 
@@ -642,16 +639,16 @@
 
       <para>
-        VirtualBox is available in a number of package formats native to
-        various common Linux distributions> See
-        <xref linkend="hostossupport" />. In addition, there is an
+        &product-name; is available in a number of package formats native to
+        various common Linux distributions. See
+        <xref linkend="hostossupport"/>. In addition, there is an
         alternative generic installer (.run) which should work on most
         Linux distributions. The generic installer packages are built on
-        EL5 systems and thus require reasonably old versions of glibc
-        (version 2.5) and other system libraries.
+        EL5 systems and thus require reasonably old versions of glibc,
+        such as version 2.5, and other system libraries.
       </para>
 
       <sect3 id="install-linux-debian-ubuntu">
 
-        <title>Installing VirtualBox from a Debian/Ubuntu Package</title>
+        <title>Installing &product-name; from a Debian/Ubuntu Package</title>
 
         <para>
@@ -693,9 +690,9 @@
 
         <para>
-          Once VirtualBox has been successfully installed and
+          Once &product-name; has been successfully installed and
           configured, you can start it by clicking
-          <emphasis role="bold">VirtualBox</emphasis> in your Start menu
-          or from the command line. See
-          <xref linkend="startingvboxonlinux" />.
+          <emphasis role="bold">VirtualBox</emphasis> in your
+          <emphasis role="bold">Start</emphasis> menu or from the
+          command line. See <xref linkend="startingvboxonlinux" />.
         </para>
 
@@ -715,9 +712,7 @@
           <listitem>
             <para>
-              Unpacks the application files to the target directory,
-
-<screen>/opt/VirtualBox/</screen>
-
-              which cannot be changed.
+              Unpacks the application files to the target directory
+              <computeroutput>/opt/VirtualBox/</computeroutput>, which
+              cannot be changed.
             </para>
           </listitem>
@@ -725,5 +720,5 @@
           <listitem>
             <para>
-              Builds and installs the VirtualBox kernel modules:
+              Builds and installs the &product-name; kernel modules:
               <computeroutput>vboxdrv</computeroutput>,
               <computeroutput>vboxnetflt</computeroutput>, and
@@ -735,5 +730,5 @@
             <para>
               Creates <computeroutput>/sbin/rcvboxdrv</computeroutput>,
-              an init script to start the VirtualBox kernel module.
+              an init script to start the &product-name; kernel module.
             </para>
           </listitem>
@@ -753,9 +748,8 @@
               <computeroutput>/opt/VirtualBox/VBox</computeroutput>
               which does some sanity checks and dispatches to the actual
-              executables: <computeroutput>VirtualBox</computeroutput>,
-              <computeroutput>VBoxSDL</computeroutput>,
-              <computeroutput>VBoxVRDP</computeroutput>,
-              <computeroutput>VBoxHeadless</computeroutput> and
-              <computeroutput>VBoxManage</computeroutput>
+              executables: <command>VirtualBox</command>,
+              <command>VBoxVRDP</command>,
+              <command>VBoxHeadless</command> and
+              <command>VBoxManage</command>.
             </para>
           </listitem>
@@ -784,5 +778,5 @@
           <computeroutput>install</computeroutput> or
           <computeroutput>uninstall</computeroutput> as the first
-          parameter. For example;
+          parameter. For example:
         </para>
 
@@ -790,10 +784,9 @@
 
         <para>
-          Or if you do not have the
-          <computeroutput>sudo</computeroutput> command available, run
-          the following as root instead:
+          Or if you do not have the <command>sudo</command> command
+          available, run the following as root instead:
+        </para>
 
 <screen>./VirtualBox.run install</screen>
-        </para>
 
         <para>
@@ -808,13 +801,12 @@
         <note>
           <para>
-            The <computeroutput>usermod</computeroutput> command of some
-            older Linux distributions does not support the
-            <computeroutput>-a</computeroutput> option, which adds the
-            user to the given group without affecting membership of
-            other groups. In this case, find out the current group
-            memberships with the <computeroutput>groups</computeroutput>
-            command and add all these groups in a comma-separated list
-            to the command line after the
-            <computeroutput>-G</computeroutput> option. For example:
+            The <command>usermod</command> command of some older Linux
+            distributions does not support the <option>-a</option>
+            option, which adds the user to the given group without
+            affecting membership of other groups. In this case, find out
+            the current group memberships with the
+            <command>groups</command> command and add all these groups
+            in a comma-separated list to the command line after the
+            <option>-G</option> option. For example:
             <computeroutput>usermod -G group1,group2,vboxusers
             username</computeroutput>.
@@ -831,5 +823,5 @@
           If you cannot use the shell script installer described in
           <xref linkend="install-linux-alt-installer"/>, you can perform
-          a manual installation. Invoke the installer as follows:
+          a manual installation. Run the installer as follows:
         </para>
 
@@ -839,5 +831,5 @@
           This will unpack all the files needed for installation in the
           directory <computeroutput>install</computeroutput> under the
-          current directory. The VirtualBox application files are
+          current directory. The &product-name; application files are
           contained in
           <computeroutput>VirtualBox.tar.bz2</computeroutput> which you
@@ -849,14 +841,14 @@
 
         <para>
-          or as root:
+          To run the same example as root, use the following commands:
+        </para>
 
 <screen>mkdir /opt/VirtualBox
 tar jxf ./install/VirtualBox.tar.bz2 -C /opt/VirtualBox</screen>
-        </para>
-
-        <para>
-          The sources for VirtualBox's kernel module are provided in the
+
+        <para>
+          The sources for &product-name;'s kernel module are provided in the
           <computeroutput>src</computeroutput> directory. To build the
-          module, change to the directory and issue
+          module, change to the directory and use the following command:
         </para>
 
@@ -864,5 +856,5 @@
 
         <para>
-          If everything builds correctly, issue the following command to
+          If everything builds correctly, run the following command to
           install the module to the appropriate module directory:
         </para>
@@ -873,17 +865,16 @@
           In case you do not have sudo, switch the user account to root
           and run the following command:
+        </para>
 
 <screen>make install</screen>
-        </para>
-
-        <para>
-          The VirtualBox kernel module needs a device node to operate.
-          The above make command will tell you how to create the device
-          node, depending on your Linux system. The procedure is
-          slightly different for a classical Linux setup with a
-          <computeroutput>/dev</computeroutput> directory, a system with
-          the now deprecated <computeroutput>devfs</computeroutput> and
-          a modern Linux system with
-          <computeroutput>udev</computeroutput>.
+
+        <para>
+          The &product-name; kernel module needs a device node to operate.
+          The above <command>make</command> command will tell you how to
+          create the device node, depending on your Linux system. The
+          procedure is slightly different for a classical Linux setup
+          with a <computeroutput>/dev</computeroutput> directory, a
+          system with the now deprecated <command>devfs</command> and a
+          modern Linux system with <command>udev</command>.
         </para>
 
@@ -906,14 +897,21 @@
           kernel module and activate the initialization script using the
           right method for your distribution, as follows:
+        </para>
 
 <screen>cp /opt/VirtualBox/vboxdrv.sh /sbin/rcvboxdrv</screen>
 
-          This example assumes you installed VirtualBox to the
+        <para>
+          This example assumes you installed &product-name; to the
           <computeroutput>/opt/VirtualBox</computeroutput> directory.
-          Create a configuration file for VitrualBox:
+        </para>
+
+        <para>
+          Create a configuration file for &product-name;, as follows:
+        </para>
 
 <screen>mkdir /etc/vbox
 echo INSTALL_DIR=/opt/VirtualBox &gt; /etc/vbox/vbox.cfg</screen>
 
+        <para>
           Create the following symbolic links:
         </para>
@@ -921,6 +919,5 @@
 <screen>ln -sf /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
 ln -sf /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage
-ln -sf /opt/VirtualBox/VBox.sh /usr/bin/VBoxHeadless
-ln -sf /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL</screen>
+ln -sf /opt/VirtualBox/VBox.sh /usr/bin/VBoxHeadless</screen>
 
       </sect3>
@@ -928,25 +925,30 @@
       <sect3 id="install-linux-update-uninstall">
 
-        <title>Updating and Uninstalling VirtualBox</title>
-
-        <para>
-          Before updating or uninstalling VirtualBox, you must terminate
+        <title>Updating and Uninstalling &product-name;</title>
+
+        <para>
+          Before updating or uninstalling &product-name;, you must terminate
           any virtual machines which are currently running and exit the
-          VirtualBox or VBoxSVC applications. To update VirtualBox,
+          &product-name; or VBoxSVC applications. To update &product-name;,
           simply run the installer of the updated version. To uninstall
-          VirtualBox, invoke the installer like this:
+          &product-name;, run the installer as follows:
+        </para>
 
 <screen>sudo ./VirtualBox.run uninstall</screen>
 
-          or as root:
+        <para>
+          As root, you can use the following command:
+        </para>
 
 <screen>./VirtualBox.run uninstall</screen>
 
-          Starting with version 2.2.2, you can uninstall the .run
-          package as follows:
+        <para>
+          You can uninstall the .run package as follows:
+        </para>
 
 <screen>/opt/VirtualBox/uninstall.sh</screen>
 
-          To manually uninstall VirtualBox, simply perform the manual
+        <para>
+          To manually uninstall &product-name;, perform the manual
           installation steps in reverse order.
         </para>
@@ -965,17 +967,19 @@
           <computeroutput>vboxconf</computeroutput> can contain the
           following debconf settings:
+        </para>
 
 <screen>virtualbox virtualbox/module-compilation-allowed boolean true
 virtualbox virtualbox/delete-old-modules boolean true</screen>
 
-          The first line allows compilation of the vboxdrv kernel module
-          if no module was found for the current kernel. The second line
-          allows the package to delete any old vboxdrv kernel modules
-          compiled by previous installations.
+        <para>
+          The first line enables compilation of the vboxdrv kernel
+          module if no module was found for the current kernel. The
+          second line enables the package to delete any old vboxdrv
+          kernel modules compiled by previous installations.
         </para>
 
         <para>
           These default settings can be applied prior to the
-          installation of the VirtualBox Debian package, as follows:
+          installation of the &product-name; Debian package, as follows:
         </para>
 
@@ -1000,5 +1004,5 @@
           <xref
         linkend="linux_install_opts" /> for how to set
-          some common installation options provided by VirtualBox.
+          some common installation options provided by &product-name;.
         </para>
 
@@ -1013,14 +1017,18 @@
           packages, you can create a response file named
           <computeroutput>/etc/default/virtualbox</computeroutput>. The
-          automatic generation of the udev rule can be prevented by the
-          following setting:
+          automatic generation of the udev rule can be prevented with
+          the following setting:
+        </para>
 
 <screen>INSTALL_NO_UDEV=1</screen>
 
+        <para>
           The creation of the group vboxusers can be prevented as
           follows:
+        </para>
 
 <screen>INSTALL_NO_GROUP=1</screen>
 
+        <para>
           If the following line is specified, the package installer will
           not try to build the <computeroutput>vboxdrv</computeroutput>
@@ -1042,5 +1050,5 @@
         The Linux installers create the system user group
         <computeroutput>vboxusers</computeroutput> during installation.
-        Any system user who is going to use USB devices from VirtualBox
+        Any system user who is going to use USB devices from &product-name;
         guests must be a member of that group. A user can be made a
         member of the group <computeroutput>vboxusers</computeroutput>
@@ -1055,28 +1063,25 @@
     <sect2 id="startingvboxonlinux">
 
-      <title>Starting VirtualBox on Linux</title>
-
-      <para>
-        The easiest way to start a VirtualBox program is by running the
-        program of your choice
-        (<computeroutput>VirtualBox</computeroutput>,
-        <computeroutput>VBoxManage</computeroutput>,
-        <computeroutput>VBoxSDL</computeroutput>, or
-        <computeroutput>VBoxHeadless</computeroutput>) from a terminal.
-        These are symbolic links to
-        <computeroutput>VBox.sh</computeroutput> that start the required
-        program for you.
+      <title>Starting &product-name; on Linux</title>
+
+      <para>
+        The easiest way to start a &product-name; program is by running the
+        program of your choice (<command>VirtualBox</command>,
+        <command>VBoxManage</command>, or
+        <command>VBoxHeadless</command>) from a terminal. These are
+        symbolic links to <command>VBox.sh</command> that start the
+        required program for you.
       </para>
 
       <para>
         The following detailed instructions should only be of interest
-        if you wish to execute VirtualBox without installing it first.
+        if you wish to execute &product-name; without installing it first.
         You should start by compiling the
         <computeroutput>vboxdrv</computeroutput> kernel module and
-        inserting it into the Linux kernel. VirtualBox consists of a
+        inserting it into the Linux kernel. &product-name; consists of a
         service daemon, <computeroutput>VBoxSVC</computeroutput>, and
         several application programs. The daemon is automatically
-        started if necessary. All VirtualBox applications will
-        communicate with the daemon through Unix local domain sockets.
+        started if necessary. All &product-name; applications will
+        communicate with the daemon through UNIX local domain sockets.
         There can be multiple daemon instances under different user
         accounts and applications can only communicate with the daemon
@@ -1090,10 +1095,8 @@
 
       <para>
-        All VirtualBox applications
-        (<computeroutput>VirtualBox</computeroutput>,
-        <computeroutput>VBoxSDL</computeroutput>,
-        <computeroutput>VBoxManage</computeroutput>, and
-        <computeroutput>VBoxHeadless</computeroutput>) require the
-        VirtualBox directory to be in the library path, as follows:
+        All &product-name; applications (<command>VirtualBox</command>,
+        <command>VBoxManage</command>, and
+        <command>VBoxHeadless</command>) require the &product-name;
+        directory to be in the library path, as follows:
       </para>
 
@@ -1106,8 +1109,8 @@
   <sect1 id="install-solaris-host">
 
-    <title>Installing on Solaris Hosts</title>
+    <title>Installing on Oracle Solaris Hosts</title>
 
     <para>
-      For the specific versions of Solaris that are supported as host
+      For the specific versions of Oracle Solaris that are supported as host
       operating systems, see <xref
     linkend="hostossupport" />.
@@ -1115,6 +1118,6 @@
 
     <para>
-      If you have a previously installed instance of VirtualBox on your
-      Solaris host, please uninstall it first before installing a new
+      If you have a previously installed instance of &product-name; on your
+      Oracle Solaris host, please uninstall it first before installing a new
       instance. See <xref linkend="uninstall-solaris-host" /> for
       uninstall instructions.
@@ -1126,12 +1129,12 @@
 
       <para>
-        VirtualBox is available as a standard Solaris package. Download
-        the VirtualBox SunOS package which includes the 64-bit versions
-        of VirtualBox. <emphasis>The installation must be performed as
-        root and from the global zone</emphasis> as the VirtualBox
+        &product-name; is available as a standard Oracle Solaris package. Download
+        the &product-name; SunOS package which includes the 64-bit versions
+        of &product-name;. <emphasis>The installation must be performed as
+        root and from the global zone</emphasis> as the &product-name;
         installer loads kernel drivers which cannot be done from
         non-global zones. To verify which zone you are currently in,
-        execute the <computeroutput>zonename</computeroutput> command.
-        Execute the following commands:
+        execute the <command>zonename</command> command. Execute the
+        following commands:
       </para>
 
@@ -1139,7 +1142,7 @@
 
       <para>
-        Starting with VirtualBox 3.1 the VirtualBox kernel package is no
-        longer a separate package and has been integrated into the main
-        package. Install the VirtualBox package as follows:
+        The &product-name; kernel package is no longer a separate package
+        and has been integrated into the main package. Install the
+        &product-name; package as follows:
       </para>
 
@@ -1153,6 +1156,6 @@
         script to be executed. Choose <emphasis role="bold">y</emphasis>
         and proceed, as it is essential to execute this script which
-        installs the VirtualBox kernel module. Following this
-        confirmation the installer will install VirtualBox and execute
+        installs the &product-name; kernel module. Following this
+        confirmation the installer will install &product-name; and execute
         the postinstall setup script.
       </para>
@@ -1162,5 +1165,5 @@
         is now complete. You may now safely delete the uncompressed
         package and <computeroutput>autoresponse</computeroutput> files
-        from your system. VirtualBox is installed in
+        from your system. &product-name; is installed in
         <computeroutput>/opt/VirtualBox</computeroutput>.
       </para>
@@ -1168,5 +1171,5 @@
       <note>
         <para>
-          If you need to use VirtualBox from non-global zones, see
+          If you need to use &product-name; from non-global zones, see
           <xref linkend="solaris-zones" />.
         </para>
@@ -1180,12 +1183,11 @@
 
       <para>
-        Starting with VirtualBox 4.1, the installer creates the system
-        user group <computeroutput>vboxuser</computeroutput> during
-        installation for Solaris hosts that support the USB features
-        required by VirtualBox. Any system user who is going to use USB
-        devices from VirtualBox guests must be a member of this group. A
-        user can be made a member of this group through the GUI
-        user/group management or at the command line by executing as
-        root:
+        The installer creates the system user group
+        <computeroutput>vboxuser</computeroutput> during installation
+        for Oracle Solaris hosts that support the USB features required by
+        &product-name;. Any system user who is going to use USB devices from
+        &product-name; guests must be a member of this group. A user can be
+        made a member of this group through the GUI user/group
+        management or at the command line by executing as root:
       </para>
 
@@ -1202,16 +1204,13 @@
     <sect2 id="install-solaris-starting">
 
-      <title>Starting VirtualBox on Solaris</title>
-
-      <para>
-        The easiest way to start a VirtualBox program is by running the
-        program of your choice
-        (<computeroutput>VirtualBox</computeroutput>,
-        <computeroutput>VBoxManage</computeroutput>,
-        <computeroutput>VBoxSDL</computeroutput>, or
-        <computeroutput>VBoxHeadless</computeroutput>) from a terminal.
-        These are symbolic links to
-        <computeroutput>VBox.sh</computeroutput> that start the required
-        program for you.
+      <title>Starting &product-name; on Oracle Solaris</title>
+
+      <para>
+        The easiest way to start a &product-name; program is by running the
+        program of your choice (<command>VirtualBox</command>,
+        <command>VBoxManage</command>, or
+        <command>VBoxHeadless</command>) from a terminal. These are
+        symbolic links to <command>VBox.sh</command> that start the
+        required program for you.
       </para>
 
@@ -1219,5 +1218,5 @@
         Alternatively, you can directly invoke the required programs
         from <computeroutput>/opt/VirtualBox</computeroutput>. Using the
-        links provided is easier as you do not have to type the full
+        links provided is easier as you do not have to enter the full
         path.
       </para>
@@ -1225,7 +1224,6 @@
       <para>
         You can configure some elements of the
-        <computeroutput>VirtualBox</computeroutput> Qt GUI, such as
-        fonts and colours, by running
-        <computeroutput>VBoxQtconfig</computeroutput> from the terminal.
+        <command>VirtualBox</command> Qt GUI, such as fonts and colours,
+        by running <command>VBoxQtconfig</command> from the terminal.
       </para>
 
@@ -1237,5 +1235,5 @@
 
       <para>
-        Uninstallation of VirtualBox on Solaris requires root
+        Uninstallation of &product-name; on Oracle Solaris requires root
         permissions. To perform the uninstallation, start a root
         terminal session and run the following command:
@@ -1245,17 +1243,15 @@
 
       <para>
-        After confirmation, this will remove VirtualBox from your
+        After confirmation, this will remove &product-name; from your
         system.
       </para>
 
       <para>
-        If you are uninstalling VirtualBox version 3.0 or lower, you
-        need to remove the VirtualBox kernel interface package, as
+        If you are uninstalling &product-name; version 3.0 or lower, you
+        need to remove the &product-name; kernel interface package, as
         follows:
       </para>
 
-      <para>
 <screen>pkgrm SUNWvboxkern</screen>
-      </para>
 
     </sect2>
@@ -1266,5 +1262,5 @@
 
       <para>
-        To perform a non-interactive installation of VirtualBox there is
+        To perform a non-interactive installation of &product-name; there is
         a response file named
         <computeroutput>autoresponse</computeroutput>, that the
@@ -1292,9 +1288,9 @@
     <sect2 id="solaris-zones">
 
-      <title>Configuring a Zone for Running VirtualBox</title>
-
-      <para>
-        Assuming that VirtualBox has already been installed into your
-        zone, you need to give the zone access to VirtualBox's device
+      <title>Configuring a Zone for Running &product-name;</title>
+
+      <para>
+        Assuming that &product-name; has already been installed into your
+        zone, you need to give the zone access to &product-name;'s device
         node. This is done by performing the following steps. Start a
         root terminal and run the following command:
@@ -1305,5 +1301,5 @@
       <para>
         Replace "vboxzone" with the name of the zone where you intend to
-        run VirtualBox.
+        run &product-name;.
       </para>
 
@@ -1324,8 +1320,8 @@
 
       <para>
-        If you are running VirtualBox 2.2.0 or above on Solaris 11 or
+        If you are running &product-name; 2.2.0 or above on Oracle Solaris 11 or
         above, you may also add a device for
         <computeroutput>/dev/vboxusbmon</computeroutput>, similar to
-        that shown above. This does not apply to Solaris 10 hosts, due
+        that shown above. This does not apply to Oracle Solaris 10 hosts, due
         to lack of USB support.
       </para>
@@ -1349,5 +1345,5 @@
       <para>
         Reboot the zone using <computeroutput>zoneadm</computeroutput>
-        and you should be able to run VirtualBox from within the
+        and you should be able to run &product-name; from within the
         configured zone.
       </para>
Index: trunk/doc/manual/en_US/user_Introduction.xml
===================================================================
--- trunk/doc/manual/en_US/user_Introduction.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_Introduction.xml	(revision 76078)
@@ -10,55 +10,57 @@
 
   <para>
-    Welcome to Oracle VM VirtualBox.
+    Welcome to &product-name;.
   </para>
 
   <para>
-    VirtualBox is a cross-platform virtualization application. What does
-    that mean? For one thing, it installs on your existing Intel or
+    &product-name; is a cross-platform virtualization application. What
+    does that mean? For one thing, it installs on your existing Intel or
     AMD-based computers, whether they are running Windows, Mac, Linux or
-    Solaris operating systems. Secondly, it extends the capabilities of
-    your existing computer so that it can run multiple operating
-    systems, inside multiple virtual machines, at the same time. So, for
-    example, you can run Windows and Linux on your Mac, run Windows
-    Server 2008 on your Linux server, run Linux on your Windows PC, and
-    so on, all alongside your existing applications. You can install and
-    run as many virtual machines as you like. The only practical limits
-    are disk space and memory.
+    Oracle Solaris operating systems. Secondly, it extends the
+    capabilities of your existing computer so that it can run multiple
+    operating systems, inside multiple virtual machines, at the same
+    time. So, for example, you can run Windows and Linux on your Mac,
+    run Windows Server 2008 on your Linux server, run Linux on your
+    Windows PC, and so on, all alongside your existing applications. You
+    can install and run as many virtual machines as you like. The only
+    practical limits are disk space and memory.
   </para>
 
   <para>
-    VirtualBox is deceptively simple yet also very powerful. It can run
-    everywhere from small embedded systems or desktop class machines all
-    the way up to datacenter deployments and even Cloud environments.
+    &product-name; is deceptively simple yet also very powerful. It can
+    run everywhere from small embedded systems or desktop class machines
+    all the way up to datacenter deployments and even Cloud
+    environments.
   </para>
 
   <para>
-    The following screenshot shows how VirtualBox, installed on a Mac
-    computer, is running Windows 8 in a virtual machine window:
+    The following screenshot shows how &product-name;, installed on a
+    Mac computer, is running Windows 8 in a virtual machine window:
   </para>
 
-  <mediaobject>
-    <imageobject>
-      <imagedata align="center" fileref="images/vm-vista-running.png"
+  <figure id="fig-win8-intro">
+    <title>Windows 8 Virtual Machine, Displayed on a Mac OS X Host</title>
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="images/vm-vista-running.png"
                    width="14cm" />
-    </imageobject>
-  </mediaobject>
+      </imageobject>
+    </mediaobject>
+  </figure>
 
   <para>
     In this User Manual, we will begin simply with a quick introduction
     to virtualization and how to get your first virtual machine running
-    with the easy-to-use VirtualBox graphical user interface. Subsequent
-    chapters will go into much more detail covering more powerful tools
-    and features, but fortunately, it is not necessary to read the
-    entire User Manual before you can use VirtualBox.
+    with the easy-to-use &product-name; graphical user interface.
+    Subsequent chapters will go into much more detail covering more
+    powerful tools and features, but fortunately, it is not necessary to
+    read the entire User Manual before you can use &product-name;.
   </para>
 
   <para>
-    You can find a summary of VirtualBox's capabilities in
-    <xref
-  linkend="features-overview" />. For existing VirtualBox
-    users who just want to see what is new in this release, there is a
-    detailed list in <xref
-  linkend="ChangeLog" />.
+    You can find a summary of &product-name;'s capabilities in
+    <xref linkend="features-overview" />. For existing &product-name;
+    users who just want to find out what is new in this release, see the
+    <emphasis>&product-name; Release Notes</emphasis>.
   </para>
 
@@ -68,6 +70,6 @@
 
     <para>
-      The techniques and features that VirtualBox provides are useful in
-      the following scenarios:
+      The techniques and features that &product-name; provides are
+      useful in the following scenarios:
     </para>
 
@@ -77,13 +79,13 @@
         <para>
           <emphasis role="bold">Running multiple operating systems
-          simultaneously.</emphasis> VirtualBox allows you to run more
-          than one operating system at a time. This way, you can run
-          software written for one operating system on another, such as
-          Windows software on Linux or a Mac, without having to reboot
-          to use it. Since you can configure what kinds of "virtual"
-          hardware should be presented to each such operating system,
-          you can install an old operating system such as DOS or OS/2
-          even if your real computer's hardware is no longer supported
-          by that operating system.
+          simultaneously.</emphasis> &product-name; enables you to run
+          more than one operating system at a time. This way, you can
+          run software written for one operating system on another, such
+          as Windows software on Linux or a Mac, without having to
+          reboot to use it. Since you can configure what kinds of
+          <emphasis>virtual</emphasis> hardware should be presented to
+          each such operating system, you can install an old operating
+          system such as DOS or OS/2 even if your real computer's
+          hardware is no longer supported by that operating system.
         </para>
       </listitem>
@@ -95,8 +97,9 @@
           machines to ship entire software configurations. For example,
           installing a complete mail server solution on a real machine
-          can be a tedious task. With VirtualBox, such a complex setup,
-          often called an "appliance", can be packed into a virtual
-          machine. Installing and running a mail server becomes as easy
-          as importing such an appliance into VirtualBox.
+          can be a tedious task. With &product-name;, such a complex
+          setup, often called an <emphasis>appliance</emphasis>, can be
+          packed into a virtual machine. Installing and running a mail
+          server becomes as easy as importing such an appliance into
+          &product-name;.
         </para>
       </listitem>
@@ -106,18 +109,18 @@
           <emphasis role="bold">Testing and disaster
           recovery.</emphasis> Once installed, a virtual machine and its
-          virtual hard disks can be considered a "container" that can be
-          arbitrarily frozen, woken up, copied, backed up, and
-          transported between hosts.
-        </para>
-
-        <para>
-          On top of that, with the use of another VirtualBox feature
-          called "snapshots", one can save a particular state of a
-          virtual machine and revert back to that state, if necessary.
-          This way, one can freely experiment with a computing
-          environment. If something goes wrong , such as prolems after
-          installing software or infecting the guest with a virus, you
-          can easily switch back to a previous snapshot and avoid the
-          need of frequent backups and restores.
+          virtual hard disks can be considered a
+          <emphasis>container</emphasis> that can be arbitrarily frozen,
+          woken up, copied, backed up, and transported between hosts.
+        </para>
+
+        <para>
+          On top of that, with the use of another &product-name; feature
+          called <emphasis>snapshots</emphasis>, one can save a
+          particular state of a virtual machine and revert back to that
+          state, if necessary. This way, one can freely experiment with
+          a computing environment. If something goes wrong, such as
+          prolems after installing software or infecting the guest with
+          a virus, you can easily switch back to a previous snapshot and
+          avoid the need of frequent backups and restores.
         </para>
 
@@ -164,11 +167,11 @@
           <emphasis role="strong">Host operating system (host
           OS).</emphasis> This is the operating system of the physical
-          computer on which VirtualBox was installed. There are versions
-          of VirtualBox for Windows, Mac OS X, Linux and Solaris hosts.
-          See <xref linkend="hostossupport" />.
-        </para>
-
-        <para>
-          Most of the time, this manual discusses all VirtualBox
+          computer on which &product-name; was installed. There are
+          versions of &product-name; for Windows, Mac OS X, Linux, and
+          Oracle Solaris hosts. See <xref linkend="hostossupport" />.
+        </para>
+
+        <para>
+          Most of the time, this manual discusses all &product-name;
           versions together. There may be platform-specific differences
           which we will point out where appropriate.
@@ -180,10 +183,10 @@
           <emphasis role="strong"> Guest operating system (guest
           OS).</emphasis> This is the operating system that is running
-          inside the virtual machine. Theoretically, VirtualBox can run
-          any x86 operating system. such as DOS, Windows, OS/2, FreeBSD,
-          and OpenBSD. But to achieve near-native performance of the
-          guest code on your machine, we had to go through a lot of
-          optimizations that are specific to certain operating systems.
-          So while your favorite operating system
+          inside the virtual machine. Theoretically, &product-name; can
+          run any x86 operating system. such as DOS, Windows, OS/2,
+          FreeBSD, and OpenBSD. But to achieve near-native performance
+          of the guest code on your machine, we had to go through a lot
+          of optimizations that are specific to certain operating
+          systems. So while your favorite operating system
           <emphasis>may</emphasis> run as a guest, we officially support
           and optimize for a select few, which include the most common
@@ -199,25 +202,26 @@
         <para>
           <emphasis role="strong">Virtual machine (VM).</emphasis> This
-          is the special environment that VirtualBox creates for your
-          guest operating system while it is running. In other words,
-          you run your guest operating system "in" a VM. Normally, a VM
-          will be shown as a window on your computer's desktop, but
-          depending on which of the various frontends of VirtualBox you
-          use, it can be displayed in full screen mode or remotely on
-          another computer.
-        </para>
-
-        <para>
-          In a more abstract way, internally, VirtualBox thinks of a VM
-          as a set of parameters that determine its behavior. They
+          is the special environment that &product-name; creates for
+          your guest operating system while it is running. In other
+          words, you run your guest operating system
+          <emphasis>in</emphasis> a VM. Normally, a VM will be shown as
+          a window on your computer's desktop, but depending on which of
+          the various frontends of &product-name; you use, it can be
+          displayed in full screen mode or remotely on another computer.
+        </para>
+
+        <para>
+          In a more abstract way, internally, &product-name; thinks of a
+          VM as a set of parameters that determine its behavior. They
           include hardware settings, such as: how much memory the VM
-          should have, what hard disks VirtualBox should virtualize
+          should have, what hard disks &product-name; should virtualize
           through which container files, what CDs are mounted. They also
           include state information, such as: whether the VM is
           currently running, saved, if the VM has snapshots. These
-          settings are mirrored in the VirtualBox Manager window as well
-          as the <computeroutput>VBoxManage</computeroutput> command
-          line program. See <xref linkend="vboxmanage" />. In other
-          words, a VM is also what you can see in its settings dialog.
+          settings are mirrored in the VirtualBox Manager window, as
+          well as the <command>VBoxManage</command> command. See
+          <xref linkend="vboxmanage" />. In other words, a VM is also
+          what you can see in its
+          <emphasis role="bold">Settings</emphasis> dialog.
         </para>
       </listitem>
@@ -227,9 +231,8 @@
           <emphasis role="strong">Guest Additions.</emphasis> This
           refers to special software packages which are shipped with
-          VirtualBox but designed to be installed
+          &product-name; but designed to be installed
           <emphasis>inside</emphasis> a VM to improve performance of the
           guest OS and to add extra features. See
-          <xref
-          linkend="guestadditions" />.
+          <xref linkend="guestadditions" />.
         </para>
       </listitem>
@@ -244,5 +247,6 @@
 
     <para>
-      The following is a brief outline of VirtualBox's main features:
+      The following is a brief outline of &product-name;'s main
+      features:
     </para>
 
@@ -251,15 +255,15 @@
       <listitem>
         <para>
-          <emphasis role="bold">Portability.</emphasis> VirtualBox runs
-          on a large number of 32-bit and 64-bit host operating systems
-          See <xref linkend="hostossupport" />.
-        </para>
-
-        <para>
-          VirtualBox is a so-called <emphasis>hosted</emphasis>
+          <emphasis role="bold">Portability.</emphasis> &product-name;
+          runs on a large number of 32-bit and 64-bit host operating
+          systems See <xref linkend="hostossupport" />.
+        </para>
+
+        <para>
+          &product-name; is a so-called <emphasis>hosted</emphasis>
           hypervisor, sometimes referred to as a <emphasis>type
           2</emphasis> hypervisor. Whereas a
           <emphasis>bare-metal</emphasis> or <emphasis>type 1</emphasis>
-          hypervisor would run directly on the hardware, VirtualBox
+          hypervisor would run directly on the hardware, &product-name;
           requires an existing operating system to be installed. It can
           thus run alongside existing applications on that host.
@@ -267,9 +271,9 @@
 
         <para>
-          To a very large degree, VirtualBox is functionally identical
-          on all of the host platforms, and the same file and image
-          formats are used. This allows you to run virtual machines
-          created on one host on another host with a different host
-          operating system. For example, you can create a virtual
+          To a very large degree, &product-name; is functionally
+          identical on all of the host platforms, and the same file and
+          image formats are used. This enables you to run virtual
+          machines created on one host on another host with a different
+          host operating system. For example, you can create a virtual
           machine on Windows and then run it under Linux.
         </para>
@@ -280,6 +284,5 @@
           industry standard created for this purpose. You can even
           import OVFs that were created with a different virtualization
-          software. See <xref
-            linkend="ovf" />.
+          software. See <xref linkend="ovf" />.
         </para>
       </listitem>
@@ -288,10 +291,10 @@
         <para>
           <emphasis role="bold">No hardware virtualization
-          required.</emphasis> For many scenarios, VirtualBox does not
-          require the processor features built into newer hardware like
-          Intel VT-x or AMD-V. As opposed to many other virtualization
-          solutions, you can therefore use VirtualBox even on older
-          hardware where these features are not present. See
-          <xref
+          required.</emphasis> For many scenarios, &product-name; does
+          not require the processor features built into newer hardware
+          like Intel VT-x or AMD-V. As opposed to many other
+          virtualization solutions, you can therefore use &product-name;
+          even on older hardware where these features are not present.
+          See <xref
         linkend="hwvirt" />.
         </para>
@@ -301,14 +304,13 @@
         <para>
           <emphasis role="bold">Guest Additions: shared folders,
-          seamless windows, 3D virtualization.</emphasis> The VirtualBox
-          Guest Additions are software packages which can be installed
-          <emphasis>inside</emphasis> of supported guest systems to
-          improve their performance and to provide additional
+          seamless windows, 3D virtualization.</emphasis> The
+          &product-name; Guest Additions are software packages which can
+          be installed <emphasis>inside</emphasis> of supported guest
+          systems to improve their performance and to provide additional
           integration and communication with the host system. After
           installing the Guest Additions, a virtual machine will support
           automatic adjustment of video resolutions, seamless windows,
           accelerated 3D graphics and more. See
-          <xref
-        linkend="guestadditions" />.
+          <xref linkend="guestadditions" />.
         </para>
 
@@ -316,6 +318,5 @@
           In particular, Guest Additions provide for "shared folders",
           which let you access files from the host system from within a
-          guest machine. See <xref
-        linkend="sharedfolders" />.
+          guest machine. See <xref linkend="sharedfolders" />.
         </para>
       </listitem>
@@ -324,5 +325,5 @@
         <para>
           <emphasis role="bold">Great hardware support.</emphasis> Among
-          others, VirtualBox supports the following:
+          others, &product-name; supports the following:
         </para>
 
@@ -332,7 +333,7 @@
             <para>
               <emphasis role="bold">Guest multiprocessing
-              (SMP).</emphasis> VirtualBox can present up to 32 virtual
-              CPUs to each virtual machine, irrespective of how many CPU
-              cores are physically present on your host.
+              (SMP).</emphasis> &product-name; can present up to 32
+              virtual CPUs to each virtual machine, irrespective of how
+              many CPU cores are physically present on your host.
             </para>
           </listitem>
@@ -341,9 +342,9 @@
             <para>
               <emphasis role="bold">USB device support.</emphasis>
-              VirtualBox implements a virtual USB controller and allows
-              you to connect arbitrary USB devices to your virtual
-              machines without having to install device-specific drivers
-              on the host. USB support is not limited to certain device
-              categories. See <xref linkend="settings-usb" />.
+              &product-name; implements a virtual USB controller and
+              enables you to connect arbitrary USB devices to your
+              virtual machines without having to install device-specific
+              drivers on the host. USB support is not limited to certain
+              device categories. See <xref linkend="settings-usb" />.
             </para>
           </listitem>
@@ -352,14 +353,14 @@
             <para>
               <emphasis role="bold">Hardware compatibility.</emphasis>
-              VirtualBox virtualizes a vast array of virtual devices,
-              among them many devices that are typically provided by
-              other virtualization platforms. That includes IDE, SCSI
-              and SATA hard disk controllers, several virtual network
-              cards and sound cards, virtual serial and parallel ports
-              and an Input/Output Advanced Programmable Interrupt
+              &product-name; virtualizes a vast array of virtual
+              devices, among them many devices that are typically
+              provided by other virtualization platforms. That includes
+              IDE, SCSI and SATA hard disk controllers, several virtual
+              network cards and sound cards, virtual serial and parallel
+              ports and an Input/Output Advanced Programmable Interrupt
               Controller (I/O APIC), which is found in many modern PC
               systems. This eases cloning of PC images from real
               machines and importing of third-party virtual machines
-              into VirtualBox.
+              into &product-name;.
             </para>
           </listitem>
@@ -369,11 +370,11 @@
               <emphasis role="bold">Full ACPI support.</emphasis> The
               Advanced Configuration and Power Interface (ACPI) is fully
-              supported by VirtualBox. This eases cloning of PC images
-              from real machines or third-party virtual machines into
-              VirtualBox. With its unique <emphasis>ACPI power status
-              support</emphasis>, VirtualBox can even report to
-              ACPI-aware guest operating systems the power status of the
-              host. For mobile systems running on battery, the guest can
-              thus enable energy saving and notify the user of the
+              supported by &product-name;. This eases cloning of PC
+              images from real machines or third-party virtual machines
+              into &product-name;. With its unique <emphasis>ACPI power
+              status support</emphasis>, &product-name; can even report
+              to ACPI-aware guest operating systems the power status of
+              the host. For mobile systems running on battery, the guest
+              can thus enable energy saving and notify the user of the
               remaining power, for example in full screen modes.
             </para>
@@ -383,5 +384,5 @@
             <para>
               <emphasis role="bold">Multiscreen resolutions.</emphasis>
-              VirtualBox virtual machines support screen resolutions
+              &product-name; virtual machines support screen resolutions
               many times that of a physical screen, allowing them to be
               spread over a large number of screens attached to the host
@@ -393,11 +394,10 @@
             <para>
               <emphasis role="bold">Built-in iSCSI support.</emphasis>
-              This unique feature allows you to connect a virtual
+              This unique feature enables you to connect a virtual
               machine directly to an iSCSI storage server without going
               through the host system. The VM accesses the iSCSI target
               directly without the extra overhead that is required for
               virtualizing hard disks in container files. See
-              <xref
-            linkend="storage-iscsi" />.
+              <xref linkend="storage-iscsi" />.
             </para>
           </listitem>
@@ -406,6 +406,6 @@
             <para>
               <emphasis role="bold">PXE Network boot.</emphasis> The
-              integrated virtual network cards of VirtualBox fully
-              support remote booting via the Preboot Execution
+              integrated virtual network cards of &product-name; fully
+              support remote booting using the Preboot Execution
               Environment (PXE).
             </para>
@@ -418,9 +418,9 @@
         <para>
           <emphasis role="bold">Multigeneration branched
-          snapshots.</emphasis> VirtualBox can save arbitrary snapshots
-          of the state of the virtual machine. You can go back in time
-          and revert the virtual machine to any such snapshot and start
-          an alternative VM configuration from there, effectively
-          creating a whole snapshot tree. See
+          snapshots.</emphasis> &product-name; can save arbitrary
+          snapshots of the state of the virtual machine. You can go back
+          in time and revert the virtual machine to any such snapshot
+          and start an alternative VM configuration from there,
+          effectively creating a whole snapshot tree. See
           <xref linkend="snapshots" />. You can create and delete
           snapshots while the virtual machine is running.
@@ -430,5 +430,5 @@
       <listitem>
         <para>
-          <emphasis role="bold">VM groups.</emphasis> VirtualBox
+          <emphasis role="bold">VM groups.</emphasis> &product-name;
           provides a groups feature that enables the user to organize
           and control virtual machines collectively, as well as
@@ -439,17 +439,17 @@
           groups are the same as those that can be applied to individual
           VMs: Start, Pause, Reset, Close (Save state, Send Shutdown,
-          Poweroff), Discard Saved State, Show in fileSystem, Sort.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Clean architecture; unprecedented
-          modularity.</emphasis> VirtualBox has an extremely modular
+          Poweroff), Discard Saved State, Show in File System, Sort.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Clean architecture and unprecedented
+          modularity.</emphasis> &product-name; has an extremely modular
           design with well-defined internal programming interfaces and a
           clean separation of client and server code. This makes it easy
           to control it from several interfaces at once. For example,
           you can start a VM simply by clicking on a button in the
-          VirtualBox graphical user interface and then control that
+          &product-name; graphical user interface and then control that
           machine from the command line, or even remotely. See
           <xref linkend="frontends" />.
@@ -457,9 +457,9 @@
 
         <para>
-          Due to its modular architecture, VirtualBox can also expose
-          its full functionality and configurability through a
+          Due to its modular architecture, &product-name; can also
+          expose its full functionality and configurability through a
           comprehensive <emphasis role="bold">software development kit
-          (SDK),</emphasis> which allows for integrating every aspect of
-          VirtualBox with other software systems. See
+          (SDK),</emphasis> which enables integration of &product-name;
+          with other software systems. See
           <xref linkend="VirtualBoxAPI" />.
         </para>
@@ -469,5 +469,5 @@
         <para>
           <emphasis role="bold">Remote machine display.</emphasis> The
-          VirtualBox Remote Desktop Extension (VRDE) allows for
+          VirtualBox Remote Desktop Extension (VRDE) enables
           high-performance remote access to any running virtual machine.
           This extension supports the Remote Desktop Protocol (RDP)
@@ -478,6 +478,6 @@
         <para>
           The VRDE does not rely on the RDP server that is built into
-          Microsoft Windows; instead, it is plugged directly into the
-          virtualization layer. As a result, it works with guest
+          Microsoft Windows. Instead, the VRDE is plugged directly into
+          the virtualization layer. As a result, it works with guest
           operating systems other than Windows, even in text mode, and
           does not require application support in the virtual machine
@@ -487,6 +487,6 @@
 
         <para>
-          On top of this special capacity, VirtualBox offers you more
-          unique features:
+          On top of this special capacity, &product-name; offers you
+          more unique features:
         </para>
 
@@ -496,8 +496,8 @@
             <para>
               <emphasis role="bold">Extensible RDP
-              authentication.</emphasis> VirtualBox already supports
+              authentication.</emphasis> &product-name; already supports
               Winlogon on Windows and PAM on Linux for RDP
               authentication. In addition, it includes an easy-to-use
-              SDK which allows you to create arbitrary interfaces for
+              SDK which enables you to create arbitrary interfaces for
               other methods of authentication. See
               <xref linkend="vbox-auth" />.
@@ -507,10 +507,9 @@
           <listitem>
             <para>
-              <emphasis role="bold">USB over RDP.</emphasis> Via RDP
-              virtual channel support, VirtualBox also allows you to
-              connect arbitrary USB devices locally to a virtual machine
-              which is running remotely on a VirtualBox RDP server. See
-              <xref
-              linkend="usb-over-rdp" />.
+              <emphasis role="bold">USB over RDP.</emphasis> Using RDP
+              virtual channel support, &product-name; also enables you
+              to connect arbitrary USB devices locally to a virtual
+              machine which is running remotely on a &product-name; RDP
+              server. See <xref linkend="usb-over-rdp" />.
             </para>
           </listitem>
@@ -528,5 +527,5 @@
 
     <para>
-      Currently, VirtualBox runs on the following host operating
+      Currently, &product-name; runs on the following host operating
       systems:
     </para>
@@ -537,14 +536,4 @@
         <para>
           <emphasis role="bold">Windows hosts:</emphasis>
-
-          <footnote>
-
-            <para>
-              Support for 64-bit Windows was added with VirtualBox 1.5.
-              Support for Windows XP was removed with VirtualBox 5.0.
-              Support for Windows Vista was removed with VirtualBox 5.2.
-            </para>
-
-          </footnote>
         </para>
 
@@ -611,18 +600,4 @@
         <para>
           <emphasis role="bold">Mac OS X hosts (64-bit):</emphasis>
-
-          <footnote>
-
-            <para>
-              Preliminary Mac OS X support (beta stage) was added with
-              VirtualBox 1.4, full support with 1.6. Mac OS X 10.4
-              (Tiger) support was removed with VirtualBox 3.1. Support
-              for Mac OS X 10.7 (Lion) and earlier was removed with
-              VirtualBox 5.0. Support for Mac OS X 10.8 (Mountain Lion)
-              was removed with VirtualBox 5.1. Support for Mac OS X 10.9
-              (Mavericks) was removed with VirtualBox 5.2.
-            </para>
-
-          </footnote>
         </para>
 
@@ -664,14 +639,6 @@
       <listitem>
         <para>
-          <emphasis role="bold">Linux hosts (32-bit and 64-bit).
-          Includes the following:</emphasis>
-
-          <footnote>
-
-            <para>
-              Support for 64-bit Linux was added with VirtualBox 1.4.
-            </para>
-
-          </footnote>
+          <emphasis role="bold">Linux hosts (32-bit and
+          64-bit).</emphasis> Includes the following:
         </para>
 
@@ -693,5 +660,6 @@
           <listitem>
             <para>
-              Oracle Enterprise Linux 5, Oracle Linux 6, and 7
+              Oracle Enterprise Linux 5, Oracle Linux 6, and Oracle
+              Linux 7
             </para>
           </listitem>
@@ -724,24 +692,23 @@
 
         <para>
-          It should be possible to use VirtualBox on most systems based
-          on Linux kernel 2.6 or 3.x using either the VirtualBox
-          installer or by doing a manual installation. See
-          <xref linkend="install-linux-host" />. However, the formally
-          tested and supported Linux distributions are those for which
-          we offer a dedicated package.
-        </para>
-
-        <para>
-          Note that starting with VirtualBox 2.1, Linux 2.4-based host
-          operating systems are no longer supported.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Solaris hosts (64-bit only).</emphasis>
-          The following versions are supported with the restrictions
-          listed in <xref
-        linkend="KnownIssues" />:
+          It should be possible to use &product-name; on most systems
+          based on Linux kernel 2.6 or 3.x using either the
+          &product-name; installer or by doing a manual installation.
+          See <xref linkend="install-linux-host" />. However, the
+          formally tested and supported Linux distributions are those
+          for which we offer a dedicated package.
+        </para>
+
+        <para>
+          Note that Linux 2.4-based host operating systems are no longer
+          supported.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Oracle Solaris hosts (64-bit
+          only).</emphasis> The following versions are supported with
+          the restrictions listed in <xref linkend="KnownIssues" />:
         </para>
 
@@ -750,11 +717,11 @@
           <listitem>
             <para>
-              Solaris 11
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Solaris 10 (U10 and higher)
+              Oracle Solaris 11
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Oracle Solaris 10 8/11 and later
             </para>
           </listitem>
@@ -780,5 +747,5 @@
 
     <para>
-      SSE2 is required starting with VirtualBox version 5.2.10 and
+      SSE2 is required, starting with &product-name; version 5.2.10 and
       version 5.1.24.
     </para>
@@ -788,11 +755,11 @@
   <sect1 id="intro-installing">
 
-    <title>Installing VirtualBox and Extension Packs</title>
-
-    <para>
-      VirtualBox comes in many different packages, and installation
+    <title>Installing &product-name; and Extension Packs</title>
+
+    <para>
+      &product-name; comes in many different packages, and installation
       depends on your host operating system. If you have installed
       software before, installation should be straightforward. On each
-      host platform, VirtualBox uses the installation method that is
+      host platform, &product-name; uses the installation method that is
       most common and easy to use. If you run into trouble or have
       special requirements, see <xref linkend="installation" /> for
@@ -801,21 +768,22 @@
 
     <para>
-      Starting with version 4.0, VirtualBox is split into several
-      components:
-    </para>
-
-    <orderedlist>
-
-      <listitem>
-        <para>
-          The base package consists of all open source components and is
-          licensed under the GNU General Public License V2.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Additional extension packs can be downloaded which extend the
-          functionality of the VirtualBox base package. Currently,
+      &product-name; is split into the following components:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Base package.</emphasis> The base
+          package consists of all open source components and is licensed
+          under the GNU General Public License V2.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Extension packs.</emphasis> Additional
+          extension packs can be downloaded which extend the
+          functionality of the &product-name; base package. Currently,
           Oracle provides a single extension pack, available from:
           <ulink
@@ -829,6 +797,5 @@
             <para>
               The virtual USB 2.0 (EHCI) device. See
-              <xref
-                linkend="settings-usb" />.
+              <xref linkend="settings-usb" />.
             </para>
           </listitem>
@@ -852,6 +819,5 @@
             <para>
               Host webcam passthrough. See
-              <xref
-                    linkend="webcam-passthrough" />.
+              <xref linkend="webcam-passthrough" />.
             </para>
           </listitem>
@@ -880,9 +846,10 @@
 
         <para>
-          VirtualBox extension packages have a
+          &product-name; extension packages have a
           <computeroutput>.vbox-extpack</computeroutput> file name
           extension. To install an extension, simply double-click on the
-          package file and a Network Operations Manager window will
-          appear, guiding you through the required steps.
+          package file and a <emphasis role="bold">Network Operations
+          Manager</emphasis> window is shown to guide you through the
+          required steps.
         </para>
 
@@ -900,10 +867,10 @@
 
         <para>
-          Alternatively, you can use the VBoxManage command line. See
-          <xref linkend="vboxmanage-extpack" />.
-        </para>
-      </listitem>
-
-    </orderedlist>
+          Alternatively, you can use the <command>VBoxManage</command>
+          command line. See <xref linkend="vboxmanage-extpack" />.
+        </para>
+      </listitem>
+
+    </itemizedlist>
 
   </sect1>
@@ -911,8 +878,8 @@
   <sect1 id="intro-starting">
 
-    <title>Starting VirtualBox</title>
-
-    <para>
-      After installation, you can start VirtualBox as follows:
+    <title>Starting &product-name;</title>
+
+    <para>
+      After installation, you can start &product-name; as follows:
     </para>
 
@@ -921,9 +888,10 @@
       <listitem>
         <para>
-          On a Windows host, in the Programs menu, click on the item in
-          the <emphasis role="bold">VirtualBox</emphasis> group. On
-          Vista or Windows 7, you can also type
+          On a Windows host, in the
+          <emphasis role="bold">Programs</emphasis> menu, click on the
+          item in the <emphasis role="bold">VirtualBox</emphasis> group.
+          On Vista or Windows 7, you can also enter
           <computeroutput>VirtualBox</computeroutput> in the search box
-          of the Start menu.
+          of the <emphasis role="bold">Start</emphasis> menu.
         </para>
       </listitem>
@@ -933,16 +901,18 @@
           On a Mac OS X host, in the Finder, double-click on the
           <emphasis role="bold">VirtualBox</emphasis> item in the
-          "Applications" folder. You may want to drag this item onto
-          your Dock.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          On a Linux or Solaris host, depending on your desktop
-          environment, a VirtualBox item may have been placed in either
-          the System or System Tools group of your Applications menu.
-          Alternatively, you can type
-          <computeroutput>VirtualBox</computeroutput> in a terminal.
+          Applications folder. You may want to drag this item onto your
+          Dock.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          On a Linux or Oracle Solaris host, depending on your desktop
+          environment, an &product-name; item may have been placed in
+          either the System or System Tools group of your
+          <emphasis role="bold">Applications</emphasis> menu.
+          Alternatively, you can enter
+          <computeroutput>VirtualBox</computeroutput> in a terminal
+          window.
         </para>
       </listitem>
@@ -951,21 +921,23 @@
 
     <para>
-      When you start VirtualBox for the first time, a window like the
-      following is displayed:
-    </para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="images/virtualbox-main-empty.png"
+      When you start &product-name; for the first time, a window like
+      the following is displayed:
+    </para>
+
+    <figure id="fig-vbox-manager-initial">
+      <title>VirtualBox Manager Window, After Initial Startup</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="images/virtualbox-main-empty.png"
                      width="10cm" />
-      </imageobject>
-    </mediaobject>
-
-    <para>
-      This window is called the <emphasis
-    role="bold">"VirtualBox
-      Manager"</emphasis>. On the left, you can see a pane that will
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <para>
+      This window is called the <emphasis role="bold">VirtualBox
+      Manager</emphasis>. On the left, you can see a pane that will
       later list all your virtual machines. Since you have not created
-      any, the list is empty. A row of buttons above it allows you to
+      any, the list is empty. A row of buttons above it enables you to
       create new VMs and work on existing VMs, once you have some. The
       pane on the right displays the properties of the virtual machine
@@ -975,14 +947,17 @@
 
     <para>
-      To give you an idea what VirtualBox might look like later, after
-      you have created many machines, here is another example:
-    </para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="images/virtualbox-main.png"
+      To give you an idea what &product-name; might look like later,
+      after you have created many machines, here is another example:
+    </para>
+
+    <figure id="fig-vbox-manager-populated">
+      <title>VirtualBox Manager Window, After Creating Virtual Machines</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="images/virtualbox-main.png"
                      width="10cm" />
-      </imageobject>
-    </mediaobject>
+        </imageobject>
+      </mediaobject>
+    </figure>
 
   </sect1>
@@ -993,10 +968,11 @@
 
     <para>
-      Click on the <emphasis role="bold">New</emphasis> button at the
-      top of the VirtualBox Manager window. A wizard will pop up to
-      guide you through setting up a new virtual machine (VM):
-    </para>
-
-    <para>
+      Click the <emphasis role="bold">New</emphasis> button at the top
+      of the VirtualBox Manager window. A wizard is shown, to guide you
+      through setting up a new virtual machine (VM):
+    </para>
+
+    <figure id="fig-new-vm-name">
+      <title>Creating a New Virtual Machine: Name and Operating System</title>
       <mediaobject>
         <imageobject>
@@ -1005,5 +981,7 @@
         </imageobject>
       </mediaobject>
-
+    </figure>
+
+    <para>
       On the following pages, the wizard will ask you for the bare
       minimum of information that is needed to create a VM, in
@@ -1016,8 +994,8 @@
         <para>
           The <emphasis role="bold">Name</emphasis> of the VM will later
-          be shown in the VM list of the VirtualBox Manager window, and
-          it will be used for the VM's files on disk. Even though any
-          name can be used, bear in mind that if you create a few VMs,
-          you will appreciate if you have given your VMs rather
+          be shown in the machine list of the VirtualBox Manager window,
+          and it will be used for the VM's files on disk. Even though
+          any name can be used, bear in mind that if you create a few
+          VMs, you will appreciate if you have given your VMs rather
           informative names."My VM" would thus be less useful than
           "Windows XP SP2 with OpenOffice", for example.
@@ -1032,10 +1010,9 @@
           install something very unusual that is not listed, select
           <emphasis role="bold">Other</emphasis>. Depending on your
-          selection, VirtualBox will enable or disable certain VM
+          selection, &product-name; will enable or disable certain VM
           settings that your guest operating system may require. This is
           particularly important for 64-bit guests. See
-          <xref
-          linkend="intro-64bitguests" />. It is
-          therefore recommended to always set it to the correct value.
+          <xref linkend="intro-64bitguests" />. It is therefore
+          recommended to always set it to the correct value.
         </para>
       </listitem>
@@ -1044,9 +1021,9 @@
         <para>
           On the next page, select the <emphasis role="bold">Memory
-          (RAM)</emphasis> that VirtualBox should allocate every time
-          the virtual machine is started. The amount of memory given
-          here will be taken away from your host machine and presented
-          to the guest operating system, which will report this size as
-          the virtual computer's installed RAM.
+          (RAM)</emphasis> that &product-name; should allocate every
+          time the virtual machine is started. The amount of memory
+          given here will be taken away from your host machine and
+          presented to the guest operating system, which will report
+          this size as the virtual computer's installed RAM.
         </para>
 
@@ -1099,12 +1076,11 @@
         <para>
           There are many and potentially complicated ways in which
-          VirtualBox can provide hard disk space to a VM, see
-          <xref
-          linkend="storage" />, but the most common way
-          is to use a large image file on your "real" hard disk, whose
-          contents VirtualBox presents to your VM as if it were a
-          complete hard disk. This file represents an entire hard disk
-          then, so you can even copy it to another host and use it with
-          another VirtualBox installation.
+          &product-name; can provide hard disk space to a VM, see
+          <xref linkend="storage" />, but the most common way is to use
+          a large image file on your "real" hard disk, whose contents
+          &product-name; presents to your VM as if it were a complete
+          hard disk. This file represents an entire hard disk then, so
+          you can even copy it to another host and use it with another
+          &product-name; installation.
         </para>
 
@@ -1113,5 +1089,6 @@
         </para>
 
-        <para>
+        <figure id="fig-new-vm-hard-disk">
+          <title>Creating a New Virtual Machine: Hard Disk</title>
           <mediaobject>
             <imageobject>
@@ -1120,5 +1097,5 @@
             </imageobject>
           </mediaobject>
-        </para>
+        </figure>
 
         <para>
@@ -1131,13 +1108,11 @@
             <para>
               To create a new, empty virtual hard disk, click the
-              <emphasis role="bold">New</emphasis> button.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              You can pick an
-              <emphasis
-               >existing</emphasis> disk image
+              <emphasis role="bold">Create</emphasis> button.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              You can pick an <emphasis>existing</emphasis> disk image
               file.
             </para>
@@ -1145,16 +1120,15 @@
             <para>
               The drop-down list presented in the window lists all disk
-              images which are currently remembered by VirtualBox. These
-              disk images are currently attached to a virtual machine,
-              or have been attached to a virtual machine.
+              images which are currently remembered by &product-name;.
+              These disk images are currently attached to a virtual
+              machine, or have been attached to a virtual machine.
             </para>
 
             <para>
               Alternatively, click on the small
-              <emphasis
-                role="bold">folder
-              icon</emphasis> next to the drop-down list to display a
-              standard file dialog, where you can select any disk image
-              file on your host disk.
+              <emphasis role="bold">folder icon</emphasis> next to the
+              drop-down list. In the displayed file dialog, you can
+              click <emphasis role="bold">Add</emphasis> to select any
+              disk image file on your host disk.
             </para>
           </listitem>
@@ -1163,19 +1137,18 @@
 
         <para>
-          If you are using VirtualBox for the first time, you will want
-          to create a new disk image. Click the
-          <emphasis role="bold">New</emphasis> button.
-        </para>
-
-        <para>
-          This displays another window, the
-          <emphasis
-          role="bold">Create New Virtual Disk
-          Wizard</emphasis>. This wizard helps you to create a new disk
-          image file in the new virtual machine's folder.
-        </para>
-
-        <para>
-          VirtualBox supports the following types of image files:
+          If you are using &product-name; for the first time, you will
+          want to create a new disk image. Click the
+          <emphasis role="bold">Create</emphasis> button.
+        </para>
+
+        <para>
+          This displays another window, the <emphasis role="bold">Create
+          Virtual Hard Disk Wizard</emphasis> wizard. This wizard helps
+          you to create a new disk image file in the new virtual
+          machine's folder.
+        </para>
+
+        <para>
+          &product-name; supports the following types of image files:
         </para>
 
@@ -1208,29 +1181,30 @@
         <para>
           For details about the differences, see
-          <xref
-          linkend="vdidetails" />.
+          <xref linkend="vdidetails" />.
         </para>
 
         <para>
           To prevent your physical hard disk from running full,
-          VirtualBox limits the size of the image file. Still, it needs
-          to be large enough to hold the contents of your operating
-          system and the applications you want to install. For a modern
-          Windows or Linux guest, you will probably need several
-          gigabytes for any serious use. The limit of the image file
-          size can be changed later, see
-          <xref
-          linkend="vboxmanage-modifyvdi"/>.
-        </para>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="images/create-vdi-1.png"
+          &product-name; limits the size of the image file. Still, it
+          needs to be large enough to hold the contents of your
+          operating system and the applications you want to install. For
+          a modern Windows or Linux guest, you will probably need
+          several gigabytes for any serious use. The limit of the image
+          file size can be changed later, see
+          <xref linkend="vboxmanage-modifyvdi"/>.
+        </para>
+
+        <figure id="fig-new-vm-vdi">
+          <title>Creating a New Virtual Machine: File Location and Size</title>
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="images/create-vdi-1.png"
                          width="10cm" />
-          </imageobject>
-        </mediaobject>
-
-        <para>
-          After having selected or created your image file, again click
+            </imageobject>
+          </mediaobject>
+        </figure>
+
+        <para>
+          After having selected or created your image file, click
           <emphasis role="bold">Next</emphasis> to go to the next page.
         </para>
@@ -1239,8 +1213,8 @@
       <listitem>
         <para>
-          After clicking on <emphasis role="bold">Finish</emphasis>
-          button, your new virtual machine is created. The virtual
-          machine is displayed in the list on the left side of the
-          Manager window, with the name that you entered initially.
+          Click <emphasis role="bold">Create</emphasis>, to create your
+          new virtual machine. The virtual machine is displayed in the
+          list on the left side of the VirtualBox Manager window, with
+          the name that you entered initially.
         </para>
       </listitem>
@@ -1271,24 +1245,24 @@
       <listitem>
         <para>
-          Double-click on its entry in the list within the Manager
-          window.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Select its entry in the list in the Manager window, and click
-          the <emphasis role="bold">Start</emphasis> button at the top.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          For virtual machines created with VirtualBox 4.0 or later,
-          navigate to the <computeroutput>VirtualBox
-          VMs</computeroutput> folder in your system user's home
-          directory. Find the subdirectory of the machine you want to
-          start and double-click on the machine settings file, which has
-          a <computeroutput>.vbox</computeroutput> file extension.
+          Double-click on the VM's entry in the list in the VirtualBox
+          Manager window.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Select the VM's entry in the list in the VirtualBox Manager
+          window, and click <emphasis role="bold">Start</emphasis> at
+          the top of the window.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Go to the <computeroutput>VirtualBox VMs</computeroutput>
+          folder in your system user's home directory. Find the
+          subdirectory of the machine you want to start and double-click
+          on the machine settings file. This file has a
+          <computeroutput>.vbox</computeroutput> file extension.
         </para>
       </listitem>
@@ -1353,9 +1327,9 @@
             in the form of an ISO image file such as with a Linux
             distribution, you would normally burn this file to an empty
-            CD or DVD and proceed as described above. With VirtualBox
-            however, you can skip this step and mount the ISO file
-            directly. VirtualBox will then present this file as a CD or
-            DVD-ROM drive to the virtual machine, much like it does with
-            virtual hard disk images.
+            CD or DVD and proceed as described above. With
+            &product-name; however, you can skip this step and mount the
+            ISO file directly. &product-name; will then present this
+            file as a CD or DVD-ROM drive to the virtual machine, much
+            like it does with virtual hard disk images.
           </para>
 
@@ -1363,12 +1337,13 @@
             In this case, the wizard's drop-down list contains a list of
             installation media that were previously used with
-            VirtualBox.
+            &product-name;.
           </para>
 
           <para>
             If your medium is not in the list, especially if you are
-            using VirtualBox for the first time, click the small folder
-            icon next to the drop-down list to display a standard file
-            dialog. Here you can pick an image file on your host disks.
+            using &product-name; for the first time, click the small
+            folder icon next to the drop-down list to display a standard
+            file dialog. Here you can pick an image file on your host
+            disks.
           </para>
         </listitem>
@@ -1388,9 +1363,9 @@
 
       <para>
-        As of version 3.2, VirtualBox provides a virtual USB tablet
-        device to new virtual machines through which mouse events are
-        communicated to the guest operating system. If you are running a
-        modern guest operating system that can handle such devices,
-        mouse support may work out of the box without the mouse being
+        &product-name; provides a virtual USB tablet device to new
+        virtual machines through which mouse events are communicated to
+        the guest operating system. If you are running a modern guest
+        operating system that can handle such devices, mouse support may
+        work out of the box without the mouse being
         <emphasis>captured</emphasis> as described below. See
         <xref linkend="settings-motherboard" />.
@@ -1419,21 +1394,23 @@
       <para>
         To return ownership of keyboard and mouse to your host operating
-        system, VirtualBox reserves a special key on your keyboard: the
-        <emphasis role="bold">Host key</emphasis>. By default, this is
-        the <emphasis>right Ctrl key</emphasis> on your keyboard. On a
-        Mac host, the default Host key is the left Command key. You can
-        change this default in the VirtualBox Global Settings. See
-        <xref
-        linkend="globalsettings" />. The current setting
-        for the Host key is always displayed at the bottom right of your
-        VM window.
-      </para>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata align="center" fileref="images/vm-hostkey.png"
+        system, &product-name; reserves a special key on your keyboard:
+        the <emphasis>Host key</emphasis>. By default, this is the
+        <emphasis>right Ctrl key</emphasis> on your keyboard. On a Mac
+        host, the default Host key is the left Command key. You can
+        change this default in the &product-name; Global Settings. See
+        <xref linkend="globalsettings" />. The current setting for the
+        Host key is always displayed at the bottom right of your VM
+        window.
+      </para>
+
+      <figure id="fig-host-key">
+        <title>Host Key Setting on the Virtual Machine Task Bar</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="images/vm-hostkey.png"
                        width="7cm" />
-        </imageobject>
-      </mediaobject>
+          </imageobject>
+        </mediaobject>
+      </figure>
 
       <para>
@@ -1449,6 +1426,6 @@
             keyboard focus. If you have many windows open in your guest
             operating system, the window that has the focus in your VM
-            is used. This means that if you want to type within your VM,
-            click on the title bar of your VM window first.
+            is used. This means that if you want to enter text within
+            your VM, click on the title bar of your VM window first.
           </para>
 
@@ -1485,5 +1462,5 @@
             Note that mouse ownership is independent of that of the
             keyboard. Even after you have clicked on a titlebar to be
-            able to type into the VM window, your mouse is not
+            able to enter text into the VM window, your mouse is not
             necessarily owned by the VM yet.
           </para>
@@ -1498,15 +1475,11 @@
 
       <para>
-        As this behavior can be inconvenient, VirtualBox provides a set
-        of tools and device drivers for guest systems called the
-        VirtualBox Guest Additions which make VM keyboard and mouse
+        As this behavior can be inconvenient, &product-name; provides a
+        set of tools and device drivers for guest systems called the
+        &product-name; Guest Additions which make VM keyboard and mouse
         operation a lot more seamless. Most importantly, the Additions
         will get rid of the second "guest" mouse pointer and make your
-        host mouse pointer work directly in the guest.
-      </para>
-
-      <para>
-        This is described in <xref
-      linkend="guestadditions" />.
+        host mouse pointer work directly in the guest. See
+        <xref linkend="guestadditions" />.
       </para>
 
@@ -1522,5 +1495,5 @@
         difficult to enter into a virtual machine, as there are three
         candidates as to who receives keyboard input: the host operating
-        system, VirtualBox, or the guest operating system. Which of
+        system, &product-name;, or the guest operating system. Which of
         these three receives keypresses depends on a number of factors,
         including the key itself.
@@ -1533,9 +1506,8 @@
             Host operating systems reserve certain key combinations for
             themselves. For example, it is impossible to enter the
-            <emphasis
-          role="bold">Ctrl+Alt+Delete</emphasis>
-            combination if you want to reboot the guest operating system
-            in your virtual machine, because this key combination is
-            usually hard-wired into the host OS, both Windows and Linux
+            <emphasis role="bold">Ctrl+Alt+Delete</emphasis> combination
+            if you want to reboot the guest operating system in your
+            virtual machine, because this key combination is usually
+            hard-wired into the host OS, both Windows and Linux
             intercept this, and pressing this key combination will
             therefore reboot your <emphasis>host</emphasis>.
@@ -1543,13 +1515,13 @@
 
           <para>
-            On Linux and Solaris hosts, which use the X Window System,
-            the key combination
-            <emphasis
-          role="bold">Ctrl+Alt+Backspace</emphasis>
-            normally resets the X server and restarts the entire
-            graphical user interface. As the X server intercepts this
-            combination, pressing it will usually restart your
+            On Linux and Oracle Solaris hosts, which use the X Window
+            System, the key combination
+            <emphasis role="bold">Ctrl+Alt+Backspace</emphasis> normally
+            resets the X server and restarts the entire graphical user
+            interface. As the X server intercepts this combination,
+            pressing it will usually restart your
             <emphasis>host</emphasis> graphical user interface and kill
-            all running programs, including VirtualBox, in the process.
+            all running programs, including &product-name;, in the
+            process.
           </para>
 
@@ -1558,5 +1530,5 @@
             combination <emphasis role="bold">Ctrl+Alt+Fx</emphasis>,
             where Fx is one of the function keys from F1 to F12,
-            normally allows you to switch between virtual terminals. As
+            normally enables you to switch between virtual terminals. As
             with Ctrl+Alt+Delete, these combinations are intercepted by
             the host operating system and therefore always switch
@@ -1580,6 +1552,11 @@
                 <emphasis role="bold">Insert Ctrl+Alt+Delete</emphasis>
                 and <emphasis role="bold">Ctrl+Alt+Backspace</emphasis>.
-                The latter will only have an effect with Linux or
+                The latter will only have an effect with Linux or Oracle
                 Solaris guests, however.
+              </para>
+
+              <para>
+                This menu also includes an option for inserting the Host
+                key combination.
               </para>
             </listitem>
@@ -1588,6 +1565,7 @@
               <para>
                 Use special key combinations with the Host key, normally
-                the right Control key. VirtualBox will then translate
-                these key combinations for the virtual machine:
+                the right Control key. &product-name; will then
+                translate these key combinations for the virtual
+                machine:
               </para>
 
@@ -1606,5 +1584,5 @@
                     Backspace</emphasis> to send Ctrl+Alt+Backspace to
                     restart the graphical user interface of a Linux or
-                    Solaris guest.
+                    Oracle Solaris guest.
                   </para>
                 </listitem>
@@ -1628,11 +1606,12 @@
           <para>
             For some other keyboard combinations such as
-            <emphasis
-          role="bold">Alt-Tab</emphasis> to switch
-            between open windows, VirtualBox allows you to configure
+            <emphasis role="bold">Alt-Tab</emphasis> to switch between
+            open windows, &product-name; enables you to configure
             whether these combinations will affect the host or the
             guest, if a virtual machine currently has the focus. This is
             a global setting for all virtual machines and can be found
-            under "File", "Preferences", "Input".
+            under <emphasis role="bold">File</emphasis>,
+            <emphasis role="bold">Preferences</emphasis>,
+            <emphasis role="bold">Input</emphasis>.
           </para>
         </listitem>
@@ -1649,22 +1628,23 @@
         While a virtual machine is running, you can change removable
         media in the <emphasis role="bold">Devices</emphasis> menu of
-        the VM's window. Here you can select in detail what VirtualBox
-        presents to your VM as a CD, DVD, or floppy.
+        the VM's window. Here you can select in detail what
+        &product-name; presents to your VM as a CD, DVD, or floppy.
       </para>
 
       <para>
         The settings are the same as would be available for the VM in
-        the Settings dialog of the VirtualBox main window, but since
-        that dialog is disabled while the VM is in the "running" or
-        "saved" state, this extra menu saves you from having to shut
-        down and restart the VM every time you want to change media.
-      </para>
-
-      <para>
-        Hence, in the Devices menu, VirtualBox allows you to attach the
-        host drive to the guest or select a floppy or DVD image using
-        the Disk Image Manager, as described in
-        <xref
-      linkend="configbasics" />.
+        the <emphasis role="bold">Settings</emphasis> dialog of the
+        &product-name; main window. But as the
+        <emphasis role="bold">Settings</emphasis> dialog is disabled
+        while the VM is in the Running or Saved state, this extra menu
+        saves you from having to shut down and restart the VM every time
+        you want to change media.
+      </para>
+
+      <para>
+        Hence, in the <emphasis role="bold">Devices</emphasis> menu,
+        &product-name; enables you to attach the host drive to the guest
+        or select a floppy or DVD image using the Disk Image Manager, as
+        described in <xref linkend="configbasics" />.
       </para>
 
@@ -1677,5 +1657,5 @@
       <para>
         You can resize the virtual machine's window when it is running.
-        In that case, one of three things will happen:
+        In that case, one of the following things will happen:
       </para>
 
@@ -1704,6 +1684,7 @@
           <para>
             The aspect ratio of the guest screen is preserved when
-            resizing the window. To ignore the aspect ratio, press Shift
-            during the resize operation.
+            resizing the window. To ignore the aspect ratio, press
+            <emphasis role="bold">Shift</emphasis> during the resize
+            operation.
           </para>
 
@@ -1750,9 +1731,11 @@
         button of your virtual machine window, at the top right of the
         window, just like you would close any other window on your
-        system, VirtualBox asks you whether you want to save or power
-        off the VM. As a shortcut, you can also press Host key + Q.
-      </para>
-
-      <para>
+        system, &product-name; asks you whether you want to save or
+        power off the VM. As a shortcut, you can also press
+        <emphasis role="bold">Host key + Q</emphasis>.
+      </para>
+
+      <figure id="fig-vm-close">
+        <title>Closing Down a Virtual Machine</title>
         <mediaobject>
           <imageobject>
@@ -1761,5 +1744,7 @@
           </imageobject>
         </mediaobject>
-
+      </figure>
+
+      <para>
         The difference between the three options is crucial. They mean
         the following:
@@ -1771,7 +1756,7 @@
           <para>
             <emphasis role="bold">Save the machine state:</emphasis>
-            With this option, VirtualBox <emphasis>freezes</emphasis>
-            the virtual machine by completely saving its state to your
-            local disk.
+            With this option, &product-name;
+            <emphasis>freezes</emphasis> the virtual machine by
+            completely saving its state to your local disk.
           </para>
 
@@ -1799,5 +1784,5 @@
           <para>
             <emphasis role="bold">Power off the machine:</emphasis> With
-            this option, VirtualBox also stops running the virtual
+            this option, &product-name; also stops running the virtual
             machine, but <emphasis>without</emphasis> saving its state.
           </para>
@@ -1872,5 +1857,6 @@
             </para>
 
-            <para>
+            <figure id="fig-vm-groups">
+              <title>Creating a Group of Virtual Machines</title>
               <mediaobject>
                 <imageobject>
@@ -1879,5 +1865,5 @@
                 </imageobject>
               </mediaobject>
-            </para>
+            </figure>
           </listitem>
 
@@ -1971,16 +1957,16 @@
       state, even though you may have changed the VM considerably since
       then. A snapshot of a virtual machine is thus similar to a machine
-      in "saved" state, as described above, but there can be many of
-      them, and these saved states are preserved.
+      in Saved state, but there can be many of them, and these saved
+      states are preserved.
     </para>
 
     <para>
       You can see the snapshots of a virtual machine by first selecting
-      a machine in the VirtualBox Manager and then clicking on the
-      <emphasis role="bold">Snapshots</emphasis> button at the top
-      right. Until you take a snapshot of the machine, the list of
-      snapshots will be empty except for the
-      <emphasis role="bold">Current State</emphasis> item, which
-      represents the "now" point in the lifetime of the virtual machine.
+      a machine in the VirtualBox Manager and then clicking
+      <emphasis role="bold">Snapshots</emphasis> at the top right. Until
+      you take a snapshot of the machine, the list of snapshots will be
+      empty except for the <emphasis role="bold">Current
+      State</emphasis> item, which represents the "now" point in the
+      lifetime of the virtual machine.
     </para>
 
@@ -2017,5 +2003,5 @@
                 If your VM is currently in either the Saved or the
                 Powered Off state, as displayed next to the VM in the
-                VirtualBox main window, click on the
+                &product-name; main window, click on the
                 <emphasis role="bold">Snapshots </emphasis>tab on the
                 top right of the main window. Do one of the following:
@@ -2050,5 +2036,6 @@
             useful name would be "Fresh installation from scratch, no
             Guest Additions", or "Service Pack 3 just installed". You
-            can also add a longer text in the Description field.
+            can also add a longer text in the
+            <emphasis role="bold">Description</emphasis> field.
           </para>
 
@@ -2063,14 +2050,17 @@
           </para>
 
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/snapshots-1.png"
+          <figure id="fig-snapshots-list">
+            <title>Snapshots List for a Virtual Machine</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center" fileref="images/snapshots-1.png"
                              width="12cm" />
-            </imageobject>
-          </mediaobject>
-
-          <para>
-            VirtualBox imposes no limits on the number of snapshots you
-            can take. The only practical limitation is disk space on
+              </imageobject>
+            </mediaobject>
+          </figure>
+
+          <para>
+            &product-name; imposes no limits on the number of snapshots
+            you can take. The only practical limitation is disk space on
             your host. Each snapshot stores the state of the virtual
             machine and thus occupies some disk space. See
@@ -2088,20 +2078,4 @@
             and the machine is restored to the exact state it was in
             when the snapshot was taken.
-
-            <footnote>
-
-              <para>
-                Both the terminology and the functionality of restoring
-                snapshots has changed with VirtualBox 3.1. Before that
-                version, it was only possible to go back to the very
-                last snapshot taken -- not earlier ones, and the
-                operation was called "Discard current state" instead of
-                "Restore last snapshot". The limitation has been lifted
-                with version 3.1. It is now possible to restore
-                <emphasis>any</emphasis> snapshot, going backward and
-                forward in time.
-              </para>
-
-            </footnote>
           </para>
 
@@ -2115,9 +2089,10 @@
               lost. </emphasis>In order to prevent such data loss while
               still making use of the snapshot feature, it is possible
-              to add a second hard drive in "write-through" mode using
-              the <computeroutput>VBoxManage</computeroutput> interface
-              and use it to store your data. As write-through hard
-              drives are <emphasis>not</emphasis> included in snapshots,
-              they remain unaltered when a machine is reverted. See
+              to add a second hard drive in
+              <emphasis>write-through</emphasis> mode using the
+              <command>VBoxManage</command> interface and use it to
+              store your data. As write-through hard drives are
+              <emphasis>not</emphasis> included in snapshots, they
+              remain unaltered when a machine is reverted. See
               <xref
               linkend="hdimagewrites" />.
@@ -2144,6 +2119,6 @@
             <emphasis role="bold">Delete a snapshot</emphasis>. This
             does not affect the state of the virtual machine, but only
-            releases the files on disk that VirtualBox used to store the
-            snapshot data, thus freeing disk space. To delete a
+            releases the files on disk that &product-name; used to store
+            the snapshot data, thus freeing disk space. To delete a
             snapshot, right-click on it in the snapshots tree and select
             <emphasis role="bold">Delete</emphasis>. Snapshots can be
@@ -2217,15 +2192,14 @@
             in "normal" mode. You can configure disks to behave
             differently with snapshots, see
-            <xref
-            linkend="hdimagewrites" />. Even more
-            formally and technically correct, it is not the virtual disk
-            itself that is restored when a snapshot is restored.
-            Instead, when a snapshot is taken, VirtualBox creates
-            differencing images which contain only the changes since the
-            snapshot were taken, and when the snapshot is restored,
-            VirtualBox throws away that differencing image, thus going
-            back to the previous state. This is both faster and uses
-            less disk space. For the details, which can be complex, see
-            <xref linkend="diffimages" />.
+            <xref linkend="hdimagewrites" />. Even more formally and
+            technically correct, it is not the virtual disk itself that
+            is restored when a snapshot is restored. Instead, when a
+            snapshot is taken, &product-name; creates differencing
+            images which contain only the changes since the snapshot
+            were taken, and when the snapshot is restored,
+            &product-name; throws away that differencing image, thus
+            going back to the previous state. This is both faster and
+            uses less disk space. For the details, which can be complex,
+            see <xref linkend="diffimages" />.
           </para>
 
@@ -2268,7 +2242,7 @@
 
     <para>
-      When you select a virtual machine from the list in the Manager
-      window, you will see a summary of that machine's settings on the
-      right.
+      When you select a virtual machine from the list in the VirtualBox
+      Manager window, you will see a summary of that machine's settings
+      on the right.
     </para>
 
@@ -2285,23 +2259,23 @@
     <note>
       <para>
-        The Settings button is disabled while a VM is either in the
-        Running or Saved state. This is because the settings dialog
-        allows you to change fundamental characteristics of the virtual
+        The <emphasis role="bold">Settings</emphasis> button is disabled
+        while a VM is either in the Running or Saved state. This is
+        because the <emphasis role="bold">Settings</emphasis> dialog
+        enables you to change fundamental characteristics of the virtual
         computer that is created for your guest operating system, and
         this operating system may perform well when, for example, half
-        of its memory is taken away. As a result, if the Settings button
-        is disabled, shut down the current VM first.
+        of its memory is taken away. As a result, if the
+        <emphasis role="bold">Settings</emphasis> button is disabled,
+        shut down the current VM first.
       </para>
     </note>
 
     <para>
-      VirtualBox provides a wide range of parameters that can be changed
-      for a virtual machine. The various settings that can be changed in
-      the Settings window are described in detail in
-      <xref
-    linkend="BasicConcepts" />. Even more parameters are
-      available with the VirtualBox command line interface. See
-      <xref
-    linkend="vboxmanage" />.
+      &product-name; provides a wide range of parameters that can be
+      changed for a virtual machine. The various settings that can be
+      changed in the <emphasis role="bold">Settings</emphasis> window
+      are described in detail in <xref linkend="BasicConcepts" />. Even
+      more parameters are available with the &product-name; command line
+      interface. See <xref linkend="vboxmanage" />.
     </para>
 
@@ -2310,21 +2284,69 @@
   <sect1 id="intro-removing">
 
-    <title>Removing Virtual Machines</title>
-
-    <para>
-      To remove a virtual machine which you no longer need, right-click
-      on it in the Manager's VM list and select
-      <emphasis role="bold">Remove</emphasis>.
-    </para>
-
-    <para>
-      A confirmation window is displayed that allows you to select
-      whether the machine should only be removed from the list of
-      machines or whether the files associated with it should also be
-      deleted.
-    </para>
-
-    <para>
-      The Remove menu item is disabled while a machine is running.
+    <title>Removing and Moving Virtual Machines</title>
+
+    <para>
+      You can easily remove a virtual machine from &product-name;.
+      Alternatively, you can move the virtual machine and associated
+      files, such as a disk image, to another location on the host.
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Removing a VM.</emphasis> To remove a
+          virtual machine which you no longer need, right-click on the
+          VM in the VirtualBox Manager's machine list and select
+          <emphasis role="bold">Remove</emphasis>.
+        </para>
+
+        <para>
+          A confirmation dialog is displayed that enables you to select
+          whether the virtual machine should only be removed from the
+          list of machines, or whether the files associated with it
+          should also be deleted.
+        </para>
+
+        <para>
+          The <emphasis role="bold">Remove</emphasis> menu item is
+          disabled while a VM is running.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Moving a VM.</emphasis> To move a
+          virtual machine to a new location on the host, right-click on
+          the VM in the VirtualBox Manager's machine list and select
+          <emphasis role="bold">Move</emphasis>.
+        </para>
+
+        <para>
+          A file dialog prompts you to select a new location for the
+          virtual machine.
+        </para>
+
+        <para>
+          When you move a VM, &product-name; configuration files are
+          updated automatically to use the new location on the host.
+        </para>
+
+        <para>
+          The <emphasis role="bold">Move</emphasis> menu item is
+          disabled while a VM is running.
+        </para>
+
+        <para>
+          You can also use the <command>VBoxManage</command> command to
+          move a VM. See <xref linkend="vboxmanage-movevm"/>.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>
+      For details of removing or moving a disk image file from
+      &product-name;, see <xref linkend="vdis"/>.
     </para>
 
@@ -2337,43 +2359,43 @@
     <para>
       To experiment with a VM configuration, test different guest OS
-      levels or to simply backup a VM, VirtualBox can create a full or a
-      linked copy of an existing VM.
-
-      <footnote>
-
-        <para>
-          Cloning support was introduced with VirtualBox 4.1.
-        </para>
-
-      </footnote>
-    </para>
-
-    <para>
-      A wizard guides you through the clone process.
-    </para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="images/clone-vm.png"
+      levels or to simply backup a VM, &product-name; can create a full
+      or a linked copy of an existing VM. This is called
+      <emphasis>cloning</emphasis> a virtual machine.
+    </para>
+
+    <para>
+      The <emphasis role="bold">Clone Virtual Machine</emphasis> wizard
+      guides you through the cloning process.
+    </para>
+
+    <figure id="fig-clone-wizard">
+      <title>The Clone Virtual Machine Wizard</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="images/clone-vm.png"
                    width="10cm" />
-      </imageobject>
-    </mediaobject>
-
-    <para>
-      This wizard can be started from the right-click menu of the
-      Manager's VM list, by clicking
-      <emphasis role="bold">Clone</emphasis>, or the
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <para>
+      Start the wizard by clicking
+      <emphasis role="bold">Clone</emphasis> in the right-click menu of
+      the VirtualBox Manager's machine list, or in the
       <emphasis role="bold">Snapshots</emphasis> view of the selected
-      VM. First choose a new name for the clone. When you select
-      <emphasis
-    role="bold">Reinitialize the MAC address of all
-      network cards</emphasis> every network card get a new MAC address
-      assigned. This is useful when both the source VM and the cloned VM
-      have to operate on the same network. If you leave this unchanged,
-      all network cards have the same MAC address like the one in the
-      source VM. Depending on how you invoke the wizard you have
-      different choices for the cloning operation. First you need to
-      decide if the clone should be linked to the source VM or if a
-      fully independent clone should be created.
+      VM.
+    </para>
+
+    <para>
+      Enter a new <emphasis role="bold">Name</emphasis> for the clone.
+      You can choose a <emphasis role="bold">Path</emphasis> for the
+      cloned virtual machine, otherwise the default machines folder is
+      used.
+    </para>
+
+    <para>
+      The <emphasis role="bold">Clone Type</emphasis> option is used to
+      specify if the clone should be linked to the source VM, or if a
+      fully independent clone should be created, as follows:
     </para>
 
@@ -2382,5 +2404,5 @@
       <listitem>
         <para>
-          <emphasis role="bold">Full clone:</emphasis> In this mode, all
+          <emphasis role="bold">Full Clone:</emphasis> In this mode, all
           dependent disk images are copied to the new VM folder. The
           clone can fully operate without the source VM.
@@ -2390,5 +2412,5 @@
       <listitem>
         <para>
-          <emphasis role="bold">Linked clone:</emphasis> In this mode,
+          <emphasis role="bold">Linked Clone:</emphasis> In this mode,
           new differencing disk images are created where the parent disk
           images are the source disk images. If you selected the current
@@ -2401,15 +2423,55 @@
 
     <para>
-      After selecting the clone mode, you need to decide what exactly
-      should be cloned. You can always create a clone of the
-      <emphasis>current state</emphasis> only or
-      <emphasis>all</emphasis>. When you select
-      <emphasis>all</emphasis>, the current state and in addition all
-      snapshots are cloned. If you started from a snapshot which has
-      additional children, you can also clone the
-      <emphasis role="italic">current state and all children</emphasis>.
-      This creates a clone starting with this snapshot and includes all
-      child snapshots.
-    </para>
+      The <emphasis role="bold">Snapshots</emphasis> option determines
+      what should be cloned. You can create a clone of the
+      <emphasis role="bold">Current Machine State</emphasis> only or
+      <emphasis role="bold">Everything</emphasis>. When you select
+      <emphasis role="bold">Everything</emphasis>, the current machine
+      state and additionally all snapshots are cloned. If you started
+      from a snapshot which has additional children, you can also clone
+      the <emphasis role="bold">Current Machine State and All
+      Children</emphasis>. This creates a clone starting with this
+      snapshot and includes all child snapshots.
+    </para>
+
+    <para>
+      The following clone options are available:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">MAC Address Policy:</emphasis> Select an
+          option for retaining network card MAC addresses when cloning
+          the VM.
+        </para>
+
+        <para>
+          For example, when you select <emphasis role="bold">Generate
+          New MAC Addresses For All Network Adapters</emphasis> every
+          network card is assigned a new MAC address during cloning.
+          This is the default setting, and is useful when both the
+          source VM and the cloned VM have to operate on the same
+          network. Other options enable you to retain existing MAC
+          addresses in the cloned VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Keep Disk Names:</emphasis> The names of
+          disk images are retained when cloning the VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Keep Hardware UUIDs:</emphasis> Hardware
+          UUIDs are retained when cloning the VM.
+        </para>
+      </listitem>
+
+    </itemizedlist>
 
     <para>
@@ -2421,11 +2483,11 @@
 
     <para>
-      The Clone menu item is disabled while a machine is running.
+      The <emphasis role="bold">Clone</emphasis> menu item is disabled
+      while a machine is running.
     </para>
 
     <para>
       To clone a VM from the command line, see
-      <xref
-    linkend="vboxmanage-clonevm" />.
+      <xref linkend="vboxmanage-clonevm" />.
     </para>
 
@@ -2437,158 +2499,787 @@
 
     <para>
-      VirtualBox can import and export virtual machines in the
-      industry-standard Open Virtualization Format (OVF).
-
-      <footnote>
-
-        <para>
-          OVF support was originally introduced with VirtualBox 2.2 and
-          has seen major improvements with every version since.
-        </para>
-
-      </footnote>
-    </para>
-
-    <para>
-      OVF is a cross-platform standard supported by many virtualization
-      products which allows for creating ready-made virtual machines
-      that can then be imported into a virtualizer such as VirtualBox.
-      VirtualBox makes OVF import and export easy to access and supports
-      it from the Manager window as well as its command-line interface.
-      This allows for packaging so-called <emphasis>virtual
-      appliances</emphasis>. These are disk images, together with
-      configuration settings that can be distributed easily. This way
-      one can offer complete ready-to-use software packages, including
-      operating systems with applications, that need no configuration or
-      installation except for importing into VirtualBox.
-    </para>
-
-    <note>
-      <para>
-        The OVF standard is complex, and support in VirtualBox is an
-        ongoing process. In particular, no guarantee is made that
-        VirtualBox supports all appliances created by other
-        virtualization software. For a list of known limitations, see
-        <xref
+      &product-name; can import and export virtual machines in the
+      following formats:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Open Virtualization Format
+          (OVF).</emphasis> This is the industry-standard format. See
+          <xref linkend="ovf-about"/>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Cloud service formats.</emphasis> Export
+          to cloud services such as &oci; is supported. Import is not
+          supported. See <xref linkend="ovf-export-oci"/>.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+    <sect2 id="ovf-about">
+
+      <title>About the OVF Format</title>
+
+      <para>
+        OVF is a cross-platform standard supported by many
+        virtualization products which enables the creation of ready-made
+        virtual machines that can then be imported into a hypervisor
+        such as &product-name;. &product-name; makes OVF import and
+        export easy to do, using the VirtualBox Manager window or the
+        command-line interface.
+      </para>
+
+      <para>
+        Using OVF enables packaging of <emphasis>virtual
+        appliances</emphasis>. These are disk images, together with
+        configuration settings that can be distributed easily. This way
+        one can offer complete ready-to-use software packages, including
+        operating systems with applications, that need no configuration
+        or installation except for importing into &product-name;.
+      </para>
+
+      <note>
+        <para>
+          The OVF standard is complex, and support in &product-name; is
+          an ongoing process. In particular, no guarantee is made that
+          &product-name; supports all appliances created by other
+          virtualization software. For a list of known limitations, see
+          <xref
         linkend="KnownIssues" />.
-      </para>
-    </note>
-
-    <para>
-      Appliances in OVF format can appear in the following variants:
-    </para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>
-          They can come in several files, as one or several disk images,
-          typically in the widely-used VMDK format. See
-          <xref
-          linkend="vdidetails" />. They also include a
-          textual description file in an XML dialect with an
-          <computeroutput>.ovf</computeroutput> extension. These files
-          must then reside in the same directory for VirtualBox to be
-          able to import them.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Alternatively, the above files can be packed together into a
-          single archive file, typically with an
-          <computeroutput>.ova</computeroutput> extension. Such archive
-          files use a variant of the TAR archive format and can
-          therefore be unpacked outside of VirtualBox with any utility
-          that can unpack standard TAR files.
-        </para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>
-      To <emphasis role="bold">import an appliance</emphasis> in one of
-      the above formats, double-click on the OVF/OVA file.
-
-      <footnote>
-
-        <para>
-          Starting with version 4.0, VirtualBox creates file type
-          associations for OVF and OVA files on your host operating
-          system.
-        </para>
-
-      </footnote>
-
-      Alternatively, select <emphasis role="bold">File</emphasis>,
-      <emphasis role="bold">Import Appliance</emphasis> from the Manager
-      window. In the displayed file dialog, navigate to the file with
-      either the <computeroutput>.ovf</computeroutput> or the
-      <computeroutput>.ova</computeroutput> file extension.
-    </para>
-
-    <para>
-      If VirtualBox can handle the file, a dialog similar to the
-      following will appear:
-    </para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="images/ovf-import.png"
+        </para>
+      </note>
+
+      <para>
+        Appliances in OVF format can appear in the following variants:
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            They can come in several files, as one or several disk
+            images, typically in the widely-used VMDK format. See
+            <xref linkend="vdidetails" />. They also include a textual
+            description file in an XML dialect with an
+            <computeroutput>.ovf</computeroutput> extension. These files
+            must then reside in the same directory for &product-name; to
+            be able to import them.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Alternatively, the above files can be packed together into a
+            single archive file, typically with an
+            <computeroutput>.ova</computeroutput> extension. Such
+            archive files use a variant of the TAR archive format and
+            can therefore be unpacked outside of &product-name; with any
+            utility that can unpack standard TAR files.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <note>
+        <para>
+          OVF cannot describe snapshots that were taken for a virtual
+          machine. As a result, when you export a virtual machine that
+          has snapshots, only the current state of the machine will be
+          exported. The disk images in the export will have a
+          <emphasis>flattened</emphasis> state identical to the current
+          state of the virtual machine.
+        </para>
+      </note>
+
+    </sect2>
+
+    <sect2 id="ovf-import-appliance">
+
+      <title>Importing an Appliance in OVF Format</title>
+
+      <para>
+        To import an appliance in OVF format, use the following steps.
+      </para>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Double-click on the OVF or OVA file.
+          </para>
+
+          <para>
+            &product-name; creates file type associations automatically
+            for any OVF and OVA files on your host operating system.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Select <emphasis role="bold">File</emphasis>,
+            <emphasis role="bold">Import Appliance</emphasis> in the
+            VirtualBox Manager window. In the displayed file dialog,
+            navigate to the file with either the
+            <computeroutput>.ovf</computeroutput> or the
+            <computeroutput>.ova</computeroutput> file extension.
+          </para>
+
+          <para>
+            Click <emphasis role="bold">Import</emphasis>. The
+            <emphasis role="bold">Appliance Settings</emphasis> screen
+            is shown.
+          </para>
+
+          <figure id="fig-import-appliance">
+            <title>Appliance Settings Screen for Import Appliance</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center" fileref="images/ovf-import.png"
                      width="12cm" />
-      </imageobject>
-    </mediaobject>
-
-    <para>
-      This presents the virtual machines described in the OVF file and
-      allows you to change the virtual machine settings by
-      double-clicking on the description items. Once you click on
-      <emphasis
-    role="bold">"Import"</emphasis>, VirtualBox will
-      copy the disk images and create local virtual machines with the
-      settings described in the dialog. These will then show up in the
-      Manager's list of virtual machines.
-    </para>
-
-    <para>
-      Note that since disk images tend to be big, and VMDK images that
-      come with virtual appliances are typically shipped in a special
-      compressed format that is unsuitable for being used by virtual
-      machines directly, the images will need to be unpacked and copied
-      first, which can take a few minutes.
-    </para>
-
-    <para>
-      To import an image using the command line, see
-      <xref
-    linkend="vboxmanage-import" />.
-    </para>
-
-    <para>
-      To <emphasis role="bold">export virtual machines</emphasis> that
-      you already have in VirtualBox, select
-      <emphasis role="bold">File</emphasis>, <emphasis role="bold">
-      Export Appliance</emphasis>. A dialog window is displayed that
-      enables you to combine several virtual machines into an OVF
-      appliance. Select the target location where the target files
-      should be stored, and the conversion process begins. This can take
-      a while.
-    </para>
-
-    <para>
-      To export an image using the command line, see
-      <xref
-    linkend="vboxmanage-export" />.
-    </para>
-
-    <note>
-      <para>
-        OVF cannot describe snapshots that were taken for a virtual
-        machine. As a result, when you export a virtual machine that has
-        snapshots, only the current state of the machine will be
-        exported. The disk images in the export will have a "flattened"
-        state identical to the current state of the virtual machine.
-      </para>
-    </note>
+              </imageobject>
+            </mediaobject>
+          </figure>
+
+          <para>
+            This screen shows the virtual machines described in the OVF
+            or OVA file and enables you to change the virtual machine
+            settings.
+          </para>
+
+          <para>
+            By default, membership of VM groups is preserved on import
+            for VMs that were initially exported from &product-name;.
+            This can be changed using the <emphasis role="bold">Primary
+            Group</emphasis> setting for the VM.
+          </para>
+
+          <para>
+            The following global settings apply for all of the VMs that
+            you are importing:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Base Folder:</emphasis> The
+                directory on the host where the imported VMs are stored.
+              </para>
+
+              <para>
+                If there are multiple VMs in an appliance, you can
+                specify a different directory for each VM by editing the
+                <emphasis role="bold">Base Folder</emphasis> setting for
+                the VM.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">MAC Address Policy</emphasis>: By
+                default, MAC addresses of network cards on your VMs are
+                reinitialized before import. You can choose to preserve
+                MAC addresses on import.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Import Hard Drives as
+                VDI:</emphasis> By default, hard drives are imported in
+                VMDK format. This option enables import in VDI format.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click <emphasis role="bold">Import</emphasis> to import the
+            appliance.
+          </para>
+
+          <para>
+            &product-name; copies the disk images and creates local
+            virtual machines with the settings described in the
+            <emphasis role="bold">Appliance Settings</emphasis> screen.
+            The imported VMs are shown in the list of virtual machines
+            in VirtualBox Manager.
+          </para>
+
+          <para>
+            Note that since disk images tend to be big, and VMDK images
+            that come with virtual appliances are typically shipped in a
+            special compressed format that is unsuitable for being used
+            by virtual machines directly, the images are unpacked and
+            copied first, which can take a few minutes.
+          </para>
+        </listitem>
+
+      </orderedlist>
+
+      <para>
+        To import an appliance using the command line, see
+        <xref linkend="vboxmanage-import" />.
+      </para>
+
+    </sect2>
+
+    <sect2 id="ovf-export-appliance">
+
+      <title>Exporting an Appliance in OVF Format</title>
+
+      <para>
+        To export an appliance in OVF format, use the following steps.
+      </para>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Select <emphasis role="bold">File</emphasis>,
+            <emphasis role="bold"> Export Appliance</emphasis>.
+          </para>
+
+          <para>
+            The <emphasis role="bold">Export Virtual
+            Appliance</emphasis> wizard is shown. The initial window
+            enables you to combine several virtual machines into an OVF
+            appliance.
+          </para>
+
+          <para>
+            Select one or more VMs to export and click
+            <emphasis role="bold">Next</emphasis>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            The <emphasis role="bold">Appliance Settings</emphasis>
+            screen is shown, where you can choose the following
+            settings:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Format:</emphasis> Select an
+                <emphasis role="bold">Open Virtualization
+                Format</emphasis> option for the output files.
+              </para>
+
+              <para>
+                The <emphasis role="bold">&oci;</emphasis> option is
+                used for export to &oci;. See
+                <xref linkend="ovf-export-oci"/>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">File:</emphasis> Select the
+                location where the exported files are to be stored.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">MAC Address Policy:</emphasis>
+                Select an option for retaining network card MAC
+                addresses on export.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Write Manifest File:</emphasis>
+                Enables you to include a manifest file in the exported
+                archive file.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Include ISO Image
+                Files:</emphasis> Enables you to include ISO image files
+                in the exported archive file.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click <emphasis role="bold">Next</emphasis> to display the
+            <emphasis role="bold">Virtual System Settings</emphasis>
+            screen.
+          </para>
+
+          <para>
+            You can edit settings for the virtual appliance. For
+            example, you can change the name and add product information
+            such as vendor details or license text.
+          </para>
+
+          <para>
+            To change a setting, double-click on the required field.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click <emphasis role="bold">Export</emphasis> and the export
+            process begins. Note that this can take a while.
+          </para>
+        </listitem>
+
+      </orderedlist>
+
+      <para>
+        To export an appliance using the command line, see
+        <xref linkend="vboxmanage-export" />.
+      </para>
+
+    </sect2>
+
+<!-- New content for 6.0 -->
+
+    <sect2 id="ovf-export-oci">
+
+      <title>Exporting an Appliance to &oci;</title>
+
+      <para>
+        &product-name; supports the export of VMs to an &oci; service.
+      </para>
+
+      <para>
+        Before you export a VM to &oci;, you need to do the following:
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            Generate an API signing key pair. This is used for API
+            requests to &oci;.
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                The key pair is usually installed in the
+                <computeroutput>.oci</computeroutput> folder in your
+                home directory. For example,
+                <computeroutput>~/.oci</computeroutput> on a Linux
+                system.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The public key of the key pair must be uploaded to the
+                cloud service.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para>
+            Instructions for creating and uploading an API signing key
+            for &oci; are at:
+          </para>
+
+          <para>
+            <ulink url="https://docs.cloud.oracle.com/iaas/Content/API/Concepts/apisigningkey.htm#How">https://docs.cloud.oracle.com/iaas/Content/API/Concepts/apisigningkey.htm#How</ulink>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Create a profile for your cloud account.
+          </para>
+
+          <para>
+            The cloud profile contains resource identifiers for your
+            cloud account, such as your user OCID, and the fingerprint
+            for your public key. You can create a cloud profile in the
+            following ways:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                Automatically, using the <emphasis role="bold">Cloud
+                Profile Manager</emphasis>. See
+                <xref linkend="ovf-cloud-profile-manager"/>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Manually, by creating an
+                <computeroutput>oci_config</computeroutput> file in your
+                &product-name; global configuration directory. For
+                example, this is
+                <computeroutput>$HOME/.config/VirtualBox/oci_config</computeroutput>
+                on a Linux host.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Manually, by creating a
+                <computeroutput>config</computeroutput> file in your
+                &oci; configuration directory. For example, this is
+                <computeroutput>$HOME/.oci/config</computeroutput> on a
+                Linux host.
+              </para>
+
+              <para>
+                This is the same file that is used by the &oci; Command
+                Line Interface.
+              </para>
+
+              <para>
+                &product-name; uses this file automatically if a cloud
+                profile file is not present in your global configuration
+                directory. Alternatively, you can import this file
+                manually into the Cloud Profile Manager.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para>
+            For information on cloud profile settings used by &oci; see
+            the following:
+          </para>
+
+          <para>
+            <ulink url="https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm">https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm</ulink>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Ensure that the subnet used by source VMs are available in
+            the target compartment on the cloud service.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <para>
+        To export a VM to &oci;, use the following steps.
+      </para>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Select <emphasis role="bold">File</emphasis>,
+            <emphasis role="bold"> Export Appliance</emphasis>.
+          </para>
+
+          <para>
+            The <emphasis role="bold">Export Virtual
+            Appliance</emphasis> wizard is shown.
+          </para>
+
+          <para>
+            Select a VM to export and click
+            <emphasis role="bold">Next</emphasis>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            The <emphasis role="bold">Appliance Settings</emphasis>
+            screen is shown.
+          </para>
+
+          <para>
+            In the <emphasis role="bold">Format</emphasis> drop-down
+            list, select <emphasis role="bold">&oci;</emphasis>.
+          </para>
+
+          <para>
+            In the <emphasis role="bold">Account</emphasis> drop-down
+            list, select your &oci; account.
+          </para>
+
+          <para>
+            &oci; accounts can be set up using the Cloud Profile
+            Manager.
+          </para>
+
+          <para>
+            The window below the
+            <emphasis role="bold">Account</emphasis> field displays the
+            profile settings for your cloud account.
+          </para>
+
+          <figure id="fig-export-appliance-oci">
+            <title>Appliance Settings Screen, Showing Cloud Profile Settings</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center" fileref="images/export-appliance-oci.png"
+                  width="12cm" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+
+          <para>
+            Click <emphasis role="bold">Next</emphasis>. &product-name;
+            makes an API request to the &oci; service.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            The <emphasis role="bold">Virtual System Settings</emphasis>
+            screen is shown.
+          </para>
+
+          <para>
+            You can edit settings used for the virtual machine on &oci;.
+            For example, you can edit the Disk Size and Shape used for
+            the VM instance.
+          </para>
+
+          <para>
+            Click <emphasis role="bold">Export</emphasis> to export the
+            virtual machines to the cloud service.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            The VMs are uploaded to &oci;.
+          </para>
+
+          <para>
+            Instances are created for the uploaded VMs.
+          </para>
+
+          <para>
+            If the <emphasis role="bold">Launch Instance</emphasis>
+            setting was enabled on the <emphasis role="bold">Virtual
+            System Settings</emphasis> screen, the VM instance is
+            started.
+          </para>
+
+          <para>
+            You can monitor the export process using the &oci; Console.
+          </para>
+        </listitem>
+
+      </orderedlist>
+
+    </sect2>
+
+    <sect2 id="ovf-cloud-profile-manager">
+
+      <title>The Cloud Profile Manager</title>
+
+      <para>
+        The Cloud Profile Manager is a component of &product-name; that
+        enables you to create, edit, and manage cloud profiles for your
+        cloud service accounts.
+      </para>
+
+      <figure id="fig-cloud-profile-manager">
+        <title>The Cloud Profile Manager</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="images/cloud-profile-manager.png"
+              width="12cm" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>
+        To display the Cloud Profile Manager select
+        <emphasis role="bold">File</emphasis>,
+        <emphasis role="bold">Cloud Profile Manager</emphasis> in the
+        VirtualBox Manager window.
+      </para>
+
+      <para>
+        You can use the Cloud Profile Manager to create a new cloud
+        profile automatically, or you can create a cloud profile by
+        importing settings from your &oci; configuration file into the
+        Cloud Profile Manager.
+      </para>
+
+      <para>
+        To create a new cloud profile, do the following:
+      </para>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Click the <emphasis role="bold">Add</emphasis> icon and
+            specify a <emphasis role="bold">Name</emphasis> for the
+            profile.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click <emphasis role="bold">Properties</emphasis> and enter
+            the following settings for the profile:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                Compartment OCID
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Fingerprint of the public key
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Location of the private key on the client device
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                (Optional) Passphrase for the private key, if the key is
+                encrypted
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Region OCID
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Tenancy OCID
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                User OCID
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para>
+            Some of these are settings for your &oci; account. They can
+            be viewed using the &oci; Console.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click <emphasis role="bold">Apply</emphasis> to save your
+            changes.
+          </para>
+
+          <para>
+            Settings for your cloud profile are added to the
+            <computeroutput>oci_config</computeroutput> file in your
+            &product-name; global settings directory.
+          </para>
+        </listitem>
+
+      </orderedlist>
+
+      <para>
+        To import an existing &oci; configuration file, do the
+        following:
+      </para>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Ensure that a <computeroutput>config</computeroutput> file
+            is present in your &oci; configuration directory. For
+            example, this is
+            <computeroutput>$HOME/.oci/config</computeroutput> on a
+            Linux host.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click the <emphasis role="bold">Import</emphasis> icon.
+          </para>
+
+          <para>
+            A dialog prompting you to import cloud profiles from
+            external files is shown.
+          </para>
+
+          <warning>
+            <para>
+              The dialog warns you that any cloud profiles in your
+              &product-name; global settings directory will be
+              overwritten.
+            </para>
+          </warning>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click <emphasis role="bold">Import</emphasis>.
+          </para>
+
+          <para>
+            Settings for your cloud profile are added to the
+            <computeroutput>oci_config</computeroutput> file in your
+            &product-name; global settings directory.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click <emphasis role="bold">Properties</emphasis> to display
+            settings for the cloud profile.
+          </para>
+
+          <para>
+            To change a setting, double-click on the required field.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click <emphasis role="bold">Apply</emphasis> to save your
+            changes.
+          </para>
+        </listitem>
+
+      </orderedlist>
+
+    </sect2>
 
   </sect1>
@@ -2599,9 +3290,9 @@
 
     <para>
-      The Global Settings dialog can be displayed using the
-      <emphasis role="bold">File</emphasis> menu, by clicking the
-      <emphasis role="bold">Preferences</emphasis> item. This dialog
-      offers a selection of settings, most of which apply to all virtual
-      machines of the current user. The
+      The <emphasis role="bold">Global Settings</emphasis> dialog can be
+      displayed using the <emphasis role="bold">File</emphasis> menu, by
+      clicking the <emphasis role="bold">Preferences</emphasis> item.
+      This dialog offers a selection of settings, most of which apply to
+      all virtual machines of the current user. The
       <emphasis role="bold">Extensions</emphasis> option applies to the
       entire system.
@@ -2625,11 +3316,10 @@
         <para>
           <emphasis role="bold">Input.</emphasis> Enables the user to
-          specify the Host yey. It identifies the key that toggles
+          specify the Host key. It identifies the key that toggles
           whether the cursor is in the focus of the VM or the Host
           operating system windows, see
           <xref linkend="keyb_mouse_normal"/>, and which is also used to
           trigger certain VM actions, see
-          <xref
-         linkend="specialcharacters"/>.
+          <xref linkend="specialcharacters"/>.
         </para>
       </listitem>
@@ -2652,5 +3342,6 @@
         <para>
           <emphasis role="bold">Display.</emphasis> Enables the user to
-          specify the screen resolution, and its width and height.
+          specify the screen resolution, and its width and height. A
+          default scale factor can be specified for all guest screens.
         </para>
       </listitem>
@@ -2687,16 +3378,17 @@
     <para>
       As briefly mentioned in <xref linkend="features-overview" />,
-      VirtualBox has a very flexible internal design that allows for
-      using multiple interfaces to control the same virtual machines.
-      For example, you can start a virtual machine with the VirtualBox
-      Manager window and then stop it from the command line. With
-      VirtualBox's support for the Remote Desktop Protocol (RDP), you
-      can even run virtual machines remotely on a headless server and
-      have all the graphical output redirected over the network.
-    </para>
-
-    <para>
-      The following front-ends are shipped in the standard VirtualBox
-      package:
+      &product-name; has a very flexible internal design that enables
+      you to use multiple interfaces to control the same virtual
+      machines. For example, you can start a virtual machine with the
+      VirtualBox Manager window and then stop it from the command line.
+      With &product-name;'s support for the Remote Desktop Protocol
+      (RDP), you can even run virtual machines remotely on a headless
+      server and have all the graphical output redirected over the
+      network.
+    </para>
+
+    <para>
+      The following front-ends are shipped in the standard
+      &product-name; package:
     </para>
 
@@ -2705,17 +3397,19 @@
       <listitem>
         <para>
-          <computeroutput>VirtualBox</computeroutput> is the VirtualBox
-          Manager. This graphical user interface uses the Qt toolkit,
-          and is described throughout this User Manual. While this is
-          the simplest and easiest front-end to use, some of the more
-          advanced VirtualBox features are not included.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>VBoxManage</computeroutput> is a command-line
+          <emphasis role="bold">VirtualBox.</emphasis> This is the
+          VirtualBox Manager, a graphical user interface that uses the
+          Qt toolkit. This interface is described throughout this
+          manual. While this is the simplest and easiest front-end to
+          use, some of the more advanced &product-name; features are not
+          included.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">VBoxManage.</emphasis> A command-line
           interface for automated and detailed control of every aspect
-          of VirtualBox. See <xref
+          of &product-name;. See
+          <xref
           linkend="vboxmanage" />.
         </para>
@@ -2724,18 +3418,5 @@
       <listitem>
         <para>
-          <computeroutput>VBoxSDL</computeroutput> is an alternative,
-          simple graphical front-end with an intentionally limited
-          feature set, designed to only display virtual machines that
-          are controlled in detail with
-          <computeroutput>VBoxManage</computeroutput>. This can be used
-          in environments where displaying all the features of the full
-          GUI is not feasible. See <xref
-          linkend="vboxsdl" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>VBoxHeadless</computeroutput> is a front-end
+          <emphasis role="bold">VBoxHeadless.</emphasis> A front-end
           that produces no visible output on the host at all, but can
           act as a RDP server if the VirtualBox Remote Desktop Extension
@@ -2745,6 +3426,5 @@
           host your virtual machines on a headless Linux server that has
           no X Window system installed. See
-          <xref
-          linkend="vboxheadless" />.
+          <xref linkend="vboxheadless" />.
         </para>
       </listitem>
@@ -2755,7 +3435,7 @@
       If the above front-ends still do not satisfy your particular
       needs, it is possible to create yet another front-end to the
-      complex virtualization engine that is the core of VirtualBox, as
-      the VirtualBox core neatly exposes all of its features in a clean
-      API. See <xref linkend="VirtualBoxAPI" />.
+      complex virtualization engine that is the core of &product-name;,
+      as the &product-name; core neatly exposes all of its features in a
+      clean API. See <xref linkend="VirtualBoxAPI" />.
     </para>
 
Index: trunk/doc/manual/en_US/user_KnownIssues.xml
===================================================================
--- trunk/doc/manual/en_US/user_KnownIssues.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_KnownIssues.xml	(revision 76078)
@@ -14,5 +14,5 @@
 
     <para>
-      Some VirtualBox features are labeled as experimental. Such
+      Some &product-name; features are labeled as experimental. Such
       features are provided on an "as-is" basis and are not formally
       supported. However, feedback and suggestions about such features
@@ -26,5 +26,5 @@
         <para>
           Hardware 3D acceleration support for Windows, Linux, and
-          Solaris guests
+          Oracle Solaris guests
         </para>
       </listitem>
@@ -69,5 +69,11 @@
       <listitem>
         <para>
-          Support of iSCSI via internal networking
+          Support of iSCSI using internal networking
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Using &product-name; and Hyper-V on the same host
         </para>
       </listitem>
@@ -83,6 +89,6 @@
     <para>
       The following section describes known problems with this release
-      of VirtualBox. Unless marked otherwise, these issues are planned
-      to be fixed in later releases.
+      of &product-name;. Unless marked otherwise, these issues are
+      planned to be fixed in later releases.
     </para>
 
@@ -101,8 +107,8 @@
               <emphasis role="bold">Poor performance</emphasis> with
               32-bit guests on AMD CPUs. This affects mainly Windows and
-              Solaris guests, but possibly also some Linux kernel
-              revisions. Partially solved in 3.0.6 for 32 bits Windows
-              NT, 2000, XP and 2003 guests. Requires 3.0.6 or higher
-              Guest Additions to be installed.
+              Oracle Solaris guests, but possibly also some Linux kernel
+              revisions. Partially solved in 3.0.6 for 32-bit Windows
+              NT, 2000, XP, and 2003 guests. Requires Guest Additions
+              3.0.6 or later to be installed.
             </para>
           </listitem>
@@ -113,8 +119,9 @@
               32-bit guests on certain Intel CPU models that do not
               include virtual APIC hardware optimization support. This
-              affects mainly Windows and Solaris guests, but possibly
-              also some Linux kernel revisions. Partially solved in
-              3.0.12 for 32 bits Windows NT, 2000, XP, and 2003 guests.
-              Requires 3.0.12 or higher Guest Additions to be installed.
+              affects mainly Windows and Oracle Solaris guests, but
+              possibly also some Linux kernel revisions. Partially
+              solved in 3.0.12 for 32-bit Windows NT, 2000, XP, and 2003
+              guests. Requires Guest Additions 3.0.12 or later to be
+              installed.
             </para>
           </listitem>
@@ -136,19 +143,19 @@
           For <emphasis role="bold">basic Direct3D support in Windows
           guests</emphasis> to work, the Guest Additions must be
-          installed in Windows "safe mode". Press F8 when the Windows
-          guest is booting and select "Safe mode", then install the
-          Guest Additions. Otherwise the Windows file protection
-          mechanism will interfere with the replacement DLLs installed
-          by VirtualBox and keep restoring the original Windows system
-          DLLs.
-
-          <note>
-            <para>
-              This does <emphasis>not</emphasis> apply to the WDDM
-              Direct3D video driver available for Vista and Windows 7
-              guests shipped with VirtualBox 4.1.
-            </para>
-          </note>
-        </para>
+          installed in Windows safe mode. Press F8 when the Windows
+          guest is booting and select <emphasis role="bold">Safe
+          Mode</emphasis>, then install the Guest Additions. Otherwise
+          the Windows file protection mechanism will interfere with the
+          replacement DLLs installed by &product-name; and keep
+          restoring the original Windows system DLLs.
+        </para>
+
+        <note>
+          <para>
+            This does <emphasis>not</emphasis> apply to the WDDM
+            Direct3D video driver available for Vista and Windows 7
+            guests shipped with &product-name; 4.1.
+          </para>
+        </note>
       </listitem>
 
@@ -156,5 +163,5 @@
         <para>
           <emphasis role="bold">Guest control.</emphasis> On Windows
-          guests, a process lauched via the guest control execute
+          guests, a process started using the guest control execute
           support will not be able to display a graphical user interface
           <emphasis>unless</emphasis> the user account under which it is
@@ -166,10 +173,10 @@
           guest's group policy must be changed. To do so, open the group
           policy editor on the command line by typing
-          <computeroutput>gpedit.msc</computeroutput>, open the key
-          <emphasis>Computer Configuration\Windows Settings\Security
-          Settings\Local Policies\Security Options</emphasis> and change
-          the value of <emphasis>Accounts: Limit local account use of
-          blank passwords to console logon only</emphasis> to
-          <emphasis>Disabled</emphasis>.
+          <command>gpedit.msc</command>, open the key
+          <computeroutput>Computer Configuration\Windows
+          Settings\Security Settings\Local Policies\Security
+          Options</computeroutput> and change the value of
+          <computeroutput>Accounts: Limit local account use of blank
+          passwords to console logon only</computeroutput> to Disabled.
         </para>
       </listitem>
@@ -178,10 +185,10 @@
         <para>
           <emphasis role="bold">Compacting virtual disk images is
-          limited to VDI files.</emphasis> The <code>VBoxManage modifyhd
-          --compact</code> command is currently only implemented for VDI
-          files. At the moment the only way to optimize the size of a
-          virtual disk images in other formats (VMDK, VHD) is to clone
-          the image and then use the cloned image in the VM
-          configuration.
+          limited to VDI files.</emphasis> The <command>VBoxManage
+          modifyhd --compact</command> command is currently only
+          implemented for VDI files. At the moment the only way to
+          optimize the size of a virtual disk images in other formats,
+          such as VMDK or VHD, is to clone the image and then use the
+          cloned image in the VM configuration.
         </para>
       </listitem>
@@ -218,5 +225,5 @@
           <listitem>
             <para>
-              Remote files via HTTP or other mechanisms are not yet
+              Remote files using HTTP or other mechanisms are not yet
               supported.
             </para>
@@ -238,7 +245,8 @@
       <listitem>
         <para>
-          The RDP server in the VirtualBox extension pack supports only
-          audio streams in format 22.05kHz stereo 16 bit. If the RDP
-          client requests any other audio format there will be no audio.
+          The RDP server in the &product-name; extension pack supports
+          only audio streams in format 22.05kHz stereo 16 bit. If the
+          RDP client requests any other audio format there will be no
+          audio.
         </para>
       </listitem>
@@ -298,6 +306,6 @@
           <listitem>
             <para>
-              VirtualBox does not provide Guest Additions for Mac OS X
-              at this time.
+              &product-name; does not provide Guest Additions for Mac OS
+              X at this time.
             </para>
           </listitem>
@@ -330,17 +338,20 @@
           <listitem>
             <para>
-              By default, the VirtualBox EFI enables debug output of the
-              Mac OS X kernel to help you diagnose boot problems. Note
-              that there is a lot of output and not all errors are
+              By default, the &product-name; EFI enables debug output of
+              the Mac OS X kernel to help you diagnose boot problems.
+              Note that there is a lot of output and not all errors are
               fatal. They would also show when using a physical Apple
               Macintosh computer. You can turn off these messages by
-              issuing this command:
+              using the following command:
+            </para>
 
 <screen>VBoxManage setextradata "VM name" "VBoxInternal2/EfiBootArgs" "  "</screen>
 
-              To revert to the previous behavior, use:
+            <para>
+              To revert to the previous behavior, use the following
+              command:
+            </para>
 
 <screen>VBoxManage setextradata "VM name" "VBoxInternal2/EfiBootArgs" ""</screen>
-            </para>
           </listitem>
 
@@ -358,5 +369,5 @@
       <listitem>
         <para>
-          <emphasis role="bold">Solaris hosts:</emphasis>
+          <emphasis role="bold">Oracle Solaris hosts:</emphasis>
         </para>
 
@@ -365,14 +376,14 @@
           <listitem>
             <para>
-              There is no support for USB devices connected to Solaris
-              10 hosts.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              USB support on Solaris hosts requires Solaris 11 version
-              snv_124 or higher. Webcams and other isochronous devices
-              are known to have poor performance.
+              There is no support for USB devices connected to Oracle
+              Solaris 10 hosts.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              USB support on Oracle Solaris hosts requires Oracle
+              Solaris 11 version snv_124 or later. Webcams and other
+              isochronous devices are known to have poor performance.
             </para>
           </listitem>
@@ -381,7 +392,7 @@
             <para>
               Host Webcam passthrough is restricted to 640x480 frames at
-              20 frames per second due to limitations in the Solaris
-              V4L2 API. This may be addressed in a future Solaris
-              release.
+              20 frames per second due to limitations in the Oracle
+              Solaris V4L2 API. This may be addressed in a future Oracle
+              Solaris release.
             </para>
           </listitem>
@@ -403,10 +414,11 @@
           <listitem>
             <para>
-              Crossbow-based bridged networking on Solaris 11 hosts does
-              not work directly with aggregate links. However, you can
-              use <computeroutput>dladm</computeroutput> to manually
-              create a VNIC over the aggregate link and use that with a
-              VM. This limitation does not exist in Solaris 11u1 build
-              17 and newer.
+              Crossbow-based bridged networking on Oracle Solaris 11
+              hosts does not work directly with aggregate links.
+              However, you can use
+              <computeroutput>dladm</computeroutput> to manually create
+              a VNIC over the aggregate link and use that with a VM.
+              This limitation does not exist in Oracle Solaris 11u1
+              build 17 and newer.
             </para>
           </listitem>
@@ -418,8 +430,8 @@
         <para>
           <emphasis role="bold">Guest Additions of version 4.1, 4.1.2
-          and 4.1.4 for Windows.</emphasis> The VirtualBox WDDM Video
-          driver may be installed and remain in the guest system when
-          Guest additions uninstallation is performed. This is caused by
-          a bug in Guest Additions uninstaller.
+          and 4.1.4 for Windows.</emphasis> The &product-name; WDDM
+          Video driver may be installed and remain in the guest system
+          when Guest additions uninstallation is performed. This is
+          caused by a bug in Guest Additions uninstaller.
         </para>
 
@@ -433,14 +445,15 @@
 
         <para>
-          To solve this problem, uninstall the VirtualBox WDDM Video
+          To solve this problem, uninstall the &product-name; WDDM Video
           driver manually. Open Device Manager, and check whether the
-          Display Adapter is named "VirtualBox Graphics Adapter ..". If
-          not, there is nothing to be done. If it is, right-click the
-          VirtualBox Graphics Adapter in Device Manager, select
+          Display Adapter is named "&product-name; Graphics Adapter ..".
+          If not, there is nothing to be done. If it is, right-click the
+          &product-name; Graphics Adapter in Device Manager, select
           <emphasis role="bold">Uninstall</emphasis>, check
           <emphasis role="bold">Delete the Driver Software for this
           Device</emphasis> and click
           <emphasis role="bold">OK</emphasis>. Once uninstallation is
-          done, start Device Manager, go to the Action menu and select
+          done, start Device Manager, go to the
+          <emphasis role="bold">Action</emphasis> menu and select
           <emphasis role="bold">Scan for Hardware Change</emphasis>s to
           ensure that the correct Windows default driver be picked up
Index: trunk/doc/manual/en_US/user_Networking.xml
===================================================================
--- trunk/doc/manual/en_US/user_Networking.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_Networking.xml	(revision 76078)
@@ -10,5 +10,5 @@
 
   <para>
-    As mentioned in <xref linkend="settings-network" />, VirtualBox
+    As mentioned in <xref linkend="settings-network" />, &product-name;
     provides up to eight virtual PCI Ethernet cards for each virtual
     machine. For each such card, you can individually select the
@@ -34,9 +34,10 @@
 
   <para>
-    Four of the network cards can be configured in the Network section
-    of the settings dialog in the graphical user interface of
-    VirtualBox. You can configure all eight network cards on the command
-    line using VBoxManage modifyvm. See
-    <xref linkend="vboxmanage-modifyvm" />.
+    Four of the network cards can be configured in the
+    <emphasis role="bold">Network</emphasis> section of the
+    <emphasis role="bold">Settings</emphasis> dialog in the graphical
+    user interface of &product-name;. You can configure all eight
+    network cards on the command line using <command>VBoxManage
+    modifyvm</command>. See <xref linkend="vboxmanage-modifyvm" />.
   </para>
 
@@ -53,5 +54,5 @@
       For each card, you can individually select what kind of
       <emphasis>hardware</emphasis> will be presented to the virtual
-      machine. VirtualBox can virtualize the following types of
+      machine. &product-name; can virtualize the following types of
       networking hardware:
     </para>
@@ -115,13 +116,13 @@
     <para>
       The Paravirtualized network adapter (virtio-net) is special. If
-      you select this adapter, then VirtualBox does
+      you select this adapter, then &product-name; does
       <emphasis>not</emphasis> virtualize common networking hardware
       that is supported by common guest operating systems. Instead,
-      VirtualBox expects a special software interface for virtualized
-      environments to be provided by the guest, thus avoiding the
-      complexity of emulating networking hardware and improving network
-      performance. Starting with version 3.1, VirtualBox provides
-      support for the industry-standard <emphasis>virtio</emphasis>
-      networking drivers, which are part of the open source KVM project.
+      &product-name; expects a special software interface for
+      virtualized environments to be provided by the guest, thus
+      avoiding the complexity of emulating networking hardware and
+      improving network performance. &product-name; provides support for
+      the industry-standard <emphasis>virtio</emphasis> networking
+      drivers, which are part of the open source KVM project.
     </para>
 
@@ -149,5 +150,5 @@
         <para>
           <ulink
-              url="http://www.linux-kvm.org/page/WindowsGuestDrivers"/>.
+            url="http://www.linux-kvm.org/page/WindowsGuestDrivers">http://www.linux-kvm.org/page/WindowsGuestDrivers</ulink>.
         </para>
       </listitem>
@@ -156,5 +157,5 @@
 
     <para>
-      VirtualBox also has limited support for <emphasis>jumbo
+      &product-name; also has limited support for <emphasis>jumbo
       frames</emphasis>. These are networking packets with more than
       1500 bytes of data, provided that you use the Intel card
@@ -185,5 +186,5 @@
         <para>
           <emphasis role="bold">Not attached.</emphasis> In this mode,
-          VirtualBox reports to the guest that a network card is
+          &product-name; reports to the guest that a network card is
           present, but that there is no connection. This is as if no
           Ethernet cable was plugged into the card. Using this mode, it
@@ -209,7 +210,7 @@
       <listitem>
         <para>
-          <emphasis role="bold">NAT Network.</emphasis> The NAT network
-          is a new NAT flavour introduced in VirtualBox 4.3. See
-          <xref linkend="network_nat_service"/>.
+          <emphasis role="bold">NAT Network.</emphasis> A NAT network is
+          a type of internal network that allows outbound connections.
+          See <xref linkend="network_nat_service"/>.
         </para>
       </listitem>
@@ -220,7 +221,7 @@
           for more advanced networking needs, such as network
           simulations and running servers in a guest. When enabled,
-          VirtualBox connects to one of your installed network cards and
-          exchanges network packets directly, circumventing your host
-          operating system's network stack.
+          &product-name; connects to one of your installed network cards
+          and exchanges network packets directly, circumventing your
+          host operating system's network stack.
         </para>
       </listitem>
@@ -251,5 +252,5 @@
           used modes which share the same generic network interface, by
           allowing the user to select a driver which can be included
-          with VirtualBox or be distributed in an extension pack.
+          with &product-name; or be distributed in an extension pack.
         </para>
 
@@ -275,5 +276,5 @@
               Distributed Ethernet switch on a Linux or a FreeBSD host.
               At the moment this option requires compilation of
-              VirtualBox from sources, as the Oracle packages do not
+              &product-name; from sources, as the Oracle packages do not
               include it.
             </para>
@@ -302,51 +303,121 @@
           <row>
             <entry></entry>
-            <entry><emphasis role="bold">VM&rarr;Host</emphasis></entry>
-            <entry><emphasis role="bold">VM&larr;Host</emphasis></entry>
-            <entry><emphasis role="bold">VM1&harr;VM2</emphasis></entry>
-            <entry><emphasis role="bold">VM&rarr;Net/LAN</emphasis></entry>
-            <entry><emphasis role="bold">VM&larr;Net/LAN</emphasis></entry>
+            <entry><para>
+                <emphasis role="bold">VM&rarr;Host</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">VM&larr;Host</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">VM1&harr;VM2</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">VM&rarr;Net/LAN</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">VM&larr;Net/LAN</emphasis>
+              </para></entry>
           </row>
         </thead>
         <tbody valign="middle">
           <row>
-            <entry>Host-only</entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry align="center"><emphasis role="bold">+</emphasis></entry>
-            <entry>&ndash;</entry>
-            <entry>&ndash;</entry>
+            <entry><para>
+                Host-only
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry align="center"><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                &ndash;
+              </para></entry>
+            <entry><para>
+                &ndash;
+              </para></entry>
           </row>
           <row>
-            <entry>Internal</entry>
-            <entry>&ndash;</entry>
-            <entry>&ndash;</entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry>&ndash;</entry>
-            <entry>&ndash;</entry>
+            <entry><para>
+                Internal
+              </para></entry>
+            <entry><para>
+                &ndash;
+              </para></entry>
+            <entry><para>
+                &ndash;
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                &ndash;
+              </para></entry>
+            <entry><para>
+                &ndash;
+              </para></entry>
           </row>
           <row>
-            <entry>Bridged</entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
+            <entry><para>
+                Bridged
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
           </row>
           <row>
-            <entry>NAT</entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><link linkend="natforward">Port forward</link></entry>
-            <entry>&ndash;</entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><link linkend="natforward">Port forward</link></entry>
+            <entry><para>
+                NAT
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <link linkend="natforward">Port forward</link>
+              </para></entry>
+            <entry><para>
+                &ndash;
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <link linkend="natforward">Port forward</link>
+              </para></entry>
           </row>
           <row>
-            <entry>NATservice</entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><link linkend="network_nat_service">Port forward</link></entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><emphasis role="bold">+</emphasis></entry>
-            <entry><link linkend="network_nat_service">Port forward</link></entry>
+            <entry><para>
+                NATservice
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <link linkend="network_nat_service">Port forward</link>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <emphasis role="bold">+</emphasis>
+              </para></entry>
+            <entry><para>
+                <link linkend="network_nat_service">Port forward</link>
+              </para></entry>
           </row>
         </tbody>
@@ -369,5 +440,6 @@
       an external network from a virtual machine. Usually, it does not
       require any configuration on the host network and guest system.
-      For this reason, it is the default networking mode in VirtualBox.
+      For this reason, it is the default networking mode in
+      &product-name;.
     </para>
 
@@ -375,9 +447,9 @@
       A virtual machine with NAT enabled acts much like a real computer
       that connects to the Internet through a router. The router, in
-      this case, is the VirtualBox networking engine, which maps traffic
-      from and to the virtual machine transparently. In VirtualBox this
-      router is placed between each virtual machine and the host. This
-      separation maximizes security since by default virtual machines
-      cannot talk to each other.
+      this case, is the &product-name; networking engine, which maps
+      traffic from and to the virtual machine transparently. In
+      &product-name; this router is placed between each virtual machine
+      and the host. This separation maximizes security since by default
+      virtual machines cannot talk to each other.
     </para>
 
@@ -391,12 +463,12 @@
     <para>
       The network frames sent out by the guest operating system are
-      received by VirtualBox's NAT engine, which extracts the TCP/IP
+      received by &product-name;'s NAT engine, which extracts the TCP/IP
       data and resends it using the host operating system. To an
       application on the host, or to another computer on the same
       network as the host, it looks like the data was sent by the
-      VirtualBox application on the host, using an IP address belonging
-      to the host. VirtualBox listens for replies to the packages sent,
-      and repacks and resends them to the guest machine on its private
-      network.
+      &product-name; application on the host, using an IP address
+      belonging to the host. &product-name; listens for replies to the
+      packages sent, and repacks and resends them to the guest machine
+      on its private network.
     </para>
 
@@ -404,10 +476,10 @@
       The virtual machine receives its network address and configuration
       on the private network from a DHCP server integrated into
-      VirtualBox. The IP address thus assigned to the virtual machine is
-      usually on a completely different network than the host. As more
-      than one card of a virtual machine can be set up to use NAT, the
-      first card is connected to the private network 10.0.2.0, the
-      second card to the network 10.0.3.0 and so on. If you need to
-      change the guest-assigned IP range, see
+      &product-name;. The IP address thus assigned to the virtual
+      machine is usually on a completely different network than the
+      host. As more than one card of a virtual machine can be set up to
+      use NAT, the first card is connected to the private network
+      10.0.2.0, the second card to the network 10.0.3.0 and so on. If
+      you need to change the guest-assigned IP range, see
       <xref linkend="changenat" />.
     </para>
@@ -419,10 +491,10 @@
       <para>
         As the virtual machine is connected to a private network
-        internal to VirtualBox and invisible to the host, network
+        internal to &product-name; and invisible to the host, network
         services on the guest are not accessible to the host machine or
         to other computers on the same network. However, like a physical
-        router, VirtualBox can make selected services available to the
-        world outside the guest through <emphasis>port
-        forwarding</emphasis>. This means that VirtualBox listens to
+        router, &product-name; can make selected services available to
+        the world outside the guest through <emphasis>port
+        forwarding</emphasis>. This means that &product-name; listens to
         certain ports on the host and resends all packets which arrive
         there to the guest, on the same or a different port.
@@ -430,5 +502,5 @@
 
       <para>
-        To an application on the host or other physical (or virtual)
+        To an application on the host or other physical or virtual
         machines on the network, it looks as though the service being
         proxied is actually running on the host. This also means that
@@ -442,14 +514,15 @@
 
       <para>
-        To configure port forwarding you can use the graphical Port
-        Forwarding editor which can be found in the Network Settings
-        dialog for network adaptors configured to use NAT. Here, you can
-        map host ports to guest ports to allow network traffic to be
-        routed to a specific port in the guest.
+        To configure port forwarding you can use the graphical
+        <emphasis role="bold">Port Forwarding</emphasis> editor which
+        can be found in the <emphasis role="bold">Network
+        Settings</emphasis> dialog for network adaptors configured to
+        use NAT. Here, you can map host ports to guest ports to allow
+        network traffic to be routed to a specific port in the guest.
       </para>
 
       <para>
         Alternatively, the command line tool
-        <computeroutput>VBoxManage</computeroutput> can be used. See
+        <command>VBoxManage</command> can be used. See
         <xref linkend="vboxmanage-modifyvm" />.
       </para>
@@ -463,8 +536,10 @@
         <computeroutput>ssh</computeroutput> server in the guest, use
         the following command:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --natpf1 "guestssh,tcp,,2222,,22"</screen>
 
-        With the above example, all TCP traffic arriving on port 2222 on
+      <para>
+        In the above example, all TCP traffic arriving on port 2222 on
         any host interface will be forwarded to port 22 in the guest.
         The protocol name <computeroutput>tcp</computeroutput> is a
@@ -473,21 +548,24 @@
         used. The name <computeroutput>guestssh</computeroutput> is
         purely descriptive and will be auto-generated if omitted. The
-        number after <computeroutput>--natpf</computeroutput> denotes
-        the network card, as with other VBoxManage command.
+        number after <option>--natpf</option> denotes the network card,
+        as with other <command>VBoxManage</command> commands.
       </para>
 
       <para>
         To remove this forwarding rule, use the following command:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --natpf1 delete "guestssh"</screen>
-      </para>
 
       <para>
         If for some reason the guest uses a static assigned IP address
         not leased from the built-in DHCP server, it is required to
-        specify the guest IP when registering the forwarding rule:
+        specify the guest IP when registering the forwarding rule, as
+        follows:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --natpf1 "guestssh,tcp,,2222,10.0.2.19,22"</screen>
 
+      <para>
         This example is identical to the previous one, except that the
         NAT engine is being told that the guest can be found at the
@@ -498,10 +576,13 @@
         To forward <emphasis>all</emphasis> incoming traffic from a
         specific host interface to the guest, specify the IP of that
-        host interface like this:
+        host interface as follows:
+      </para>
 
 <screen>VBoxManage modifyvm "VM name" --natpf1 "guestssh,tcp,127.0.0.1,2222,,22"</screen>
 
-        This forwards all TCP traffic arriving on the localhost
-        interface (127.0.0.1) via port 2222 to port 22 in the guest.
+      <para>
+        This example forwards all TCP traffic arriving on the localhost
+        interface at 127.0.0.1 through port 2222 to port 22 in the
+        guest.
       </para>
 
@@ -546,7 +627,7 @@
             <computeroutput>ping</computeroutput> or tracerouting, rely
             on the ICMP protocol for sending and receiving messages.
-            While ICMP support has been improved with VirtualBox 2.1,
-            meaning <computeroutput>ping</computeroutput> should now
-            work, some other tools may not work reliably.
+            While ICMP support has been improved with &product-name;
+            2.1, meaning <computeroutput>ping</computeroutput> should
+            now work, some other tools may not work reliably.
           </para>
         </listitem>
@@ -579,5 +660,5 @@
           <para>
             <emphasis role="bold">Forwarding host ports below
-            1024.</emphasis> On Unix-based hosts, such as Linux,
+            1024.</emphasis> On UNIX-based hosts, such as Linux, Oracle
             Solaris, and Mac OS X, it is not possible to bind to ports
             below 1024 from applications that are not run by
@@ -621,11 +702,9 @@
       network. The name of internal network is chosen when the NAT
       service is created and the internal network will be created if it
-      does not already exist. An example command to create a NAT network
-      is:
-    </para>
-
-    <para>
+      does not already exist. The following is an example command to
+      create a NAT network:
+    </para>
+
 <screen>VBoxManage natnetwork add --netname natnet1 --network "192.168.15.0/24" --enable</screen>
-    </para>
 
     <para>
@@ -635,27 +714,22 @@
       will be assigned the address 192.168.15.1, the address following
       the interface address, though this is subject to change. To attach
-      a DHCP server to the internal network, we modify the example as
-      follows:
-    </para>
-
-    <para>
+      a DHCP server to the internal network, modify the example command
+      as follows:
+    </para>
+
 <screen>VBoxManage natnetwork add --netname natnet1 --network "192.168.15.0/24" --enable --dhcp on</screen>
-    </para>
-
-    <para>
-      To add a DHCP server to an existing network:
-    </para>
-
-    <para>
+
+    <para>
+      To add a DHCP server to an existing network, use the following
+      command:
+    </para>
+
 <screen>VBoxManage natnetwork modify --netname natnet1 --dhcp on</screen>
-    </para>
-
-    <para>
-      To disable the DHCP server:
-    </para>
-
-    <para>
+
+    <para>
+      To disable the DHCP server, use the following command:
+    </para>
+
 <screen>VBoxManage natnetwork modify --netname natnet1 --dhcp off</screen>
-    </para>
 
     <para>
@@ -668,7 +742,5 @@
     </para>
 
-    <para>
 <screen>VBoxManage natnetwork start --netname natnet1</screen>
-    </para>
 
     <para>
@@ -678,10 +750,8 @@
 
     <para>
-      To stops the NAT network service, together with any DHCP server:
-    </para>
-
-    <para>
+      To stop the NAT network service, together with any DHCP server:
+    </para>
+
 <screen>VBoxManage natnetwork stop --netname natnet1</screen>
-    </para>
 
     <para>
@@ -689,7 +759,5 @@
     </para>
 
-    <para>
 <screen>VBoxManage natnetwork remove --netname natnet1</screen>
-    </para>
 
     <para>
@@ -705,18 +773,15 @@
     </para>
 
-    <para>
 <screen>VBoxManage natnetwork modify \
   --netname natnet1 --port-forward-4 "ssh:tcp:[]:1022:[192.168.15.5]:22"</screen>
-    </para>
 
     <para>
       This adds a port-forwarding rule from the host's TCP 1022 port to
       the port 22 on the guest with IP address 192.168.15.5. Host port,
-      guest port and guest IP are mandatory. To delete the rule, use:
-    </para>
-
-    <para>
+      guest port and guest IP are mandatory. To delete the rule, use the
+      following command:
+    </para>
+
 <screen>VBoxManage natnetwork modify --netname natnet1 --port-forward-4 delete ssh</screen>
-    </para>
 
     <para>
@@ -728,10 +793,9 @@
 
     <para>
-      To see the list of registered NAT networks, use:
-    </para>
-
-    <para>
+      To see the list of registered NAT networks, use the following
+      command:
+    </para>
+
 <screen>VBoxManage list natnetworks</screen>
-    </para>
 
   </sect1>
@@ -742,49 +806,22 @@
 
     <para>
-      With bridged networking, VirtualBox uses a device driver on your
-      <emphasis>host</emphasis> system that filters data from your
+      With bridged networking, &product-name; uses a device driver on
+      your <emphasis>host</emphasis> system that filters data from your
       physical network adapter. This driver is therefore called a
-      <emphasis>net filter</emphasis> driver. This allows VirtualBox to
-      intercept data from the physical network and inject data into it,
-      effectively creating a new network interface in software. When a
-      guest is using such a new software interface, it looks to the host
-      system as though the guest were physically connected to the
-      interface using a network cable. The host can send data to the
-      guest through that interface and receive data from it. This means
-      that you can set up routing or bridging between the guest and the
-      rest of your network.
-    </para>
-
-    <para>
-      For this to work, VirtualBox needs a device driver on your host
-      system. The way bridged networking works has been completely
-      rewritten with VirtualBox 2.0 and 2.1, depending on the host
-      operating system. From the user perspective, the main difference
-      is that complex configuration is no longer necessary on any of the
-      supported host operating systems.
-
-      <footnote>
-
-        <para>
-          For Mac OS X and Solaris hosts, net filter drivers were
-          already added in VirtualBox 2.0, as initial support for Host
-          Interface Networking on these platforms. With VirtualBox 2.1,
-          net filter drivers were also added for the Windows and Linux
-          hosts, replacing the mechanisms previously present in
-          VirtualBox for those platforms; especially on Linux, the
-          earlier method required creating TAP interfaces and bridges,
-          which was complex and varied from one distribution to the
-          next. None of this is necessary anymore. Bridged network was
-          formerly called Host Interface Networking and has been renamed
-          with version 2.2 without any change in functionality.
-        </para>
-
-      </footnote>
+      <emphasis>net filter</emphasis> driver. This enables
+      &product-name; to intercept data from the physical network and
+      inject data into it, effectively creating a new network interface
+      in software. When a guest is using such a new software interface,
+      it looks to the host system as though the guest were physically
+      connected to the interface using a network cable. The host can
+      send data to the guest through that interface and receive data
+      from it. This means that you can set up routing or bridging
+      between the guest and the rest of your network.
     </para>
 
     <note>
       <para>
-        Even though TAP is no longer necessary on Linux with bridged
-        networking, you <emphasis>can</emphasis> still use TAP
+        Even though TAP interfaces are no longer necessary on Linux for
+        bridged networking, you <emphasis>can</emphasis> still use TAP
         interfaces for certain advanced setups, since you can connect a
         VM to any host interface.
@@ -793,13 +830,15 @@
 
     <para>
-      To enable bridged networking, open the Settings dialog of a
-      virtual machine, go to the Network page and select
-      <emphasis role="bold">Bridged Network</emphasis> in the drop-down
-      list for the Attached To field. Select a host interface from the
-      list at the bottom of the page, which contains the physical
-      network interfaces of your systems. On a typical MacBook, for
-      example, this will allow you to select between en1: AirPort, which
-      is the wireless interface, and en0: Ethernet, which represents the
-      interface with a network cable.
+      To enable bridged networking, open the
+      <emphasis role="bold">Settings</emphasis> dialog of a virtual
+      machine, go to the <emphasis role="bold">Network</emphasis> page
+      and select <emphasis role="bold">Bridged Network</emphasis> in the
+      drop-down list for the <emphasis role="bold">Attached
+      To</emphasis> field. Select a host interface from the list at the
+      bottom of the page, which contains the physical network interfaces
+      of your systems. On a typical MacBook, for example, this will
+      allow you to select between en1: AirPort, which is the wireless
+      interface, and en0: Ethernet, which represents the interface with
+      a network cable.
     </para>
 
@@ -809,13 +848,13 @@
         bridging to a wired interface, because most wireless adapters do
         not support promiscuous mode. All traffic has to use the MAC
-        address of the host's wireless adapter, and therefore VirtualBox
-        needs to replace the source MAC address in the Ethernet header
-        of an outgoing packet to make sure the reply will be sent to the
-        host interface. When VirtualBox sees an incoming packet with a
-        destination IP address that belongs to one of the virtual
-        machine adapters it replaces the destination MAC address in the
-        Ethernet header with the VM adapter's MAC address and passes it
-        on. VirtualBox examines ARP and DHCP packets in order to learn
-        the IP addresses of virtual machines.
+        address of the host's wireless adapter, and therefore
+        &product-name; needs to replace the source MAC address in the
+        Ethernet header of an outgoing packet to make sure the reply
+        will be sent to the host interface. When &product-name; sees an
+        incoming packet with a destination IP address that belongs to
+        one of the virtual machine adapters it replaces the destination
+        MAC address in the Ethernet header with the VM adapter's MAC
+        address and passes it on. &product-name; examines ARP and DHCP
+        packets in order to learn the IP addresses of virtual machines.
       </para>
     </note>
@@ -832,7 +871,7 @@
           <emphasis role="bold">Mac OS X hosts.</emphasis> Functionality
           is limited when using AirPort, the Mac's wireless networking
-          system, for bridged networking. Currently, VirtualBox supports
-          only IPv4 and IPv6 over AirPort. For other protocols, such as
-          IPX, you must choose a wired interface.
+          system, for bridged networking. Currently, &product-name;
+          supports only IPv4 and IPv6 over AirPort. For other protocols,
+          such as IPX, you must choose a wired interface.
         </para>
       </listitem>
@@ -842,5 +881,5 @@
           <emphasis role="bold">Linux hosts.</emphasis> Functionality is
           limited when using wireless interfaces for bridged networking.
-          Currently, VirtualBox supports only IPv4 and IPv6 over
+          Currently, &product-name; supports only IPv4 and IPv6 over
           wireless. For other protocols, such as IPX, you must choose a
           wired interface.
@@ -856,57 +895,33 @@
         <para>
           Some adapters strip VLAN tags in hardware. This does not allow
-          to use VLAN trunking between VM and the external network with
-          pre-2.6.27 Linux kernels nor with host operating systems other
-          than Linux.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Solaris hosts.</emphasis> There is no
-          support for using wireless interfaces. Filtering guest traffic
-          using IPFilter is also not completely supported due to
-          technical restrictions of the Solaris networking subsystem.
-          These issues would be addressed in a future release of Solaris
-          11.
-        </para>
-
-        <para>
-          Starting with VirtualBox 4.1, on Solaris 11 hosts build 159
-          and above, it is possible to use Solaris Crossbow Virtual
-          Network Interfaces (VNICs) directly with VirtualBox without
-          any additional configuration other than each VNIC must be
-          exclusive for every guest network interface.
-        </para>
-
-        <para>
-          Starting with VirtualBox 2.0.4 and up to VirtualBox 4.0, VNICs
-          can be used, but with the following caveats:
-        </para>
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              A VNIC cannot be shared between multiple guest network
-              interfaces. For example, each guest network interface must
-              have its own, exclusive VNIC.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              The VNIC and the guest network interface that uses the
-              VNIC must be assigned identical MAC addresses.
-            </para>
-          </listitem>
-
-        </itemizedlist>
-
-        <para>
-          When using VLAN interfaces with VirtualBox, they must be named
-          according to the PPA-hack naming scheme, such as e1000g513001.
-          Otherwise, the guest may receive packets in an unexpected
-          format.
+          you to use VLAN trunking between VM and the external network
+          with pre-2.6.27 Linux kernels, or with host operating systems
+          other than Linux.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Oracle Solaris hosts.</emphasis> There
+          is no support for using wireless interfaces. Filtering guest
+          traffic using IPFilter is also not completely supported due to
+          technical restrictions of the Oracle Solaris networking
+          subsystem. These issues may be addressed in later releases of
+          Oracle Solaris 11.
+        </para>
+
+        <para>
+          On Oracle Solaris 11 hosts build 159 and above, it is possible
+          to use Oracle Solaris Crossbow Virtual Network Interfaces
+          (VNICs) directly with &product-name; without any additional
+          configuration other than each VNIC must be exclusive for every
+          guest network interface.
+        </para>
+
+        <para>
+          When using VLAN interfaces with &product-name;, they must be
+          named according to the PPA-hack naming scheme, such as
+          e1000g513001. Otherwise, the guest may receive packets in an
+          unexpected format.
         </para>
       </listitem>
@@ -944,9 +959,9 @@
       central configuration. Every internal network is identified simply
       by its name. Once there is more than one active virtual network
-      card with the same internal network ID, the VirtualBox support
+      card with the same internal network ID, the &product-name; support
       driver will automatically <emphasis>wire</emphasis> the cards and
-      act as a network switch. The VirtualBox support driver implements
-      a complete Ethernet switch and supports both broadcast/multicast
-      frames and promiscuous mode.
+      act as a network switch. The &product-name; support driver
+      implements a complete Ethernet switch and supports both
+      broadcast/multicast frames and promiscuous mode.
     </para>
 
@@ -961,10 +976,12 @@
       <listitem>
         <para>
-          Use the VM's Settings dialog in the VirtualBox graphical user
-          interface. In the Networking category of the settings dialog,
-          select <emphasis role="bold">Internal Networking</emphasis>
-          from the drop-down list of networking modes. Select the name
-          of an existing internal network from the drop-down list below,
-          or enter a new name into the entry field.
+          Use the VM's <emphasis role="bold">Settings</emphasis> dialog
+          in the &product-name; graphical user interface. In the
+          <emphasis role="bold">Networking</emphasis> category of the
+          settings dialog, select <emphasis role="bold">Internal
+          Networking</emphasis> from the drop-down list of networking
+          modes. Select the name of an existing internal network from
+          the drop-down list below, or enter a new name into the
+          <emphasis role="bold">Name</emphasis> field.
         </para>
       </listitem>
@@ -996,5 +1013,5 @@
       operating systems that are participating in the internal network
       to use static IP addresses, you may want to use the DHCP server
-      that is built into VirtualBox to manage IP addresses for the
+      that is built into &product-name; to manage IP addresses for the
       internal network. See <xref linkend="vboxmanage-dhcpserver" />.
     </para>
@@ -1016,16 +1033,16 @@
     <para>
       Host-only networking is another networking mode that was added
-      with version 2.2 of VirtualBox. It can be thought of as a hybrid
-      between the bridged and internal networking modes. As with bridged
-      networking, the virtual machines can talk to each other and the
-      host as if they were connected through a physical Ethernet switch.
-      As with internal networking, a physical networking interface need
-      not be present, and the virtual machines cannot talk to the world
-      outside the host since they are not connected to a physical
-      networking interface.
-    </para>
-
-    <para>
-      When host-only networking is used, VirtualBox creates a new
+      with version 2.2 of &product-name;. It can be thought of as a
+      hybrid between the bridged and internal networking modes. As with
+      bridged networking, the virtual machines can talk to each other
+      and the host as if they were connected through a physical Ethernet
+      switch. As with internal networking, a physical networking
+      interface need not be present, and the virtual machines cannot
+      talk to the world outside the host since they are not connected to
+      a physical networking interface.
+    </para>
+
+    <para>
+      When host-only networking is used, &product-name; creates a new
       software interface on the host which then appears next to your
       existing network interfaces. In other words, whereas with bridged
@@ -1044,7 +1061,7 @@
       machine may contain a web server and a second one a database, and
       since they are intended to talk to each other, the appliance can
-      instruct VirtualBox to set up a host-only network for the two. A
-      second, bridged, network would then connect the web server to the
-      outside world to serve data to, but the outside world cannot
+      instruct &product-name; to set up a host-only network for the two.
+      A second, bridged, network would then connect the web server to
+      the outside world to serve data to, but the outside world cannot
       connect to the database.
     </para>
@@ -1059,5 +1076,6 @@
       <listitem>
         <para>
-          Go to the Network page in the virtual machine's Settings
+          Go to the <emphasis role="bold">Network</emphasis> page in the
+          virtual machine's <emphasis role="bold">Settings</emphasis>
           dialog and select <emphasis role="bold">Host-Only
           Networking</emphasis>.
@@ -1067,5 +1085,5 @@
       <listitem>
         <para>
-          On the command line, type <computeroutput>VBoxManage modifyvm
+          On the command line, enter <computeroutput>VBoxManage modifyvm
           "VM name" --nic&lt;x&gt; hostonly</computeroutput>. See
           <xref
@@ -1098,8 +1116,8 @@
     <para>
       For host-only networking, as with internal networking, you may
-      find the DHCP server useful that is built into VirtualBox. This
-      can be enabled to then manage the IP addresses in the host-only
-      network since otherwise you would need to configure all IP
-      addresses statically.
+      find the DHCP server useful that is built into &product-name;.
+      This can be enabled to then manage the IP addresses in the
+      host-only network since otherwise you would need to configure all
+      IP addresses statically.
     </para>
 
@@ -1108,6 +1126,6 @@
       <listitem>
         <para>
-          In the VirtualBox graphical user interface, you can configure
-          all these items in the global settings by choosing
+          In the &product-name; graphical user interface, you can
+          configure all these items in the global settings by choosing
           <emphasis role="bold">File</emphasis>,
           <emphasis role="bold">Preferences</emphasis>,
@@ -1122,6 +1140,6 @@
       <listitem>
         <para>
-          Alternatively, you can use <computeroutput>VBoxManage
-          dhcpserver</computeroutput> on the command line. See
+          Alternatively, you can use <command>VBoxManage
+          dhcpserver</command> on the command line. See
           <xref
           linkend="vboxmanage-dhcpserver" />.
@@ -1134,5 +1152,5 @@
       <para>
         On Linux and Mac OS X hosts the number of host-only interfaces
-        is limited to 128. There is no such limit for Solaris and
+        is limited to 128. There is no such limit for Oracle Solaris and
         Windows hosts.
       </para>
@@ -1146,5 +1164,5 @@
 
     <para>
-      This networking mode allows you to interconnect virtual machines
+      This networking mode enables you to interconnect virtual machines
       running on different hosts.
     </para>
@@ -1221,9 +1239,10 @@
     <note>
       <para>
-        On Unix-based hosts, such as Linux, Solaris, and Mac OS X, it is
-        not possible to bind to ports below 1024 from applications that
-        are not run by <computeroutput>root</computeroutput>. As a
-        result, if you try to configure such a source UDP port, the VM
-        will refuse to start.
+        On UNIX-based hosts, such as Linux, Oracle Solaris, and Mac OS
+        X, it is not possible to bind to ports below 1024 from
+        applications that are not run by
+        <computeroutput>root</computeroutput>. As a result, if you try
+        to configure such a source UDP port, the VM will refuse to
+        start.
       </para>
     </note>
@@ -1236,29 +1255,23 @@
 
     <para>
-      Virtual Distributed Ethernet (VDE)
-
-      <footnote>
-
-        <para>
-          VDE is a project developed by Renzo Davoli, Associate
-          Professor at the University of Bologna, Italy.
-        </para>
-
-      </footnote>
-
-      is a flexible, virtual network infrastructure system, spanning
-      across multiple hosts in a secure way. It allows for L2/L3
-      switching, including spanning-tree protocol, VLANs, and WAN
-      emulation. It is an optional part of VirtualBox which is only
-      included in the source code.
+      Virtual Distributed Ethernet (VDE) is a flexible, virtual network
+      infrastructure system, spanning across multiple hosts in a secure
+      way. It enables L2/L3 switching, including spanning-tree protocol,
+      VLANs, and WAN emulation. It is an optional part of &product-name;
+      which is only included in the source code.
+    </para>
+
+    <para>
+      VDE is a project developed by Renzo Davoli, Associate Professor at
+      the University of Bologna, Italy.
     </para>
 
     <para>
       The basic building blocks of the infrastructure are VDE switches,
-      VDE plugs and VDE wires which inter-connect the switches.
-    </para>
-
-    <para>
-      The VirtualBox VDE driver has a single parameter: VDE network.
+      VDE plugs, and VDE wires which interconnect the switches.
+    </para>
+
+    <para>
+      The &product-name; VDE driver has a single parameter: VDE network.
       This is the name of the VDE network switch socket to which the VM
       will be connected.
@@ -1326,26 +1339,19 @@
       VDE is available on Linux and FreeBSD hosts only. It is only
       available if the VDE software and the VDE plugin library from the
-      VirtualSquare project are installed on the host system
-
-      <footnote>
-
-        <para>
-          For Linux hosts, the shared library libvdeplug.so must be
-          available in the search path for shared libraries
-        </para>
-
-      </footnote>
-
-      . For more information on setting up VDE networks, please see the
-      documentation accompanying the software.
-
-      <footnote>
-
-        <para>
-          <ulink
+      VirtualSquare project are installed on the host system.
+    </para>
+
+    <note>
+      <para>
+        For Linux hosts, the shared library libvdeplug.so must be
+        available in the search path for shared libraries.
+      </para>
+    </note>
+
+    <para>
+      For more information on setting up VDE networks, please see the
+      documentation accompanying the software. See also
+      <ulink
         url="http://wiki.virtualsquare.org/wiki/index.php/VDE_Basic_Networking">http://wiki.virtualsquare.org/wiki/index.php/VDE_Basic_Networking</ulink>.
-        </para>
-
-      </footnote>
     </para>
 
@@ -1354,16 +1360,16 @@
   <sect1 id="network_bandwidth_limit">
 
-    <title>Limiting Bandwidth for Network I/O</title>
-
-    <para>
-      Starting with version 4.2, VirtualBox allows for limiting the
-      maximum bandwidth used for network transmission. Several network
-      adapters of one VM may share limits through bandwidth groups. It
-      is possible to have more than one such limit.
+    <title>Limiting Bandwidth for Network Input/Output</title>
+
+    <para>
+      &product-name; supports limiting of the maximum bandwidth used for
+      network transmission. Several network adapters of one VM may share
+      limits through bandwidth groups. It is possible to have more than
+      one such limit.
     </para>
 
     <note>
       <para>
-        VirtualBox shapes VM traffic only in the transmit direction,
+        &product-name; shapes VM traffic only in the transmit direction,
         delaying the packets being sent by virtual machines. It does not
         limit the traffic being received by virtual machines.
@@ -1372,13 +1378,13 @@
 
     <para>
-      Limits are configured through
-      <computeroutput>VBoxManage</computeroutput>. The example below
-      creates a bandwidth group named Limit, sets the limit to 20 Mbps
-      and assigns the group to the first and second adapters of the VM:
+      Limits are configured through <command>VBoxManage</command>. The
+      following example creates a bandwidth group named Limit, sets the
+      limit to 20 Mbps and assigns the group to the first and second
+      adapters of the VM:
+    </para>
 
 <screen>VBoxManage bandwidthctl "VM name" add Limit --type network --limit 20m
 VBoxManage modifyvm "VM name" --nicbandwidthgroup1 Limit
 VBoxManage modifyvm "VM name" --nicbandwidthgroup2 Limit</screen>
-    </para>
 
     <para>
@@ -1391,17 +1397,17 @@
     <para>
       The limits for each group can be changed while the VM is running,
-      with changes being picked up immediately. The example below
-      changes the limit for the group created in the example above to
+      with changes being picked up immediately. The following example
+      changes the limit for the group created in the previous example to
       100 Kbps:
+    </para>
 
 <screen>VBoxManage bandwidthctl "VM name" set Limit --limit 100k</screen>
-    </para>
 
     <para>
       To completely disable shaping for the first adapter of VM use the
       following command:
+    </para>
 
 <screen>VBoxManage modifyvm "VM name" --nicbandwidthgroup1 none</screen>
-    </para>
 
     <para>
@@ -1409,8 +1415,8 @@
       to a bandwidth group while VM is running, by specifying the zero
       limit for the group. For example, for the bandwidth group named
-      Limit use:
+      Limit:
+    </para>
 
 <screen>VBoxManage bandwidthctl "VM name" set Limit --limit 0</screen>
-    </para>
 
   </sect1>
@@ -1421,14 +1427,15 @@
 
     <para>
-      VirtualBox provides a variety of virtual network adapters that can
-      be attached to the host's network in a number of ways. Depending
-      on which types of adapters and attachments are used the network
-      performance will be different. Performance-wise the virtio network
-      adapter is preferable over Intel PRO/1000 emulated adapters, which
-      are preferred over the PCNet family of adapters. Both virtio and
-      Intel PRO/1000 adapters enjoy the benefit of segmentation and
-      checksum offloading. Segmentation offloading is essential for high
-      performance as it allows for less context switches, dramatically
-      increasing the sizes of packets that cross the VM/host boundary.
+      &product-name; provides a variety of virtual network adapters that
+      can be attached to the host's network in a number of ways.
+      Depending on which types of adapters and attachments are used the
+      network performance will be different. Performance-wise the virtio
+      network adapter is preferable over Intel PRO/1000 emulated
+      adapters, which are preferred over the PCNet family of adapters.
+      Both virtio and Intel PRO/1000 adapters enjoy the benefit of
+      segmentation and checksum offloading. Segmentation offloading is
+      essential for high performance as it allows for less context
+      switches, dramatically increasing the sizes of packets that cross
+      the VM/host boundary.
     </para>
 
@@ -1483,6 +1490,5 @@
           Usually it will be enabled by default. You can check and
           modify offloading settings using the
-          <computeroutput>ethtool</computeroutput> command on Linux
-          guests.
+          <command>ethtool</command> command on Linux guests.
         </para>
       </listitem>
@@ -1500,7 +1506,7 @@
         <para>
           To setup a promiscuous mode policy, either select from the
-          drop down list located in the Network Settings dialog for the
-          network adaptor or use the command line tool
-          <computeroutput>VBoxManage</computeroutput>. See
+          drop down list located in the <emphasis role="bold">Network
+          Settings</emphasis> dialog for the network adaptor or use the
+          command line tool <command>VBoxManage</command>. See
           <xref linkend="vboxmanage-modifyvm" />.
         </para>
Index: trunk/doc/manual/en_US/user_Preface.xml
===================================================================
--- trunk/doc/manual/en_US/user_Preface.xml	(revision 76078)
+++ trunk/doc/manual/en_US/user_Preface.xml	(revision 76078)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+[
+  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+  %all.entities;
+]>
+<chapter id="user-preface" role="frontmatter">
+
+  <title>Preface</title>
+
+  <para>
+    The <emphasis>&product-name;</emphasis> User Manual provides an
+    introduction to using &product-name;. The manual provides
+    information on how to install &product-name; and use it to create
+    and configure virtual machines.
+  </para>
+
+  <sect1 id="user-preface-audience">
+
+    <title>Audience</title>
+
+    <para>
+      This document is intended for both new and existing users of
+      &product-name;. It is assumed that readers are familiar with Web
+      technologies and have a general understanding of Windows and UNIX
+      platforms.
+    </para>
+
+  </sect1>
+
+  <sect1 id="user-preface-reldocs">
+
+    <title>Related Documents</title>
+
+    <para>
+      The documentation for this product is available at:
+    </para>
+
+    <para>
+      <ulink url="&otn-doc-tab;">&otn-doc-tab;</ulink>
+    </para>
+
+  </sect1>
+
+  <sect1 id="user-preface-convs">
+
+    <title>Conventions</title>
+
+    <para>
+      The following text conventions are used in this document:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">boldface</emphasis>: Boldface type
+          indicates graphical user interface elements associated with an
+          action, or terms defined in text or the glossary.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis>italic</emphasis>: Italic type indicates book
+          titles, emphasis, or placeholder variables for which you
+          supply particular values.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>monospace</computeroutput>: Monospace type
+          indicates commands within a paragraph, URLs, code in examples,
+          text that appears on the screen, or text that you enter.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+  </sect1>
+
+  <sect1 id="user-preface-accessibility-statement">
+
+    <title>Documentation Accessibility</title>
+
+<!-- Oracle accessibility statement -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/oracle-accessibility-en.xml"
+    xpointer="xpointer(simplesect/title/following-sibling::node())" />
+
+  </sect1>
+
+  <sect1 id="user-preface-support-statement">
+
+    <title>Access to Oracle Support</title>
+
+<!-- Oracle Support statement -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/oracle-legal-notices/oracle-support-en.xml" 
+    xpointer="xpointer(simplesect/title/following-sibling::node())" />
+
+  </sect1>
+
+</chapter>
Index: trunk/doc/manual/en_US/user_PrivacyPolicy.xml
===================================================================
--- trunk/doc/manual/en_US/user_PrivacyPolicy.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_PrivacyPolicy.xml	(revision 76078)
@@ -5,63 +5,89 @@
 %all.entities;
 ]>
+<appendix id="privacy">
 
-<appendix id="privacy">
-  <title>VirtualBox Privacy Information</title>
+  <title>&product-name; Privacy Information</title>
 
-  <para>Version 5, Dec 13, 2012</para>
+  <para>
+    Version 5, Dec 13, 2012
+  </para>
 
-  <para>The Oracle Privacy Policies posted on
-  <ulink url="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</ulink>
-  apply to your personal data collected and used by Oracle. The following
-  privacy information describes in more detail which information is exchanged
-  between the VirtualBox application and Oracle, and which information is
-  collected by the virtualbox.org website.</para>
+  <para>
+    The Oracle Privacy Policies posted on
+    <ulink url="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</ulink>
+    apply to your personal data collected and used by Oracle. The
+    following privacy information describes in more detail which
+    information is exchanged between the &product-name; application and
+    Oracle, and which information is collected by the virtualbox.org
+    website.
+  </para>
 
-  <para><emphasis role="bold">§ 1 virtualbox.org.</emphasis> The
-  "virtualbox.org" website logs anonymous usage information such as your IP
-  address, geographical location, browser type, referral source, length of
-  visit and number of page views while you visit (collectively, "anonymous
-  data"). In addition, but only if you choose to register, the website's bug
-  tracking and forum services store the data you choose to reveal upon
-  registration, such as your user name and contact information.</para>
+  <para>
+    <emphasis role="bold">§ 1 virtualbox.org.</emphasis> The
+    "virtualbox.org" website logs anonymous usage information such as
+    your IP address, geographical location, browser type, referral
+    source, length of visit and number of page views while you visit
+    (collectively, "anonymous data"). In addition, but only if you
+    choose to register, the website's bug tracking and forum services
+    store the data you choose to reveal upon registration, such as your
+    user name and contact information.
+  </para>
 
-  <para><emphasis role="bold">§ 2 Cookies.</emphasis> The virtualbox.org
-  website, the bug tracker and the forum services use cookies to identify and
-  track the visiting web browser and, if you have registered, to facilitate
-  login. Most browsers allow you to refuse to accept cookies. While you can
-  still visit the website with cookies disabled, logging into the bug tracker
-  and forum services will most likely not work without them.</para>
+  <para>
+    <emphasis role="bold">§ 2 Cookies.</emphasis> The virtualbox.org
+    website, the bug tracker and the forum services use cookies to
+    identify and track the visiting web browser and, if you have
+    registered, to facilitate login. Most browsers allow you to refuse
+    to accept cookies. While you can still visit the website with
+    cookies disabled, logging into the bug tracker and forum services
+    will most likely not work without them.
+  </para>
 
-  <para><emphasis role="bold">§ 3 VirtualBox registration process.</emphasis>
-  The VirtualBox application may ask that the user optionally register with
-  Oracle. If you choose to register, your name, e-mail address, country and
-  company will be submitted to Oracle and stored together with the IP address
-  of the submitter as well as product version and platform being used.</para>
+  <para>
+    <emphasis role="bold">§ 3 &product-name; registration
+    process.</emphasis> The &product-name; application may ask that the
+    user optionally register with Oracle. If you choose to register,
+    your name, e-mail address, country and company will be submitted to
+    Oracle and stored together with the IP address of the submitter as
+    well as product version and platform being used.
+  </para>
 
-  <para><emphasis role="bold">§ 4 Update notifications.</emphasis> The
-  VirtualBox application may contact Oracle to find out whether a new version
-  of VirtualBox has been released and notify the user if that is the case. In
-  the process, anonymous data such as your IP address and a non-identifying
-  counter, together with the product version and the platform being used, is
-  sent so that the server can find out whether an update is available. By
-  default, this check is performed once a day. You change this interval or
-  disable these checks altogether in the VirtualBox preferences.</para>
+  <para>
+    <emphasis role="bold">§ 4 Update notifications.</emphasis> The
+    &product-name; application may contact Oracle to find out whether a
+    new version of &product-name; has been released and notify the user
+    if that is the case. In the process, anonymous data such as your IP
+    address and a non-identifying counter, together with the product
+    version and the platform being used, is sent so that the server can
+    find out whether an update is available. By default, this check is
+    performed once a day. You change this interval or disable these
+    checks altogether in the &product-name; preferences.
+  </para>
 
-  <para><emphasis role="bold">§ 5 Usage of personal information.</emphasis>
-  Oracle may use anonymous and personal data collected by the means above for
-  statistical purposes as well as to automatically inform you about new
-  notices related to your posts on the bug tracker and forum services, to
-  administer the website and to contact you due to technical issues. Oracle
-  may also inform you about new product releases related to VirtualBox.</para>
+  <para>
+    <emphasis role="bold">§ 5 Usage of personal information.</emphasis>
+    Oracle may use anonymous and personal data collected by the means
+    above for statistical purposes as well as to automatically inform
+    you about new notices related to your posts on the bug tracker and
+    forum services, to administer the website and to contact you due to
+    technical issues. Oracle may also inform you about new product
+    releases related to &product-name;.
+  </para>
 
-  <para>In no event will personal data without your express consent be
-  provided to any third parties, unless Oracle may be required to do so by law
-  or in connection with legal proceedings.</para>
+  <para>
+    In no event will personal data without your express consent be
+    provided to any third parties, unless Oracle may be required to do
+    so by law or in connection with legal proceedings.
+  </para>
 
-  <para><emphasis role="bold">§ 6 Updates.</emphasis> Oracle may update the
-  privacy policy at any time by posting a new version at
-  <ulink url="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</ulink> and the privacy information will be kept up to date
-  in the documentation which comes with the VirtualBox application. You
-  should check these places occasionally to ensure you are happy with any
-  changes.</para>
+  <para>
+    <emphasis role="bold">§ 6 Updates.</emphasis> Oracle may update the
+    privacy policy at any time by posting a new version at
+    <ulink url="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</ulink>
+    and the privacy information will be kept up to date in the
+    documentation which comes with the &product-name; application. You
+    should check these places occasionally to ensure you are happy with
+    any changes.
+  </para>
+
 </appendix>
Index: trunk/doc/manual/en_US/user_Security.xml
===================================================================
--- trunk/doc/manual/en_US/user_Security.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_Security.xml	(revision 76078)
@@ -25,9 +25,9 @@
           One of the principles of good security practise is to keep all
           software versions and patches up to date. Activate the
-          VirtualBox update notification to get notified when a new
-          VirtualBox release is available. When updating VirtualBox, do
-          not forget to update the Guest Additions. Keep the host
-          operating system as well as the guest operating system up to
-          date.
+          &product-name; update notification to get notified when a new
+          &product-name; release is available. When updating
+          &product-name;, do not forget to update the Guest Additions.
+          Keep the host operating system as well as the guest operating
+          system up to date.
         </para>
       </listitem>
@@ -49,7 +49,7 @@
           privilege.</emphasis> The principle of least privilege states
           that users should be given the least amount of privilege
-          necessary to perform their jobs. Always execute VirtualBox as
-          a regular user. We strongly discourage anyone from executing
-          VirtualBox with system privileges.
+          necessary to perform their jobs. Always execute &product-name;
+          as a regular user. We strongly discourage anyone from
+          executing &product-name; with system privileges.
         </para>
 
@@ -95,5 +95,5 @@
 
       <para>
-        The VirtualBox base package should be downloaded only from a
+        The &product-name; base package should be downloaded only from a
         trusted source, for instance the official website
         <ulink url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>.
@@ -104,10 +104,10 @@
 
       <para>
-        General VirtualBox installation instructions for the supported
-        hosts can be found in <xref linkend="installation"/>.
-      </para>
-
-      <para>
-        On Windows hosts, the installer allows for disabling USB
+        General &product-name; installation instructions for the
+        supported hosts can be found in <xref linkend="installation"/>.
+      </para>
+
+      <para>
+        On Windows hosts, the installer can be used to disable USB
         support, support for bridged networking, support for host-only
         networking and the Python language binding. See
@@ -116,9 +116,9 @@
         appropriate if the corresponding functionality is not required
         by any virtual machine. The Python language bindings are only
-        required if the VirtualBox API is to be used by external Python
-        applications. In particular USB support and support for the two
-        networking modes require the installation of Windows kernel
-        drivers on the host. Therefore disabling those selected features
-        can not only be used to restrict the user to certain
+        required if the &product-name; API is to be used by external
+        Python applications. In particular USB support and support for
+        the two networking modes require the installation of Windows
+        kernel drivers on the host. Therefore disabling those selected
+        features can not only be used to restrict the user to certain
         functionality but also to minimize the surface provided to a
         potential attacker.
@@ -126,17 +126,17 @@
 
       <para>
-        The general case is to install the complete VirtualBox package.
-        The installation must be done with system privileges. All
-        VirtualBox binaries should be executed as a regular user and
-        never as a privileged user.
-      </para>
-
-      <para>
-        The Oracle VM VirtualBox extension pack provides additional
-        features and must be downloaded and installed separately, see
+        The general case is to install the complete &product-name;
+        package. The installation must be done with system privileges.
+        All &product-name; binaries should be executed as a regular user
+        and never as a privileged user.
+      </para>
+
+      <para>
+        The &product-name; Extension Pack provides additional features
+        and must be downloaded and installed separately, see
         <xref linkend="intro-installing"/>. As for the base package, the
         SHA256 checksum of the extension pack should be verified. As the
-        installation requires system privileges, VirtualBox will ask for
-        the system password during the installation of the extension
+        installation requires system privileges, &product-name; will ask
+        for the system password during the installation of the extension
         pack.
       </para>
@@ -150,11 +150,11 @@
       <para>
         Normally there is no post installation configuration of
-        VirtualBox components required. However, on Solaris and Linux
-        hosts it is necessary to configure the proper permissions for
-        users executing VMs and who should be able to access certain
-        host resources. For instance, Linux users must be member of the
-        <emphasis>vboxusers</emphasis> group to be able to pass USB
-        devices to a guest. If a serial host interface should be
-        accessed from a VM, the proper permissions must be granted to
+        &product-name; components required. However, on Oracle Solaris
+        and Linux hosts it is necessary to configure the proper
+        permissions for users executing VMs and who should be able to
+        access certain host resources. For instance, Linux users must be
+        member of the <emphasis>vboxusers</emphasis> group to be able to
+        pass USB devices to a guest. If a serial host interface should
+        be accessed from a VM, the proper permissions must be granted to
         the user to be able to access that device. The same applies to
         other resources like raw partitions, DVD/CD drives, and sound
@@ -172,5 +172,5 @@
     <para>
       This section outlines the specific security mechanisms offered by
-      VirtualBox.
+      &product-name;.
     </para>
 
@@ -180,16 +180,16 @@
 
       <para>
-        One property of virtual machine monitors (VMMs) like VirtualBox
-        is to encapsulate a guest by executing it in a protected
-        environment, a virtual machine, running as a user process on the
-        host operating system. The guest cannot communicate directly
-        with the hardware or other computers but only through the VMM.
-        The VMM provides emulated physical resources and devices to the
-        guest which are accessed by the guest operating system to
-        perform the required tasks. The VM settings control the
-        resources provided to the guest, for example the amount of guest
-        memory or the number of guest processors and the enabled
-        features for that guest. For example remote control, certain
-        screen settings and others. See
+        One property of virtual machine monitors (VMMs) like
+        &product-name; is to encapsulate a guest by executing it in a
+        protected environment, a virtual machine, running as a user
+        process on the host operating system. The guest cannot
+        communicate directly with the hardware or other computers but
+        only through the VMM. The VMM provides emulated physical
+        resources and devices to the guest which are accessed by the
+        guest operating system to perform the required tasks. The VM
+        settings control the resources provided to the guest, for
+        example the amount of guest memory or the number of guest
+        processors and the enabled features for that guest. For example
+        remote control, certain screen settings and others. See
         <xref linkend="generalsettings"/>.
       </para>
@@ -247,6 +247,6 @@
 
         <para>
-          When using the VirtualBox extension pack provided by Oracle
-          for VRDP remote desktop support, you can optionally use
+          When using the &product-name; Extension Pack provided by
+          Oracle for VRDP remote desktop support, you can optionally use
           various methods to configure RDP authentication. The "null"
           method is very insecure and should be avoided in a public
@@ -261,7 +261,7 @@
 
         <para>
-          The shared clipboard allows users to share data between the
+          The shared clipboard enables users to share data between the
           host and the guest. Enabling the clipboard in Bidirectional
-          mode allows the guest to read and write the host clipboard.
+          mode enables the guest to read and write the host clipboard.
           The Host to Guest mode and the Guest to Host mode limit the
           access to one direction. If the guest is able to access the
@@ -298,6 +298,6 @@
 
         <para>
-          Enabling 3D graphics via the Guest Additions exposes the host
-          to additional security risks. See
+          Enabling 3D graphics using the Guest Additions exposes the
+          host to additional security risks. See
           <xref
           linkend="guestadd-3d" />.
@@ -311,5 +311,5 @@
 
         <para>
-          Enabling CD/DVD passthrough allows the guest to perform
+          Enabling CD/DVD passthrough enables the guest to perform
           advanced operations on the CD/DVD drive, see
           <xref linkend="storage-cds"/>. This could induce a security
@@ -341,5 +341,5 @@
 
       <para>
-        The following components of VirtualBox can use passwords for
+        The following components of &product-name; can use passwords for
         authentication:
       </para>
@@ -351,25 +351,22 @@
             When using remote iSCSI storage and the storage server
             requires authentication, an initiator secret can optionally
-            be supplied with the <computeroutput>VBoxManage
-            storageattach</computeroutput> command. As long as no
-            settings password is provided, by using the command line
-            option <option>--settingspwfile</option>, then this secret
-            is stored <emphasis>unencrypted</emphasis> in the machine
+            be supplied with the <command>VBoxManage
+            storageattach</command> command. As long as no settings
+            password is provided, by using the command line option
+            <option>--settingspwfile</option>, then this secret is
+            stored <emphasis>unencrypted</emphasis> in the machine
             configuration and is therefore potentially readable on the
-            host. See <xref
-          linkend="storage-iscsi" /> and
-            <xref
-          linkend="vboxmanage-storageattach" />.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            When using the VirtualBox web service to control a
-            VirtualBox host remotely, connections to the web service are
-            authenticated in various ways. This is described in detail
-            in the VirtualBox Software Development Kit (SDK) reference.
-            See <xref
-          linkend="VirtualBoxAPI" />.
+            host. See <xref linkend="storage-iscsi" /> and
+            <xref linkend="vboxmanage-storageattach" />.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            When using the &product-name; web service to control an
+            &product-name; host remotely, connections to the web service
+            are authenticated in various ways. This is described in
+            detail in the &product-name; Software Development Kit (SDK)
+            reference. See <xref linkend="VirtualBoxAPI" />.
           </para>
         </listitem>
@@ -398,5 +395,5 @@
 
       <para>
-        The following features of VirtualBox can present security
+        The following features of &product-name; can present security
         problems:
       </para>
@@ -406,5 +403,5 @@
         <listitem>
           <para>
-            Enabling 3D graphics via the Guest Additions exposes the
+            Enabling 3D graphics using the Guest Additions exposes the
             host to additional security risks. See
             <xref
@@ -431,9 +428,9 @@
             When Page Fusion, see <xref linkend="guestadd-pagefusion"/>,
             is enabled, it is possible that a side-channel opens up that
-            allows a malicious guest to determine the address space of
+            enables a malicious guest to determine the address space of
             another VM running on the same host layout. For example,
             where DLLs are typically loaded. This information leak in
             itself is harmless, however the malicious guest may use it
-            to optimize attack against that VM via unrelated attack
+            to optimize attack against that VM through unrelated attack
             vectors. It is recommended to only enable Page Fusion if you
             do not think this is a concern in your setup.
@@ -443,10 +440,10 @@
         <listitem>
           <para>
-            When using the VirtualBox web service to control a
-            VirtualBox host remotely, connections to the web service,
-            over which the API calls are transferred using SOAP XML, are
-            not encrypted. They use plain HTTP by default. This is a
-            potential security risk. For details about the web service,
-            see <xref linkend="VirtualBoxAPI" />.
+            When using the &product-name; web service to control an
+            &product-name; host remotely, connections to the web
+            service, over which the API calls are transferred using SOAP
+            XML, are not encrypted. They use plain HTTP by default. This
+            is a potential security risk. For details about the web
+            service, see <xref linkend="VirtualBoxAPI" />.
           </para>
 
@@ -474,6 +471,6 @@
           <para>
             Because of shortcomings in older Windows versions, using
-            VirtualBox on Windows versions older than Vista with Service
-            Pack 1 is not recommended.
+            &product-name; on Windows versions older than Vista with
+            Service Pack 1 is not recommended.
           </para>
         </listitem>
@@ -488,6 +485,6 @@
 
       <para>
-        The following components of VirtualBox use encryption to protect
-        sensitive data:
+        The following components of &product-name; use encryption to
+        protect sensitive data:
       </para>
 
@@ -496,10 +493,11 @@
         <listitem>
           <para>
-            When using the VirtualBox extension pack provided by Oracle
-            for VRDP remote desktop support, RDP data can optionally be
-            encrypted. See <xref linkend="vrde-crypt" />. Only the
-            Enhanced RDP Security method (RDP5.2) with TLS protocol
-            provides a secure connection. Standard RDP Security (RDP4
-            and RDP5.1) is vulnerable to a man-in-the-middle attack.
+            When using the &product-name; Extension Pack provided by
+            Oracle for VRDP remote desktop support, RDP data can
+            optionally be encrypted. See <xref linkend="vrde-crypt" />.
+            Only the Enhanced RDP Security method (RDP5.2) with TLS
+            protocol provides a secure connection. Standard RDP Security
+            (RDP4 and RDP5.1) is vulnerable to a man-in-the-middle
+            attack.
           </para>
         </listitem>
Index: trunk/doc/manual/en_US/user_Storage.xml
===================================================================
--- trunk/doc/manual/en_US/user_Storage.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_Storage.xml	(revision 76078)
@@ -11,6 +11,6 @@
   <para>
     As the virtual machine will most probably expect to see a hard disk
-    built into its virtual computer, VirtualBox must be able to present
-    real storage to the guest as a virtual hard disk. There are
+    built into its virtual computer, &product-name; must be able to
+    present real storage to the guest as a virtual hard disk. There are
     presently three methods by which to achieve this:
   </para>
@@ -20,5 +20,5 @@
     <listitem>
       <para>
-        VirtualBox can use large image files on a real hard disk and
+        &product-name; can use large image files on a real hard disk and
         present them to a guest as a virtual hard disk. This is the most
         common method, described in <xref linkend="vdidetails" />.
@@ -28,7 +28,6 @@
     <listitem>
       <para>
-        iSCSI storage servers can be attached to VirtualBox. This is
-        described in <xref
-      linkend="storage-iscsi" />.
+        iSCSI storage servers can be attached to &product-name;. This is
+        described in <xref linkend="storage-iscsi" />.
       </para>
     </listitem>
@@ -47,6 +46,6 @@
     Each such virtual storage device, such as an image file, iSCSI
     target, or physical hard disk, needs to be connected to the virtual
-    hard disk controller that VirtualBox presents to a virtual machine.
-    This is explained in the next section.
+    hard disk controller that &product-name; presents to a virtual
+    machine. This is explained in the next section.
   </para>
 
@@ -58,22 +57,8 @@
       In a real PC, hard disks and CD/DVD drives are connected to a
       device called hard disk controller which drives hard disk
-      operation and data transfers. VirtualBox can emulate the five most
-      common types of hard disk controllers typically found in today's
-      PCs: IDE, SATA (AHCI), SCSI, SAS, USB-based, and NVMe mass storage
-      devices.
-
-      <footnote>
-
-        <para>
-          SATA support was added with VirtualBox 1.6; experimental SCSI
-          support was added with 2.1 and fully implemented with 2.2.
-          Generally, storage attachments were made much more flexible
-          with VirtualBox 3.1. Support for the LSI Logic SAS controller
-          was added with VirtualBox 3.2. USB mass storage devices are
-          supported since VirtualBox 5.0. NVMe controller support was
-          added with VirtualBox 5.1.
-        </para>
-
-      </footnote>
+      operation and data transfers. &product-name; can emulate the five
+      most common types of hard disk controllers typically found in
+      today's PCs: IDE, SATA (AHCI), SCSI, SAS, USB-based, and NVMe mass
+      storage devices.
     </para>
 
@@ -96,22 +81,10 @@
 
         <para>
-          In VirtualBox, each virtual machine may have one IDE
+          In &product-name;, each virtual machine may have one IDE
           controller enabled, which gives you up to four virtual storage
           devices that you can attach to the machine. By default, one of
-          these four, the secondary master, is preconfigured to be the
-          machine's virtual CD/DVD drive, but this can be changed.
-
-          <footnote>
-
-            <para>
-              The assignment of the machine's CD/DVD drive to the
-              secondary master was fixed before VirtualBox 3.1. It is
-              now changeable, and the drive can be at other slots of the
-              IDE controller, and there can be more than one such drive.
-            </para>
-
-          </footnote>
-
-          )
+          these virtual storage devices, the secondary master, is
+          preconfigured to be the virtual machine's virtual CD/DVD
+          drive. However, you can change the default setting.
         </para>
 
@@ -124,5 +97,5 @@
         <para>
           You can also select which exact type of IDE controller
-          hardware VirtualBox should present to the virtual machine:
+          hardware &product-name; should present to the virtual machine:
           PIIX3, PIIX4, or ICH6. This makes no difference in terms of
           performance, but if you import a virtual machine from another
@@ -133,9 +106,11 @@
 
         <para>
-          After you have created a new virtual machine with the New
-          Virtual Machine wizard of the graphical user interface, you
-          will typically see one IDE controller in the machine's Storage
-          settings. The virtual CD/DVD drive will be attached to one of
-          the four ports of this controller.
+          After you have created a new virtual machine with the
+          <emphasis role="bold">New Virtual Machine</emphasis> wizard of
+          the graphical user interface, you will typically see one IDE
+          controller in the machine's
+          <emphasis role="bold">Storage</emphasis> settings. The virtual
+          CD/DVD drive will be attached to one of the four ports of this
+          controller.
         </para>
       </listitem>
@@ -152,18 +127,18 @@
 
         <para>
-          Like a real SATA controller, VirtualBox's virtual SATA
+          Like a real SATA controller, &product-name;'s virtual SATA
           controller operates faster and also consumes fewer CPU
-          resources than the virtual IDE controller. Also, this allows
+          resources than the virtual IDE controller. Also, this enables
           you to connect up to 30 virtual hard disks to one machine
-          instead of just three, when compared to the VirtualBox IDE
+          instead of just three, when compared to the &product-name; IDE
           controller with a DVD drive attached.
         </para>
 
         <para>
-          For this reason, starting with version 3.2 and depending on
-          the selected guest operating system, VirtualBox uses SATA as
-          the default for newly created virtual machines. One virtual
-          SATA controller is created by default, and the default disk
-          that is created with a new VM is attached to this controller.
+          For this reason, depending on the selected guest operating
+          system, &product-name; uses SATA as the default for newly
+          created virtual machines. One virtual SATA controller is
+          created by default, and the default disk that is created with
+          a new VM is attached to this controller.
         </para>
 
@@ -174,20 +149,17 @@
             seen by operating systems that do not have device support
             for AHCI. In particular, <emphasis>there is no support for
-            AHCI in Windows before Windows Vista</emphasis>, so Windows
-            XP (even SP3) will not see such disks unless you install
+            AHCI in Windows before Windows Vista</emphasis>. So Windows
+            XP, even SP3, will not see such disks unless you install
             additional drivers. It is possible to switch from IDE to
             SATA after installation by installing the SATA drivers and
-            changing the controller type in the VM settings dialog.
-
-            <footnote>
-
-              <para>
-                VirtualBox recommends the Intel Matrix Storage drivers,
-                which can be downloaded from
-                <ulink
+            changing the controller type in the VM
+            <emphasis role="bold">Settings</emphasis> dialog.
+          </para>
+
+          <para>
+            &product-name; recommends the Intel Matrix Storage drivers,
+            which can be downloaded from
+            <ulink
                   url="http://downloadcenter.intel.com/Product_Filter.aspx?ProductID=2101">http://downloadcenter.intel.com/Product_Filter.aspx?ProductID=2101</ulink>.
-              </para>
-
-            </footnote>
           </para>
         </warning>
@@ -196,19 +168,19 @@
           To add a SATA controller to a machine for which it has not
           been enabled by default, either because it was created by an
-          earlier version of VirtualBox, or because SATA is not
+          earlier version of &product-name;, or because SATA is not
           supported by default by the selected guest operating system,
-          do the following. Go to the Storage page of the machine's
-          settings dialog, click <emphasis role="bold">Add
-          Controller</emphasis> under the Storage Tree box and then
-          select <emphasis role="bold">Add SATA Controller</emphasis>.
-          The new controller appears as a separate PCI device in the
-          virtual machine, and you can add virtual disks to it.
+          do the following. Go to the
+          <emphasis role="bold">Storage</emphasis> page of the machine's
+          <emphasis role="bold">Settings</emphasis> dialog, click
+          <emphasis role="bold">Add Controller</emphasis> under the
+          Storage Tree box and then select <emphasis role="bold">Add
+          SATA Controller</emphasis>. The new controller appears as a
+          separate PCI device in the virtual machine, and you can add
+          virtual disks to it.
         </para>
 
         <para>
           To change the IDE compatibility mode settings for the SATA
-          controller, see
-          <xref
-          linkend="vboxmanage-storagectl" />.
+          controller, see <xref linkend="vboxmanage-storagectl" />.
         </para>
       </listitem>
@@ -228,5 +200,5 @@
         <para>
           Primarily for compatibility with other virtualization
-          software, VirtualBox optionally supports LSI Logic and
+          software, &product-name; optionally supports LSI Logic and
           BusLogic SCSI controllers, to each of which up to 15 virtual
           hard disks can be attached.
@@ -234,10 +206,11 @@
 
         <para>
-          To enable a SCSI controller, on the Storage page of a virtual
-          machine's settings dialog, click <emphasis role="bold">Add
-          Controller</emphasis> under the Storage Tree box and then
-          select <emphasis role="bold">Add SCSI Controller</emphasis>.
-          The new controller appears as a separate PCI device in the
-          virtual machine.
+          To enable a SCSI controller, on the
+          <emphasis role="bold">Storage</emphasis> page of a virtual
+          machine's <emphasis role="bold">Settings</emphasis> dialog,
+          click <emphasis role="bold">Add Controller</emphasis> under
+          the Storage Tree box and then select <emphasis role="bold">Add
+          SCSI Controller</emphasis>. The new controller appears as a
+          separate PCI device in the virtual machine.
         </para>
 
@@ -261,5 +234,5 @@
           are used instead of parallel ones, which simplifies physical
           device connections. In some ways, therefore, SAS is to SCSI
-          what SATA is to IDE: it allows for more reliable and faster
+          what SATA is to IDE: it enables more reliable and faster
           connections.
         </para>
@@ -267,7 +240,8 @@
         <para>
           To support high-end guests which require SAS controllers,
-          VirtualBox emulates a LSI Logic SAS controller, which can be
-          enabled much the same way as a SCSI controller. At this time,
-          up to eight devices can be connected to the SAS controller.
+          &product-name; emulates a LSI Logic SAS controller, which can
+          be enabled much the same way as a SCSI controller. At this
+          time, up to eight devices can be connected to the SAS
+          controller.
         </para>
 
@@ -277,5 +251,5 @@
             operating systems with device support for it. In particular,
             <emphasis>there is no support for SAS in Windows before
-            Windows Vista</emphasis>, so Windows XP (even SP3) will not
+            Windows Vista</emphasis>. So Windows XP, even SP3, will not
             see such disks unless you install additional drivers.
           </para>
@@ -296,17 +270,17 @@
 
         <para>
-          The virtual USB storage controller offered by VirtualBox works
-          differently to the other storage controller types. While most
-          storage controllers appear as a single PCI device to the guest
-          with multiple disks attached to it, the USB-based storage
-          controller does not appear as virtual storage controller. Each
-          disk attached to the controller appears as a dedicated USB
-          device to the guest.
+          The virtual USB storage controller offered by &product-name;
+          works differently to the other storage controller types. While
+          most storage controllers appear as a single PCI device to the
+          guest with multiple disks attached to it, the USB-based
+          storage controller does not appear as virtual storage
+          controller. Each disk attached to the controller appears as a
+          dedicated USB device to the guest.
         </para>
 
         <warning>
           <para>
-            Booting from drives attached via USB is when EFI is used as
-            the BIOS lacks USB support.
+            Booting from drives attached using USB is only supported
+            when EFI is used as the BIOS lacks USB support.
           </para>
         </warning>
@@ -325,18 +299,14 @@
           8.1 added native NVMe support. For Windows 7, native support
           was added with an update.
-
-          <footnote>
-
-            <para>
-              The NVMe controller is part of the extension pack.
-            </para>
-
-          </footnote>
+        </para>
+
+        <para>
+          The NVMe controller is part of the extension pack.
         </para>
 
         <warning>
           <para>
-            Booting from drives attached via NVMe is only supported when
-            EFI is used as the BIOS lacks the appropriate driver.
+            Booting from drives attached using NVMe is only supported
+            when EFI is used as the BIOS lacks the appropriate driver.
           </para>
         </warning>
@@ -346,5 +316,5 @@
 
     <para>
-      In summary, VirtualBox gives you the following categories of
+      In summary, &product-name; gives you the following categories of
       virtual storage slots:
     </para>
@@ -402,6 +372,6 @@
       the only controller supported by your guest. Whether you use SATA,
       SCSI, or SAS does not make any real difference. The variety of
-      controllers is only supplied by VirtualBox for compatibility with
-      existing hardware and other hypervisors.
+      controllers is only supplied by &product-name; for compatibility
+      with existing hardware and other hypervisors.
     </para>
 
@@ -415,27 +385,18 @@
       Disk image files reside on the host system and are seen by the
       guest systems as hard disks of a certain geometry. When a guest
-      operating system reads from or writes to a hard disk, VirtualBox
-      redirects the request to the image file.
-    </para>
-
-    <para>
-      Like a physical disk, a virtual disk has a size (capacity), which
-      must be specified when the image file is created. As opposed to a
-      physical disk however, VirtualBox allows you to expand an image
-      file after creation, even if it has data already. See
-      <xref
-    linkend="vboxmanage-modifyvdi" />.
-
-      <footnote>
-
-        <para>
-          Image resizing was added with VirtualBox 4.0.
-        </para>
-
-      </footnote>
-    </para>
-
-    <para>
-      VirtualBox supports the following types of disk image files:
+      operating system reads from or writes to a hard disk,
+      &product-name; redirects the request to the image file.
+    </para>
+
+    <para>
+      Like a physical disk, a virtual disk has a size, or capacity,
+      which must be specified when the image file is created. As opposed
+      to a physical disk however, &product-name; enables you to expand
+      an image file after creation, even if it has data already. See
+      <xref linkend="vboxmanage-modifyvdi" />.
+    </para>
+
+    <para>
+      &product-name; supports the following types of disk image files:
     </para>
 
@@ -444,5 +405,5 @@
       <listitem>
         <para>
-          <emphasis role="bold">VDI.</emphasis> Normally, VirtualBox
+          <emphasis role="bold">VDI.</emphasis> Normally, &product-name;
           uses its own container format for guest hard disks. This is
           called a Virtual Disk Image (VDI) file. This format is used
@@ -453,27 +414,14 @@
       <listitem>
         <para>
-          <emphasis role="bold">VMDK.</emphasis> VirtualBox also fully
-          supports the popular and open VMDK container format that is
-          used by many other virtualization products, in particular, by
-          VMware.
-
-          <footnote>
-
-            <para>
-              Initial support for VMDK was added with VirtualBox 1.4.
-              Since version 2.1, VirtualBox supports VMDK fully, meaning
-              that you can create snapshots and use all the other
-              advanced features described above for VDI images with VMDK
-              also.
-            </para>
-
-          </footnote>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">VHD.</emphasis> VirtualBox also fully
-          supports the VHD format used by Microsoft.
+          <emphasis role="bold">VMDK.</emphasis> &product-name; also
+          fully supports the popular and open VMDK container format that
+          is used by many other virtualization products, such as VMware.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">VHD.</emphasis> &product-name; also
+          fully supports the VHD format used by Microsoft.
         </para>
       </listitem>
@@ -483,13 +431,7 @@
           <emphasis role="bold">HDD.</emphasis> Image files of Parallels
           version 2 (HDD format) are also supported.
-
-          <footnote>
-
-            <para>
-              Support was added with VirtualBox 3.1.
-            </para>
-
-          </footnote>
-
+        </para>
+
+        <para>
           Due to lack of documentation of the format, newer versions
           such as 3 and 4 are not supported. You can however convert
@@ -530,10 +472,10 @@
           drive reaches the maximum capacity chosen when the drive was
           created. While this format takes less space initially, the
-          fact that VirtualBox needs to expand the image file consumes
-          additional computing resources, so until the disk file size
-          has stabilized, write operations may be slower than with fixed
-          size disks. However, after a time the rate of growth will slow
-          and the average penalty for write operations will be
-          negligible.
+          fact that &product-name; needs to expand the image file
+          consumes additional computing resources, so until the disk
+          file size has stabilized, write operations may be slower than
+          with fixed size disks. However, after a time the rate of
+          growth will slow and the average penalty for write operations
+          will be negligible.
         </para>
       </listitem>
@@ -548,5 +490,5 @@
 
     <para>
-      VirtualBox keeps track of all the hard disk, CD/DVD-ROM, and
+      &product-name; keeps track of all the hard disk, CD/DVD-ROM, and
       floppy disk images which are in use by virtual machines. These are
       often referred to as <emphasis>known media</emphasis> and come
@@ -564,9 +506,8 @@
       <listitem>
         <para>
-          Registered media, for compatibility with VirtualBox versions
-          older than version 4.0. For details about how media
+          Registered media, for compatibility with &product-name;
+          versions older than version 4.0. For details about how media
           registration has changed with version 4.0, see
-          <xref
-          linkend="vboxconfigdata" />.
+          <xref linkend="vboxconfigdata" />.
         </para>
       </listitem>
@@ -575,20 +516,23 @@
 
     <para>
-      The known media can be viewed and changed in the
-      <emphasis
-    role="bold">Virtual Media Manager</emphasis>, which
-      you can access from the File menu in the VirtualBox main window.
-    </para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="images/virtual-disk-manager.png"
+      The known media can be viewed and changed using the
+      <emphasis role="bold">Virtual Media Manager</emphasis>, which you
+      can access from the <emphasis role="bold">File</emphasis> menu in
+      the VirtualBox Manager window.
+    </para>
+
+    <figure id="fig-virtual-media-manager">
+      <title>The Virtual Media Manager</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="images/virtual-disk-manager.png"
                      width="12cm" />
-      </imageobject>
-    </mediaobject>
+        </imageobject>
+      </mediaobject>
+    </figure>
 
     <para>
       The known media are conveniently grouped in separate tabs for the
-      three possible formats. These formats are:
+      supported formats. These formats are:
     </para>
 
@@ -597,5 +541,5 @@
       <listitem>
         <para>
-          Hard disk images, either in VirtualBox's own Virtual Disk
+          Hard disk images, either in &product-name;'s own Virtual Disk
           Image (VDI) format, or in the third-party formats listed in
           <xref linkend="vdidetails"/>.
@@ -620,5 +564,5 @@
       For each image, the Virtual Media Manager shows you the full path
       of the image file and other information, such as the virtual
-      machine the image is currently attached to, if any.
+      machine the image is currently attached to.
     </para>
 
@@ -628,4 +572,50 @@
 
     <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Add</emphasis> an image to the registry.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Copy</emphasis> a virtual hard disk, to
+          create another one. The target type can be different.
+          Available options are: VDI, VHD, or VMDK.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Move</emphasis> an image that is
+          currently in the registry. A file dialog prompts you for the
+          new image file location.
+        </para>
+
+        <para>
+          When you move a disk image using the Virtual Media Manager,
+          any related &product-name; configuration files are updated
+          automatically.
+        </para>
+
+        <note>
+          <para>
+            If possible, always use the Virtual Media Manager or the
+            <command>VBoxManage modifymedium</command> command to move a
+            disk image.
+          </para>
+
+          <para>
+            If you move a disk image to a new location by using a file
+            management feature of the host operating system, use the
+            <computeroutput>--setlocation</computeroutput> option of the
+            <command>VBoxManage modifymedium</command> command to
+            configure the new path of the disk image on the host file
+            system. This updates the &product-name; configuration
+            automatically.
+          </para>
+        </note>
+      </listitem>
 
       <listitem>
@@ -647,16 +637,54 @@
       <listitem>
         <para>
-          <emphasis role="bold">Copy</emphasis> a virtual hard disk, to
-          create another one. The target type can be different.
-          Available options are: VDI, VHD, or VMDK.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Modify</emphasis> the attributes of the
-          disk image file. Available options are: Normal, Immutable,
-          Writethrough, Shareable, Multi-attach.
-        </para>
+          Display and edit the
+          <emphasis role="bold">Properties</emphasis> of a disk image.
+        </para>
+
+        <para>
+          Available properties include the following:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">Type:</emphasis> Defines the
+              snapshot behavior of the disk. See
+              <xref linkend="hdimagewrites"/>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">Location:</emphasis> The location of
+              the disk image file on the host system. A file dialog
+              selector is available.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">Description:</emphasis> A short
+              description of the disk image.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">Size:</emphasis> The size of the
+              disk image. Use the slider to increase or decrease the
+              disk image size.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">Information:</emphasis> Further
+              details about the disk image can be added on the
+              <emphasis role="bold">Information</emphasis> tab.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
@@ -671,22 +699,38 @@
 
     <para>
-      These commands are accessible once a medium has been selected
-      either by selecting from the options shown at the top of the
-      window, or by right-clicking the medium and selecting from the
-      options shown on the drop-down menu.
-    </para>
-
-    <para>
-      Starting with version 4.0, to create a new disk image, you use the
-      Storage page in a virtual machine's settings dialog. This is
-      because disk images are now by default stored in each machine's
-      own folder.
+      To perform these actions, highlight the medium in the Virtual
+      Media Manager. Then do either of the following:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          Click an icon in the Virtual Media Manager task bar.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Right-click the medium and select an option.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>
+      To create a new disk image, you use the
+      <emphasis role="bold">Storage</emphasis> page in a virtual
+      machine's <emphasis role="bold">Settings</emphasis> dialog. This
+      is because disk images are by default stored in each machine's own
+      folder.
     </para>
 
     <para>
       Hard disk image files can be copied to other host systems and
-      imported into virtual machines there, although certain guest
-      systems, notably Windows 2000 and XP, will require that the new
-      virtual machine be set up in a similar way to the old one.
+      imported into virtual machines there. However, certain guest
+      operating systems, such as Windows 2000 and Windows XP, require
+      that the new virtual machine be set up in a similar way to the old
+      one.
     </para>
 
@@ -694,12 +738,11 @@
       <para>
         Do not simply make copies of virtual disk images. If you import
-        such a second copy into a virtual machine, VirtualBox will
-        complain with an error, since VirtualBox assigns a unique
+        such a second copy into a virtual machine, &product-name; will
+        complain with an error, since &product-name; assigns a unique
         identifier (UUID) to each disk image to make sure it is only
-        used once. See <xref
-        linkend="cloningvdis" />. Also, if
-        you want to copy a virtual machine to another system, VirtualBox
-        has an import/export facility that might be better suited for
-        your needs. See <xref linkend="ovf" />.
+        used once. See <xref linkend="cloningvdis" />. Also, if you want
+        to copy a virtual machine to another system, &product-name; has
+        import and export features that might be better suited for your
+        needs. See <xref linkend="ovf" />.
       </para>
     </note>
@@ -712,5 +755,5 @@
 
     <para>
-      For each virtual disk image supported by VirtualBox, you can
+      For each virtual disk image supported by &product-name;, you can
       determine separately how it should be affected by write operations
       from a virtual machine and snapshot operations. This applies to
@@ -723,9 +766,8 @@
       By default, images are in <emphasis>normal</emphasis> mode. To
       mark an existing image with one of the non-standard modes listed
-      below, use <computeroutput>VBoxManage modifyhd</computeroutput>.
-      See <xref
-    linkend="vboxmanage-modifyvdi" />. Alternatively,
-      use VBoxManage to attach the image to a VM and use the
-      <computeroutput>--mtype</computeroutput> argument. See
+      below, use <command>VBoxManage modifyhd</command>. See
+      <xref linkend="vboxmanage-modifyvdi" />. Alternatively, use
+      <command>VBoxManage</command> to attach the image to a VM and use
+      the <option>--mtype</option> argument. See
       <xref linkend="vboxmanage-storageattach" />.
     </para>
@@ -753,9 +795,9 @@
         <para>
           The image file itself is not reset. Instead, when a snapshot
-          is taken, VirtualBox "freezes" the image file and no longer
-          writes to it. For the write operations from the VM, a second,
-          <emphasis>differencing</emphasis> image file is created which
-          receives only the changes to the original image. See
-          <xref linkend="diffimages"/>.
+          is taken, &product-name; "freezes" the image file and no
+          longer writes to it. For the write operations from the VM, a
+          second, <emphasis>differencing</emphasis> image file is
+          created which receives only the changes to the original image.
+          See <xref linkend="diffimages"/>.
         </para>
 
@@ -766,16 +808,4 @@
           otherwise there would be conflicts if several machines write
           to the same image file.
-
-          <footnote>
-
-            <para>
-              This restriction is more lenient now than it was before
-              VirtualBox 2.2. Previously, each normal disk image could
-              only be <emphasis>attached</emphasis> to one single
-              machine. Now it can be attached to more than one machine
-              so long as only one of these machines is running.
-            </para>
-
-          </footnote>
         </para>
       </listitem>
@@ -803,13 +833,13 @@
           disk concurrently. Only fixed size images can be used in this
           way, and dynamically allocated images are rejected.
-
-          <warning>
-            <para>
-              This is an expert feature, and misuse can lead to data
-              loss, as regular filesystems are not prepared to handle
-              simultaneous changes by several parties.
-            </para>
-          </warning>
-        </para>
+        </para>
+
+        <warning>
+          <para>
+            This is an expert feature, and misuse can lead to data loss,
+            as regular filesystems are not prepared to handle
+            simultaneous changes by several parties.
+          </para>
+        </warning>
       </listitem>
 
@@ -855,23 +885,14 @@
 
         <para>
-          VirtualBox never writes to an immutable image directly at all.
-          All write operations from the machine are directed to a
+          &product-name; never writes to an immutable image directly at
+          all. All write operations from the machine are directed to a
           differencing image. The next time the VM is powered on, the
           differencing image is reset so that every time the VM starts,
           its immutable images have exactly the same content.
-
-          <footnote>
-
-            <para>
-              This behavior also changed with VirtualBox 2.2.
-              Previously, the differencing images were discarded when
-              the machine session <emphasis>ended</emphasis>; now they
-              are discarded every time the machine is powered on.
-            </para>
-
-          </footnote>
-
+        </para>
+
+        <para>
           The differencing image is only reset when the machine is
-          powered on from within VirtualBox, not when you reboot by
+          powered on from within &product-name;, not when you reboot by
           requesting a reboot from within the machine. This is also why
           immutable images behave as described above when snapshots are
@@ -882,8 +903,7 @@
           If the automatic discarding of the differencing image on VM
           startup does not fit your needs, you can turn it off using the
-          <computeroutput>autoreset</computeroutput> parameter of
-          <computeroutput>VBoxManage modifyhd</computeroutput>. See
-          <xref
-        linkend="vboxmanage-modifyvdi"/>.
+          <option>autoreset</option> parameter of <command>VBoxManage
+          modifyhd</command>. See
+          <xref linkend="vboxmanage-modifyvdi"/>.
         </para>
       </listitem>
@@ -984,5 +1004,5 @@
       When the machine reads a sector from such a virtual hard disk, it
       looks into the differencing image first. If the sector is present,
-      it is returned from there. If not, VirtualBox looks into the
+      it is returned from there. If not, &product-name; looks into the
       parent. In other words, the parent becomes
       <emphasis>read-only</emphasis>. It is never written to again, but
@@ -997,7 +1017,7 @@
       read-only as well, and write operations only go to the
       second-level differencing image. When reading from the virtual
-      disk, VirtualBox needs to look into the second differencing image
-      first, then into the first if the sector was not found, and then
-      into the original image.
+      disk, &product-name; needs to look into the second differencing
+      image first, then into the first if the sector was not found, and
+      then into the original image.
     </para>
 
@@ -1009,15 +1029,18 @@
       Write operations always go to the one <emphasis>active</emphasis>
       differencing image that is attached to the machine, and for read
-      operations, VirtualBox may need to look up all the parents in the
-      chain until the sector in question is found. You can view such a
-      tree in the Virtual Media Manager:
-    </para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="images/virtual-disk-manager2.png"
+      operations, &product-name; may need to look up all the parents in
+      the chain until the sector in question is found. You can view such
+      a tree in the Virtual Media Manager.
+    </para>
+
+    <figure id="fig-diff-images">
+      <title>Differencing Images, Shown in Virtual Media Manager</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="images/virtual-disk-manager2.png"
                      width="12cm" />
-      </imageobject>
-    </mediaobject>
+        </imageobject>
+      </mediaobject>
+    </figure>
 
     <para>
@@ -1025,8 +1048,8 @@
       machine, the virtual hard disk behaves like any other disk. While
       the virtual machine is running, there is a slight run-time I/O
-      overhead because VirtualBox might need to look up sectors several
-      times. This is not noticeable however since the tables with sector
-      information are always kept in memory and can be looked up
-      quickly.
+      overhead because &product-name; might need to look up sectors
+      several times. This is not noticeable however since the tables
+      with sector information are always kept in memory and can be
+      looked up quickly.
     </para>
 
@@ -1040,5 +1063,5 @@
         <para>
           <emphasis role="bold">Snapshots.</emphasis> When you create a
-          snapshot, as explained in the previous section, VirtualBox
+          snapshot, as explained in the previous section, &product-name;
           "freezes" the images attached to the virtual machine and
           creates differencing images for each image that is not in
@@ -1067,7 +1090,7 @@
           <listitem>
             <para>
-              VirtualBox copies the virtual machine settings that were
-              copied into the snapshot back to the virtual machine. As a
-              result, if you have made changes to the machine
+              &product-name; copies the virtual machine settings that
+              were copied into the snapshot back to the virtual machine.
+              As a result, if you have made changes to the machine
               configuration since taking the snapshot, they are undone.
             </para>
@@ -1105,6 +1128,6 @@
           differencing images becomes obsolete. In this case, the
           differencing image of the disk attachment cannot simply be
-          deleted. Instead, VirtualBox needs to look at each sector of
-          the differencing image and needs to copy it back into its
+          deleted. Instead, &product-name; needs to look at each sector
+          of the differencing image and needs to copy it back into its
           parent. This is called "merging" images and can be a
           potentially lengthy process, depending on how large the
@@ -1143,19 +1166,18 @@
       system setup. However, you should <emphasis>only</emphasis> make
       copies of virtual disk images using the utility supplied with
-      VirtualBox. See <xref
-    linkend="vboxmanage-clonevdi" />. This
-      is because VirtualBox assigns a unique identity number (UUID) to
-      each disk image, which is also stored inside the image, and
-      VirtualBox will refuse to work with two images that use the same
-      number. If you do accidentally try to reimport a disk image which
-      you copied normally, you can make a second copy using VirtualBox's
-      utility and import that instead.
+      &product-name;. See <xref linkend="vboxmanage-clonevdi" />. This
+      is because &product-name; assigns a unique identity number (UUID)
+      to each disk image, which is also stored inside the image, and
+      &product-name; will refuse to work with two images that use the
+      same number. If you do accidentally try to reimport a disk image
+      which you copied normally, you can make a second copy using
+      &product-name;'s utility and import that instead.
     </para>
 
     <para>
       Note that newer Linux distributions identify the boot hard disk
-      from the ID of the drive. The ID VirtualBox reports for a drive is
-      determined from the UUID of the virtual disk image. So if you
-      clone a disk image and try to boot the copied image the guest
+      from the ID of the drive. The ID &product-name; reports for a
+      drive is determined from the UUID of the virtual disk image. So if
+      you clone a disk image and try to boot the copied image the guest
       might not be able to determine its own boot disk as the UUID
       changed. In this case you have to adapt the disk ID in your boot
@@ -1177,23 +1199,22 @@
   <sect1 id="iocaching">
 
-    <title>Host I/O Caching</title>
-
-    <para>
-      Starting with version 3.2, VirtualBox can optionally disable the
-      I/O caching that the host operating system would otherwise perform
-      on disk image files.
-    </para>
-
-    <para>
-      Traditionally, VirtualBox has opened disk image files as normal
-      files, which results in them being cached by the host operating
-      system like any other file. The main advantage of this is speed:
-      when the guest OS writes to disk and the host OS cache uses
-      delayed writing, the write operation can be reported as completed
-      to the guest OS quickly while the host OS can perform the
-      operation asynchronously. Also, when you start a VM a second time
-      and have enough memory available for the OS to use for caching,
-      large parts of the virtual disk may be in system memory, and the
-      VM can access the data much faster.
+    <title>Host Input/Output Caching</title>
+
+    <para>
+      &product-name; can optionally disable the I/O caching that the
+      host operating system would otherwise perform on disk image files.
+    </para>
+
+    <para>
+      Traditionally, &product-name; has opened disk image files as
+      normal files, which results in them being cached by the host
+      operating system like any other file. The main advantage of this
+      is speed: when the guest OS writes to disk and the host OS cache
+      uses delayed writing, the write operation can be reported as
+      completed to the guest OS quickly while the host OS can perform
+      the operation asynchronously. Also, when you start a VM a second
+      time and have enough memory available for the OS to use for
+      caching, large parts of the virtual disk may be in system memory,
+      and the VM can access the data much faster.
     </para>
 
@@ -1202,6 +1223,5 @@
       occur for virtual disks residing on remote iSCSI storage, which is
       the more common scenario in enterprise-class setups. See
-      <xref
-    linkend="storage-iscsi" />.
+      <xref linkend="storage-iscsi" />.
     </para>
 
@@ -1251,9 +1271,9 @@
     <para>
       If you decide to disable host I/O caching for the above reasons,
-      VirtualBox uses its own small cache to buffer writes, but no read
-      caching since this is typically already performed by the guest OS.
-      In addition, VirtualBox fully supports asynchronous I/O for its
-      virtual SATA, SCSI and SAS controllers through multiple I/O
-      threads.
+      &product-name; uses its own small cache to buffer writes, but no
+      read caching since this is typically already performed by the
+      guest OS. In addition, &product-name; fully supports asynchronous
+      I/O for its virtual SATA, SCSI and SAS controllers through
+      multiple I/O threads.
     </para>
 
@@ -1265,10 +1285,12 @@
 
     <para>
-      For this reason, VirtualBox allows you to configure whether the
-      host I/O cache is used for each I/O controller separately. Either
-      select the <emphasis role="bold">Use Host I/O Cache</emphasis>
-      check box in the Storage settings for a given virtual storage
-      controller, or use the following VBoxManage command to disable the
-      host I/O cache for a virtual storage controller:
+      For this reason, &product-name; enables you to configure whether
+      the host I/O cache is used for each I/O controller separately.
+      Either select the <emphasis role="bold">Use Host I/O
+      Cache</emphasis> check box in the
+      <emphasis role="bold">Storage</emphasis> settings for a given
+      virtual storage controller, or use the following
+      <command>VBoxManage</command> command to disable the host I/O
+      cache for a virtual storage controller:
     </para>
 
@@ -1280,5 +1302,5 @@
 
     <para>
-      For the above reasons, VirtualBox now uses SATA controllers by
+      For the above reasons, &product-name; now uses SATA controllers by
       default for new virtual machines.
     </para>
@@ -1291,15 +1313,15 @@
 
     <para>
-      Starting with version 4.0, VirtualBox allows for limiting the
-      maximum bandwidth used for asynchronous I/O. Additionally it
-      supports sharing limits through bandwidth groups for several
-      images. It is possible to have more than one such limit.
-    </para>
-
-    <para>
-      Limits are configured using
-      <computeroutput>VBoxManage</computeroutput>. The example below
-      creates a bandwidth group named Limit, sets the limit to 20 MB per
-      second, and assigns the group to the attached disks of the VM:
+      &product-name; supports limiting of the maximum bandwidth used for
+      asynchronous I/O. Additionally it supports sharing limits through
+      bandwidth groups for several images. It is possible to have more
+      than one such limit.
+    </para>
+
+    <para>
+      Limits are configured using <command>VBoxManage</command>. The
+      example below creates a bandwidth group named Limit, sets the
+      limit to 20 MB per second, and assigns the group to the attached
+      disks of the VM:
     </para>
 
@@ -1373,12 +1395,13 @@
 
     <para>
-      Medium changes can be prevented by the guest, and VirtualBox
+      Medium changes can be prevented by the guest, and &product-name;
       reflects that by locking the host drive if appropriate. You can
-      force a medium removal in such situations via the VirtualBox GUI
-      or the VBoxManage command line tool. Effectively this is the
-      equivalent of the emergency eject which many CD/DVD drives
-      provide, with all associated side effects. The guest OS can issue
-      error messages, just like on real hardware, and guest applications
-      may misbehave. Use this with caution.
+      force a medium removal in such situations by using the
+      &product-name; GUI or the <command>VBoxManage</command> command
+      line tool. Effectively this is the equivalent of the emergency
+      eject which many CD/DVD drives provide, with all associated side
+      effects. The guest OS can issue error messages, just like on real
+      hardware, and guest applications may misbehave. Use this with
+      caution.
     </para>
 
@@ -1395,5 +1418,5 @@
 
     <para>
-      The standard CD/DVD emulation allows for reading standard data CD
+      The standard CD/DVD emulation enables reading of standard data CD
       and DVD formats only. As an experimental feature, for additional
       capabilities, it is possible to give the guest direct access to
@@ -1427,10 +1450,9 @@
 
     <para>
-      There is a Passthrough check box in the GUI dialog for configuring
-      the media attached to a storage controller, or you can use the
-      <computeroutput>--passthrough</computeroutput> option with
-      <computeroutput>VBoxManage storageattach</computeroutput>. See
-      <xref
-    linkend="vboxmanage-storageattach" />.
+      There is a <emphasis role="bold">Passthrough</emphasis> check box
+      in the GUI dialog for configuring the media attached to a storage
+      controller, or you can use the <option>--passthrough</option>
+      option with <command>VBoxManage storageattach</command>. See
+      <xref linkend="vboxmanage-storageattach" />.
     </para>
 
@@ -1443,7 +1465,7 @@
 
     <para>
-      On Solaris hosts, passthrough requires running VirtualBox with
-      real root permissions due to security measures enforced by the
-      host.
+      On Oracle Solaris hosts, passthrough requires running
+      &product-name; with real root permissions due to security measures
+      enforced by the host.
     </para>
 
@@ -1455,6 +1477,6 @@
 
     <para>
-      iSCSI stands for "Internet SCSI" and is a standard that allows for
-      using the SCSI protocol over Internet (TCP/IP) connections.
+      iSCSI stands for "Internet SCSI" and is a standard that supports
+      use of the SCSI protocol over Internet (TCP/IP) connections.
       Especially with the advent of Gigabit Ethernet, it has become
       affordable to attach iSCSI storage servers simply as remote hard
@@ -1467,16 +1489,16 @@
 
     <para>
-      VirtualBox can transparently present iSCSI remote storage to a
+      &product-name; can transparently present iSCSI remote storage to a
       virtual machine as a virtual hard disk. The guest operating system
       will not see any difference between a virtual disk image (VDI
-      file) and an iSCSI target. To achieve this, VirtualBox has an
+      file) and an iSCSI target. To achieve this, &product-name; has an
       integrated iSCSI initiator.
     </para>
 
     <para>
-      VirtualBox's iSCSI support has been developed according to the
+      &product-name;'s iSCSI support has been developed according to the
       iSCSI standard and should work with all standard-conforming iSCSI
-      targets. To use an iSCSI target with VirtualBox, you must use the
-      command line. See <xref linkend="vboxmanage-storageattach" />.
+      targets. To use an iSCSI target with &product-name;, you must use
+      the command line. See <xref linkend="vboxmanage-storageattach" />.
     </para>
 
Index: trunk/doc/manual/en_US/user_Technical.xml
===================================================================
--- trunk/doc/manual/en_US/user_Technical.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_Technical.xml	(revision 76078)
@@ -10,43 +10,42 @@
 
   <para>
-    The contents of this chapter are not required to use VirtualBox
-    successfully. The following is provided as additional information
-    for readers who are more familiar with computer architecture and
-    technology and wish to find out more about how VirtualBox works
-    "under the hood".
+    This chapter provides additional information for readers who are
+    familiar with computer architecture and technology and wish to find
+    out more about how &product-name; works <emphasis>under the
+    hood</emphasis>. The contents of this chapter are not required
+    reading in order to use &product-name; successfully.
   </para>
 
   <sect1 id="vboxconfigdata">
 
-    <title>Where VirtualBox Stores its Files</title>
-
-    <para>
-      In VirtualBox, a virtual machine and its settings are described in
-      a virtual machine settings file in XML format. In addition, most
-      virtual machine have one or more virtual hard disks, which are
-      typically represented by disk images, such as those in VDI format.
-      Where all these files are stored depends on which version of
-      VirtualBox created the machine.
-    </para>
-
-    <sect2 id="vboxconfigdata-pre-version-four">
-
-      <title>Machines Created by VirtualBox Version 4.0 or Later</title>
-
-      <para>
-        Starting with version 4.0, by default, each virtual machine has
-        one directory on your host computer where all the files of that
-        machine are stored: the XML settings file, with a
-        <computeroutput>.vbox</computeroutput> file extension, and its
-        disk images.
-      </para>
-
-      <para>
-        By default, this <replaceable>machine folder</replaceable> is
-        placed in a common folder called <computeroutput>VirtualBox
-        VMs</computeroutput>, which VirtualBox creates in the current
-        system user's home directory. The location of this home
+    <title>Where &product-name; Stores its Files</title>
+
+    <para>
+      In &product-name;, a virtual machine and its settings are
+      described in a virtual machine settings file in XML format. In
+      addition, most virtual machine have one or more virtual hard
+      disks, which are typically represented by disk images, such as
+      those in VDI format. Where all these files are stored depends on
+      which version of &product-name; created the machine.
+    </para>
+
+    <sect2 id="vboxconfigdata-post-version-four">
+
+      <title>Machines Created by &product-name; Version 4.0 or Later</title>
+
+      <para>
+        By default, each virtual machine has one directory on your host
+        computer where all the files of that machine are stored: the XML
+        settings file, with a <computeroutput>.vbox</computeroutput>
+        file extension, and its disk images.
+      </para>
+
+      <para>
+        By default, this <emphasis>machine folder</emphasis> is placed
+        in a common folder called <computeroutput>VirtualBox
+        VMs</computeroutput>, which &product-name; creates in the
+        current system user's home directory. The location of this home
         directory depends on the conventions of the host operating
-        system:
+        system, as follows:
       </para>
 
@@ -71,14 +70,14 @@
         <listitem>
           <para>
-            On Linux, Mac OS X and Solaris, this is generally taken from
-            the environment variable
+            On Linux, Mac OS X, and Oracle Solaris, this is generally
+            taken from the environment variable
             <computeroutput>$HOME</computeroutput>, except for the user
             <computeroutput>root</computeroutput> where it is taken from
             the account database. This is a workaround for the frequent
-            trouble caused by users using VirtualBox in combination with
-            the tool <computeroutput>sudo</computeroutput> which by
+            trouble caused by users using &product-name; in combination
+            with the tool <computeroutput>sudo</computeroutput> which by
             default does not reset the environment variable
             <computeroutput>$HOME</computeroutput>. A typical location
-            on Linux and Solaris is
+            on Linux and Oracle Solaris is
             <computeroutput>/home/username</computeroutput> and on Mac
             OS X <computeroutput>/Users/username</computeroutput>.
@@ -97,5 +96,5 @@
       <para>
         As an example, when you create a virtual machine called "Example
-        VM", you will find that VirtualBox creates the following:
+        VM", &product-name; creates the following:
       </para>
 
@@ -126,10 +125,10 @@
 
       <para>
-        This is the default layout if you use the Create New Virtual
-        Machine wizard described in <xref linkend="gui-createvm" />.
-        Once you start working with the VM, additional files are added.
-        Log files are in a subfolder called
-        <computeroutput>Logs</computeroutput>, and if you have taken
-        snapshots, they are in a
+        This is the default layout if you use the
+        <emphasis role="bold">Create New Virtual Machine</emphasis>
+        wizard described in <xref linkend="gui-createvm" />. Once you
+        start working with the VM, additional files are added. Log files
+        are in a subfolder called <computeroutput>Logs</computeroutput>,
+        and if you have taken snapshots, they are in a
         <computeroutput>Snapshots</computeroutput> subfolder. For each
         VM, you can change the location of its snapshots folder in the
@@ -139,40 +138,41 @@
       <para>
         You can change the default machine folder by selecting
-        <emphasis role="bold">Preferences</emphasis> from the File menu
-        in the VirtualBox main window. Then, in the displayed window,
-        click on the <emphasis role="bold">General</emphasis> tab.
-        Alternatively, use <computeroutput>VBoxManage setproperty
-        machinefolder</computeroutput>. See
-        <xref
-      linkend="vboxmanage-setproperty" />.
+        <emphasis role="bold">Preferences</emphasis> from the
+        <emphasis role="bold">File</emphasis> menu in the &product-name;
+        main window. Then, in the displayed window, click on the
+        <emphasis role="bold">General</emphasis> tab. Alternatively, use
+        <command>VBoxManage setproperty machinefolder</command>. See
+        <xref linkend="vboxmanage-setproperty" />.
       </para>
 
     </sect2>
 
-    <sect2 id="vboxconfigdata-post-version-four">
-
-      <title>Machines Created by VirtualBox Versions Before 4.0</title>
-
-      <para>
-        If you have upgraded to VirtualBox 4.0 from an earlier version
-        of VirtualBox, you probably have settings files and disks in the
-        earlier file system layout.
-      </para>
-
-      <para>
-        Before version 4.0, VirtualBox separated the machine settings
-        files from virtual disk images. The machine settings files had
-        an <computeroutput>.xml</computeroutput> file extension and
-        resided in a folder called "Machines" under the global
-        VirtualBox configuration directory. See
+    <sect2 id="vboxconfigdata-pre-version-four">
+
+      <title>Machines Created by &product-name; Versions Before 4.0</title>
+
+      <para>
+        If you have upgraded to &product-name; 4.0 from an earlier
+        version of &product-name;, you probably have settings files and
+        disks in the earlier file system layout.
+      </para>
+
+      <para>
+        Before version 4.0, &product-name; separated the machine
+        settings files from virtual disk images. The machine settings
+        files had an <computeroutput>.xml</computeroutput> file
+        extension and resided in a folder called
+        <computeroutput>Machines</computeroutput> under the global
+        &product-name; configuration directory. See
         <xref linkend="vboxconfigdata-global"/>. On Linux, for example,
-        this was the hidden
-        <computeroutput>$HOME/.VirtualBox/Machines</computeroutput>
-        directory. The default hard disks folder was called "HardDisks"
-        and resided in the <computeroutput>.VirtualBox</computeroutput>
-        folder as well. Both locations could be changed by the user in
-        the global preferences. The concept of a default hard disk
-        folder has been abandoned with VirtualBox 4.0, since disk images
-        now reside in each machine's folder by default.
+        this was the hidden directory
+        <computeroutput>$HOME/.VirtualBox/Machines</computeroutput>. The
+        default hard disks folder was called
+        <computeroutput>HardDisks</computeroutput> and was also located
+        in the <computeroutput>.VirtualBox</computeroutput> folder. Both
+        locations could be changed by the user in the global
+        preferences. The concept of a default hard disk folder was
+        abandoned with &product-name; 4.0, since disk images now reside
+        in each machine's folder by default.
       </para>
 
@@ -189,5 +189,5 @@
             the same folder. In addition, the virtual media of all
             machines were registered with a global registry in the
-            central VirtualBox settings file,
+            central &product-name; settings file,
             <computeroutput>$HOME/.VirtualBox/VirtualBox.xml</computeroutput>.
           </para>
@@ -208,6 +208,6 @@
             under the hidden
             <computeroutput>.VirtualBox</computeroutput> directory, at
-            least on Linux and Solaris hosts, made many users wonder
-            where their disk space had gone.
+            least on Linux and Oracle Solaris hosts, made many users
+            wonder where their disk space had gone.
           </para>
         </listitem>
@@ -216,9 +216,9 @@
 
       <para>
-        Whereas new VMs created with VirtualBox 4.0 or later will
+        Whereas new VMs created with &product-name; 4.0 or later will
         conform to the new layout, for maximum compatibility, old VMs
         are <emphasis>not</emphasis> converted to the new layout.
         Otherwise machine settings would be irrevocably broken if a user
-        downgraded from 4.0 back to an older version of VirtualBox.
+        downgraded from 4.0 back to an older version of &product-name;.
       </para>
 
@@ -230,33 +230,54 @@
 
       <para>
-        In addition to the files of the virtual machines, VirtualBox
-        maintains global configuration data. On Linux and Solaris as of
-        VirtualBox 4.3, this is in the hidden directory
-        <computeroutput>$HOME/.config/VirtualBox</computeroutput>,
-        although <computeroutput>$HOME/.VirtualBox</computeroutput> will
-        be used if it exists for compatibility with earlier versions. On
-        Windows, and on Linux and Solaris with VirtualBox 4.2 and
-        earlier, this is in
-        <computeroutput>$HOME/.VirtualBox</computeroutput>. On Mac OS X,
-        it resides in
-        <computeroutput>$HOME/Library/VirtualBox</computeroutput>.
-      </para>
-
-      <para>
-        VirtualBox creates this configuration directory automatically if
-        necessary. Optionally, you can supply an alternate configuration
-        directory by setting the
-        <computeroutput><literal>VBOX_USER_HOME</literal></computeroutput>
-        environment variable, or additionally on Linux or Solaris by
-        using the standard
-        <computeroutput><literal>XDG_CONFIG_HOME</literal></computeroutput>
+        In addition to the files of the virtual machines, &product-name;
+        maintains global configuration data in the following directory:
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Linux and Oracle Solaris:</emphasis>
+            <computeroutput>$HOME/.config/VirtualBox</computeroutput>.
+          </para>
+
+          <para>
+            <computeroutput>$HOME/.VirtualBox</computeroutput> is used
+            if it exists, for compatibility with legacy versions before
+            &product-name; 4.3.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Windows:</emphasis>
+            <computeroutput>$HOME/.VirtualBox</computeroutput>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Mac OS X:</emphasis>
+            <computeroutput>$HOME/Library/VirtualBox</computeroutput>.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <para>
+        &product-name; creates this configuration directory
+        automatically, if necessary. Optionally, you can specify an
+        alternate configuration directory by setting the
+        <computeroutput>VBOX_USER_HOME</computeroutput> environment
+        variable, or additionally on Linux or Oracle Solaris by using
+        the standard <computeroutput>XDG_CONFIG_HOME</computeroutput>
         variable. Since the global
         <computeroutput>VirtualBox.xml</computeroutput> settings file
-        points to all other configuration files, this allows for
-        switching between several VirtualBox configurations entirely.
-      </para>
-
-      <para>
-        Most importantly, in this directory, VirtualBox stores its
+        points to all other configuration files, this enables switching
+        between several &product-name; configurations.
+      </para>
+
+      <para>
+        Most importantly, in this directory, &product-name; stores its
         global settings file, another XML file called
         <computeroutput>VirtualBox.xml</computeroutput>. This includes
@@ -264,25 +285,27 @@
         machines with pointers to their XML settings files. Neither the
         location of this file nor its directory has changed with
-        VirtualBox 4.0.
-      </para>
-
-      <para>
-        Before VirtualBox 4.0, all virtual media (disk image files) were
-        also contained in a global registry in this settings file. For
-        compatibility, this media registry still exists if you upgrade
-        VirtualBox and there are media from machines which were created
-        with a version before 4.0. If you have no such machines, then
-        there will be no global media registry. With VirtualBox 4.0,
-        each machine XML file has its own media registry.
-      </para>
-
-      <para>
-        Also before VirtualBox 4.0, the default "Machines" folder and
-        the default "HardDisks" folder resided under the VirtualBox
-        configuration directory, such as
+        &product-name; 4.0.
+      </para>
+
+      <para>
+        Before &product-name; 4.0, all virtual media, such as disk image
+        files, were also contained in a global registry in this settings
+        file. For compatibility, this media registry still exists if you
+        upgrade &product-name; and there are media from machines which
+        were created with a version before 4.0. If you have no such
+        machines, then there will be no global media registry. With
+        &product-name; 4.0, each machine XML file has its own media
+        registry.
+      </para>
+
+      <para>
+        Also before &product-name; 4.0, the default
+        <computeroutput>Machines</computeroutput> folder and the default
+        <computeroutput>HardDisks</computeroutput> folder resided under
+        the &product-name; configuration directory, such as
         <computeroutput>$HOME/.VirtualBox/Machines</computeroutput> on
-        Linux. If you are upgrading from a VirtualBox version before
-        4.0, files in these directories are not automatically moved in
-        order not to break backwards compatibility.
+        Linux. If you are upgrading from an &product-name; version
+        before 4.0, files in these directories are not automatically
+        moved in order not to break backwards compatibility.
       </para>
 
@@ -304,34 +327,71 @@
           <thead>
             <row>
-              <entry><emphasis role="bold">Setting</emphasis></entry>
-              <entry><emphasis role="bold">Before 4.0</emphasis></entry>
-              <entry><emphasis role="bold">4.0 or above</emphasis></entry>
+              <entry><para>
+                  <emphasis role="bold">Setting</emphasis>
+                </para></entry>
+              <entry><para>
+                  <emphasis role="bold">Before 4.0</emphasis>
+                </para></entry>
+              <entry><para>
+                  <emphasis role="bold">4.0 or above</emphasis>
+                </para></entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry>Default machines folder</entry>
-              <entry><computeroutput>$HOME/.VirtualBox/Machines</computeroutput></entry>
-              <entry><computeroutput>$HOME/VirtualBox VMs</computeroutput></entry>
+              <entry><para>
+                  Default machines folder
+                </para></entry>
+              <entry><para>
+                  <computeroutput>$HOME/.VirtualBox/Machines</computeroutput>
+                </para></entry>
+              <entry><para>
+                  <computeroutput>$HOME/VirtualBox VMs</computeroutput>
+                </para></entry>
             </row>
             <row>
-              <entry>Default disk image location</entry>
-              <entry><computeroutput>$HOME/.VirtualBox/HardDisks</computeroutput></entry>
-              <entry>In each machine's folder</entry>
+              <entry><para>
+                  Default disk image location
+                </para></entry>
+              <entry><para>
+                  <computeroutput>$HOME/.VirtualBox/HardDisks</computeroutput>
+                </para></entry>
+              <entry><para>
+                  In each machine's folder
+                </para></entry>
             </row>
             <row>
-              <entry>Machine settings file extension</entry>
-              <entry><computeroutput>.xml</computeroutput></entry>
-              <entry><computeroutput>.vbox</computeroutput></entry>
+              <entry><para>
+                  Machine settings file extension
+                </para></entry>
+              <entry><para>
+                  <computeroutput>.xml</computeroutput>
+                </para></entry>
+              <entry><para>
+                  <computeroutput>.vbox</computeroutput>
+                </para></entry>
             </row>
             <row>
-              <entry>Media registry</entry>
-              <entry>Global <computeroutput>VirtualBox.xml</computeroutput> file</entry>
-              <entry>Each machine settings file</entry>
+              <entry><para>
+                  Media registry
+                </para></entry>
+              <entry><para>
+                  Global <computeroutput>VirtualBox.xml</computeroutput>
+                  file
+                </para></entry>
+              <entry><para>
+                  Each machine settings file
+                </para></entry>
             </row>
             <row>
-              <entry>Media registration</entry>
-              <entry>Explicit open/close required</entry>
-              <entry>Automatic on attach</entry>
+              <entry><para>
+                  Media registration
+                </para></entry>
+              <entry><para>
+                  Explicit open/close required
+                </para></entry>
+              <entry><para>
+                  Automatic on attach
+                </para></entry>
             </row>
           </tbody>
@@ -343,62 +403,58 @@
     <sect2 id="vboxconfigdata-XML-files">
 
-      <title>VirtualBox XML Files</title>
-
-      <para>
-        VirtualBox uses XML for both the machine settings files and the
-        global configuration file,
+      <title>&product-name; XML Files</title>
+
+      <para>
+        &product-name; uses XML for both the machine settings files and
+        the global configuration file,
         <computeroutput>VirtualBox.xml</computeroutput>.
       </para>
 
       <para>
-        All VirtualBox XML files are versioned. When a new settings file
-        is created, for example because a new virtual machine is
-        created, VirtualBox automatically uses the settings format of
-        the current VirtualBox version. These files may not be readable
-        if you downgrade to an earlier version of VirtualBox. However,
-        when VirtualBox encounters a settings file from an earlier
-        version, such as after upgrading VirtualBox, it attempts to
-        preserve the settings format as much as possible. It will only
-        silently upgrade the settings format if the current settings
-        cannot be expressed in the old format, for example because you
-        enabled a feature that was not present in an earlier version of
-        VirtualBox.
-
-        <footnote>
-
-          <para>
-            As an example, before VirtualBox 3.1, it was only possible
-            to enable or disable a single DVD drive in a virtual
-            machine. If it was enabled, then it would always be visible
-            as the secondary master of the IDE controller. With
-            VirtualBox 3.1, DVD drives can be attached to arbitrary
-            slots of arbitrary controllers, so they could be the
-            secondary slave of an IDE controller or in a SATA slot. If
-            you have a machine settings file from an earlier version and
-            upgrade VirtualBox to 3.1 and then move the DVD drive from
-            its default position, this cannot be expressed in the old
-            settings format; the XML machine file would get written in
-            the new format, and a backup file of the old format would be
-            kept.
-          </para>
-
-        </footnote>
-
-        In such cases, VirtualBox backs up the old settings file in the
-        virtual machine's configuration directory. If you need to go
-        back to the earlier version of VirtualBox, then you will need to
-        manually copy these backup files back.
+        All &product-name; XML files are versioned. When a new settings
+        file is created, for example because a new virtual machine is
+        created, &product-name; automatically uses the settings format
+        of the current &product-name; version. These files may not be
+        readable if you downgrade to an earlier version of
+        &product-name;. However, when &product-name; encounters a
+        settings file from an earlier version, such as after upgrading
+        &product-name;, it attempts to preserve the settings format as
+        much as possible. It will only silently upgrade the settings
+        format if the current settings cannot be expressed in the old
+        format, for example because you enabled a feature that was not
+        present in an earlier version of &product-name;.
+      </para>
+
+      <para>
+        As an example, before &product-name; 3.1, it was only possible
+        to enable or disable a single DVD drive in a virtual machine. If
+        it was enabled, then it would always be visible as the secondary
+        master of the IDE controller. With &product-name; 3.1, DVD
+        drives can be attached to arbitrary slots of arbitrary
+        controllers, so they could be the secondary slave of an IDE
+        controller or in a SATA slot. If you have a machine settings
+        file from an earlier version and upgrade &product-name; to 3.1
+        and then move the DVD drive from its default position, this
+        cannot be expressed in the old settings format; the XML machine
+        file would get written in the new format, and a backup file of
+        the old format would be kept.
+      </para>
+
+      <para>
+        In such cases, &product-name; backs up the old settings file in
+        the virtual machine's configuration directory. If you need to go
+        back to the earlier version of &product-name;, then you will
+        need to manually copy these backup files back.
       </para>
 
       <para>
         We intentionally do not document the specifications of the
-        VirtualBox XML files, as we must reserve the right to modify
+        &product-name; XML files, as we must reserve the right to modify
         them in the future. We therefore strongly suggest that you do
-        not edit these files manually. VirtualBox provides complete
+        not edit these files manually. &product-name; provides complete
         access to its configuration data through its the
-        <computeroutput>VBoxManage</computeroutput> command line tool,
-        see <xref linkend="vboxmanage" /> and its API, see
-        <xref
-      linkend="VirtualBoxAPI" />.
+        <command>VBoxManage</command> command line tool, see
+        <xref linkend="vboxmanage" /> and its API, see
+        <xref linkend="VirtualBoxAPI" />.
       </para>
 
@@ -409,10 +465,10 @@
   <sect1 id="technical-components">
 
-    <title>VirtualBox Executables and Components</title>
-
-    <para>
-      VirtualBox was designed to be modular and flexible. When the
-      VirtualBox graphical user interface (GUI) is opened and a VM is
-      started, at least the following three processes are running:
+    <title>&product-name; Executables and Components</title>
+
+    <para>
+      &product-name; was designed to be modular and flexible. When the
+      &product-name; graphical user interface (GUI) is opened and a VM
+      is started, at least the following three processes are running:
     </para>
 
@@ -421,26 +477,27 @@
       <listitem>
         <para>
-          <computeroutput>VBoxSVC</computeroutput>, the VirtualBox
+          <computeroutput>VBoxSVC</computeroutput>, the &product-name;
           service process which always runs in the background. This
-          process is started automatically by the first VirtualBox
+          process is started automatically by the first &product-name;
           client process and exits a short time after the last client
-          exits. The first VirtualBox service can be the GUI,
+          exits. The first &product-name; service can be the GUI,
           <computeroutput>VBoxManage</computeroutput>,
           <computeroutput>VBoxHeadless</computeroutput>, the web service
           amongst others. The service is responsible for bookkeeping,
           maintaining the state of all VMs, and for providing
-          communication between VirtualBox components. This
-          communication is implemented via COM/XPCOM.
+          communication between &product-name; components. This
+          communication is implemented using COM/XPCOM.
         </para>
 
         <note>
           <para>
-            When we refer to "clients" here, we mean the local clients
-            of a particular <computeroutput>VBoxSVC</computeroutput>
-            server process, not clients in a network. VirtualBox employs
-            its own client/server design to allow its processes to
-            cooperate, but all these processes run under the same user
-            account on the host operating system, and this is totally
-            transparent to the user.
+            When we refer to <emphasis>clients</emphasis> here, we mean
+            the local clients of a particular
+            <computeroutput>VBoxSVC</computeroutput> server process, not
+            clients in a network. &product-name; employs its own
+            client/server design to allow its processes to cooperate,
+            but all these processes run under the same user account on
+            the host operating system, and this is totally transparent
+            to the user.
           </para>
         </note>
@@ -449,19 +506,20 @@
       <listitem>
         <para>
-          The GUI process, <computeroutput>VirtualBox</computeroutput>,
-          a client application based on the cross-platform Qt library.
-          When started without the
-          <computeroutput>--startvm</computeroutput> option, this
-          application acts as the VirtualBox manager, displaying the VMs
-          and their settings. It then communicates settings and state
-          changes to <computeroutput>VBoxSVC</computeroutput> and also
-          reflects changes effected through other means, such as
-          <computeroutput>VBoxManage</computeroutput>.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          If the <computeroutput>VirtualBox</computeroutput> client
+          The GUI process,
+          <computeroutput>VirtualBoxVM</computeroutput>, a client
+          application based on the cross-platform Qt library. When
+          started without the <computeroutput>--startvm</computeroutput>
+          option, this application acts as the &product-name; manager,
+          displaying the VMs and their settings. It then communicates
+          settings and state changes to
+          <computeroutput>VBoxSVC</computeroutput> and also reflects
+          changes effected through other means, such as the
+          <command>VBoxManage</command> command.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          If the <computeroutput>VirtualBoxVM</computeroutput> client
           application is started with the
           <computeroutput>--startvm</computeroutput> argument, it loads
@@ -475,5 +533,5 @@
 
     <para>
-      Any VirtualBox front-end, or client, will communicate with the
+      Any &product-name; front-end, or client, will communicate with the
       service process and can both control and reflect the current
       state. For example, either the VM selector or the VM window or
@@ -483,7 +541,7 @@
 
     <para>
-      The VirtualBox GUI application is only one of several available
-      front ends, or clients. The complete list shipped with VirtualBox
-      is as follows:
+      The &product-name; GUI application is only one of several
+      available front ends, or clients. The complete list shipped with
+      &product-name; is as follows:
     </para>
 
@@ -492,6 +550,6 @@
       <listitem>
         <para>
-          <computeroutput>VirtualBox</computeroutput>: The Qt front end
-          implementing the manager and running VMs.
+          <computeroutput>VirtualBoxVM</computeroutput>: The Qt front
+          end implementing the manager and running VMs.
         </para>
       </listitem>
@@ -501,15 +559,5 @@
           <computeroutput>VBoxManage</computeroutput>: A less
           user-friendly but more powerful alternative. See
-          <xref
-          linkend="vboxmanage" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>VBoxSDL</computeroutput>: A simple graphical
-          front end based on the SDL library. See
-          <xref
-          linkend="vboxsdl" />.
+          <xref linkend="vboxmanage" />.
         </para>
       </listitem>
@@ -518,6 +566,6 @@
         <para>
           <computeroutput>VBoxHeadless</computeroutput>: A VM front end
-          which does not directly provide any video output and
-          keyboard/mouse input, but allows redirection via VirtualBox
+          which does not directly provide any video output and keyboard
+          or mouse input, but enables redirection through the VirtualBox
           Remote Desktop Extension. See <xref linkend="vboxheadless" />.
         </para>
@@ -526,17 +574,17 @@
       <listitem>
         <para>
-          <computeroutput>vboxwebsrv</computeroutput>: The VirtualBox
-          web service process which allows for controlling a VirtualBox
-          host remotely. This is described in detail in the VirtualBox
-          Software Development Kit (SDK) reference. See
-          <xref
-          linkend="VirtualBoxAPI" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The VirtualBox Python shell: A Python alternative to
-          VBoxManage. This is also described in the SDK reference.
+          <computeroutput>vboxwebsrv</computeroutput>: The
+          &product-name; web service process which enables control of an
+          &product-name; host remotely. This is described in detail in
+          the &product-name; Software Development Kit (SDK) reference.
+          See <xref linkend="VirtualBoxAPI" />.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          The &product-name; Python shell: A Python alternative to
+          <computeroutput>VBoxManage</computeroutput>. This is also
+          described in the SDK reference.
         </para>
       </listitem>
@@ -545,6 +593,6 @@
 
     <para>
-      Internally, VirtualBox consists of many more or less separate
-      components. You may encounter these when analyzing VirtualBox
+      Internally, &product-name; consists of many more or less separate
+      components. You may encounter these when analyzing &product-name;
       internal error messages or log files. These include the following:
     </para>
@@ -555,5 +603,5 @@
         <para>
           IPRT: A portable runtime library which abstracts file access,
-          threading, and string manipulation. Whenever VirtualBox
+          threading, and string manipulation. Whenever &product-name;
           accesses host operating features, it does so through this
           library for cross-platform portability.
@@ -607,6 +655,6 @@
           implementations from VMM internals and makes it easy to add
           new emulated devices. Through PDM, third-party developers can
-          add new virtual devices to VirtualBox without having to change
-          VirtualBox itself.
+          add new virtual devices to &product-name; without having to
+          change &product-name; itself.
         </para>
       </listitem>
@@ -662,5 +710,5 @@
       <listitem>
         <para>
-          VirtualBox emulates a number of devices to provide the
+          &product-name; emulates a number of devices to provide the
           hardware environment that various guests need. Most of these
           are standard devices found in many PC compatible machines and
@@ -676,6 +724,5 @@
           Guest Additions for various guest operating systems. This is
           code that is installed from within a virtual machine. See
-          <xref
-        linkend="guestadditions" />.
+          <xref linkend="guestadditions" />.
         </para>
       </listitem>
@@ -684,12 +731,12 @@
         <para>
           The "Main" component is special. It ties all the above bits
-          together and is the only public API that VirtualBox provides.
-          All the client processes listed above use only this API and
-          never access the hypervisor components directly. As a result,
-          third-party applications that use the VirtualBox Main API can
-          rely on the fact that it is always well-tested and that all
-          capabilities of VirtualBox are fully exposed. It is this API
-          that is described in the VirtualBox SDK. See
-          <xref linkend="VirtualBoxAPI" />.
+          together and is the only public API that &product-name;
+          provides. All the client processes listed above use only this
+          API and never access the hypervisor components directly. As a
+          result, third-party applications that use the &product-name;
+          Main API can rely on the fact that it is always well-tested
+          and that all capabilities of &product-name; are fully exposed.
+          It is this API that is described in the &product-name; SDK.
+          See <xref linkend="VirtualBoxAPI" />.
         </para>
       </listitem>
@@ -704,21 +751,22 @@
 
     <para>
-      VirtualBox allows software in the virtual machine to run directly
-      on the processor of the host, but an array of complex techniques
-      is employed to intercept operations that would interfere with your
-      host. Whenever the guest attempts to do something that could be
-      harmful to your computer and its data, VirtualBox steps in and
-      takes action. In particular, for lots of hardware that the guest
-      believes to be accessing, VirtualBox simulates a certain "virtual"
-      environment according to how you have configured a virtual
-      machine. For example, when the guest attempts to access a hard
-      disk, VirtualBox redirects these requests to whatever you have
-      configured to be the virtual machine's virtual hard disk. This is
-      normally an image file on your host.
+      &product-name; enables software in the virtual machine to run
+      directly on the processor of the host, but an array of complex
+      techniques is employed to intercept operations that would
+      interfere with your host. Whenever the guest attempts to do
+      something that could be harmful to your computer and its data,
+      &product-name; steps in and takes action. In particular, for lots
+      of hardware that the guest believes to be accessing,
+      &product-name; simulates a certain "virtual" environment according
+      to how you have configured a virtual machine. For example, when
+      the guest attempts to access a hard disk, &product-name; redirects
+      these requests to whatever you have configured to be the virtual
+      machine's virtual hard disk. This is normally an image file on
+      your host.
     </para>
 
     <para>
       Unfortunately, the x86 platform was never designed to be
-      virtualized. Detecting situations in which VirtualBox needs to
+      virtualized. Detecting situations in which &product-name; needs to
       take control over the guest code that is executing, as described
       above, is difficult. There are two ways in which to achieve this:
@@ -731,8 +779,8 @@
           Since 2006, Intel and AMD processors have had support for
           so-called <emphasis>hardware virtualization</emphasis>. This
-          means that these processors can help VirtualBox to intercept
-          potentially dangerous operations that a guest operating system
-          may be attempting and also makes it easier to present virtual
-          hardware to a virtual machine.
+          means that these processors can help &product-name; to
+          intercept potentially dangerous operations that a guest
+          operating system may be attempting and also makes it easier to
+          present virtual hardware to a virtual machine.
         </para>
 
@@ -747,5 +795,5 @@
           <para>
             On many systems, the hardware virtualization features first
-            need to be enabled in the BIOS before VirtualBox can use
+            need to be enabled in the BIOS before &product-name; can use
             them.
           </para>
@@ -756,10 +804,11 @@
         <para>
           As opposed to other virtualization software, for many usage
-          scenarios, VirtualBox does not <emphasis>require</emphasis>
-          hardware virtualization features to be present. Through
-          sophisticated techniques, VirtualBox virtualizes many guest
-          operating systems entirely in <emphasis>software</emphasis>.
-          This means that you can run virtual machines even on older
-          processors which do not support hardware virtualization.
+          scenarios, &product-name; does not
+          <emphasis>require</emphasis> hardware virtualization features
+          to be present. Through sophisticated techniques,
+          &product-name; virtualizes many guest operating systems
+          entirely in <emphasis>software</emphasis>. This means that you
+          can run virtual machines even on older processors which do not
+          support hardware virtualization.
         </para>
       </listitem>
@@ -768,5 +817,5 @@
 
     <para>
-      Even though VirtualBox does not always require hardware
+      Even though &product-name; does not always require hardware
       virtualization, enabling it is <emphasis>required</emphasis> in
       the following scenarios:
@@ -787,10 +836,10 @@
       <listitem>
         <para>
-          VirtualBox's 64-bit guest support (added with version 2.0) and
-          multiprocessing (SMP, added with version 3.0) both require
-          hardware virtualization to be enabled. This is not much of a
-          limitation since the vast majority of today's 64-bit and
-          multicore CPUs ship with hardware virtualization anyway. The
-          exceptions to this rule are older Intel Celeron and AMD
+          &product-name;'s 64-bit guest support, added with version 2.0,
+          and multiprocessing (SMP), added with version 3.0, both
+          require hardware virtualization to be enabled. This is not
+          much of a limitation since the vast majority of today's 64-bit
+          and multicore CPUs ship with hardware virtualization anyway.
+          The exceptions to this rule are older Intel Celeron and AMD
           Opteron CPUs, for example.
         </para>
@@ -802,18 +851,19 @@
       <para>
         Do not run other hypervisors, either open source or commercial
-        virtualization products, together with VirtualBox. While several
-        hypervisors can normally be <emphasis>installed</emphasis> in
-        parallel, do not attempt to <emphasis>run</emphasis> several
-        virtual machines from competing hypervisors at the same time.
-        VirtualBox cannot track what another hypervisor is currently
-        attempting to do on the same host, and especially if several
-        products attempt to use hardware virtualization features such as
-        VT-x, this can crash the entire host. Also, within VirtualBox,
-        you can mix software and hardware virtualization when running
-        multiple VMs. In certain cases a small performance penalty will
-        be unavoidable when mixing VT-x and software virtualization VMs.
-        We recommend not mixing virtualization modes if maximum
-        performance and low overhead are essential. This does
-        <emphasis>not</emphasis> apply to AMD-V.
+        virtualization products, together with &product-name;. While
+        several hypervisors can normally be
+        <emphasis>installed</emphasis> in parallel, do not attempt to
+        <emphasis>run</emphasis> several virtual machines from competing
+        hypervisors at the same time. &product-name; cannot track what
+        another hypervisor is currently attempting to do on the same
+        host, and especially if several products attempt to use hardware
+        virtualization features such as VT-x, this can crash the entire
+        host. Also, within &product-name;, you can mix software and
+        hardware virtualization when running multiple VMs. In certain
+        cases a small performance penalty will be unavoidable when
+        mixing VT-x and software virtualization VMs. We recommend not
+        mixing virtualization modes if maximum performance and low
+        overhead are essential. This does <emphasis>not</emphasis> apply
+        to AMD-V.
       </para>
     </warning>
@@ -826,10 +876,10 @@
 
     <para>
-      VirtualBox allows exposing a paravirtualization interface to
-      facilitate accurate and efficient execution of software within a
-      virtual machine. These interfaces require the guest operating
-      system to recognize their presence and make use of them in order
-      to leverage the benefits of communicating with the VirtualBox
-      hypervisor.
+      &product-name; enables the exposure of a paravirtualization
+      interface, to facilitate accurate and efficient execution of
+      software within a virtual machine. These interfaces require the
+      guest operating system to recognize their presence and make use of
+      them in order to leverage the benefits of communicating with the
+      &product-name; hypervisor.
     </para>
 
@@ -847,9 +897,9 @@
       the <emphasis>Hyper-V</emphasis> paravirtualization provider can
       be used for VMs to run on any host platform supported by
-      VirtualBox and not just Windows.
-    </para>
-
-    <para>
-      VirtualBox provides the following interfaces:
+      &product-name; and not just Windows.
+    </para>
+
+    <para>
+      &product-name; provides the following interfaces:
     </para>
 
@@ -869,5 +919,5 @@
           <emphasis role="bold">KVM</emphasis>: Presents a Linux KVM
           hypervisor interface which is recognized by Linux kernels
-          starting with version 2.6.25. VirtualBox's implementation
+          version 2.6.25 or later. &product-name;'s implementation
           currently supports paravirtualized clocks and SMP spinlocks.
           This provider is recommended for Linux guests.
@@ -879,5 +929,5 @@
           <emphasis role="bold">Hyper-V</emphasis>: Presents a Microsoft
           Hyper-V hypervisor interface which is recognized by Windows 7
-          and newer operating systems. VirtualBox's implementation
+          and newer operating systems. &product-name;'s implementation
           currently supports paravirtualized clocks, APIC frequency
           reporting, guest debugging, guest crash reporting and relaxed
@@ -908,7 +958,7 @@
       in the 1980s with the 286 CPU architecture and then again with the
       Intel 386 and its 32-bit architecture. Whereas the 386 did have
-      limited virtualization support for real mode operation (V86 mode,
-      as used by the "DOS Box" of Windows 3.x and OS/2 2.x), no support
-      was provided for virtualizing the entire architecture.
+      limited virtualization support for real mode operation with V86
+      mode, as used by the "DOS Box" of Windows 3.x and OS/2 2.x, no
+      support was provided for virtualizing the entire architecture.
     </para>
 
@@ -944,6 +994,6 @@
       to either modify or see the true state of the CPU, and only then
       executed. This process is obviously highly complex and costly in
-      terms of performance. VirtualBox contains a recompiler based on
-      QEMU which can be used for pure software emulation, but the
+      terms of performance. &product-name; contains a recompiler based
+      on QEMU which can be used for pure software emulation, but the
       recompiler is only activated in special situations, described
       below.
@@ -962,15 +1012,16 @@
 
     <para>
-      VirtualBox chooses a different approach. When starting a virtual
-      machine, through its ring-0 support kernel driver, VirtualBox has
-      set up the host system so that it can run most of the guest code
-      natively, but it has inserted itself at the "bottom" of the
-      picture. It can then assume control when needed. If a privileged
-      instruction is executed, the guest traps, in particular because an
-      I/O register was accessed and a device needs to be virtualized, or
-      external interrupts occur. VirtualBox may then handle this and
-      either route a request to a virtual device or possibly delegate
-      handling such things to the guest or host OS. In guest context,
-      VirtualBox can therefore be in one of three states:
+      &product-name; chooses a different approach. When starting a
+      virtual machine, through its ring-0 support kernel driver,
+      &product-name; has set up the host system so that it can run most
+      of the guest code natively, but it has inserted itself at the
+      "bottom" of the picture. It can then assume control when needed.
+      If a privileged instruction is executed, the guest traps, in
+      particular because an I/O register was accessed and a device needs
+      to be virtualized, or external interrupts occur. &product-name;
+      may then handle this and either route a request to a virtual
+      device or possibly delegate handling such things to the guest or
+      host OS. In guest context, &product-name; can therefore be in one
+      of three states:
     </para>
 
@@ -990,12 +1041,12 @@
       <listitem>
         <para>
-          For guest code in ring 0, VirtualBox employs a clever trick.
-          It actually reconfigures the guest so that its ring-0 code is
-          run in ring 1 instead, which is normally not used in x86
-          operating systems). As a result, when guest ring-0 code,
+          For guest code in ring 0, &product-name; employs a clever
+          trick. It actually reconfigures the guest so that its ring-0
+          code is run in ring 1 instead, which is normally not used in
+          x86 operating systems). As a result, when guest ring-0 code,
           actually running n ring 1, such as a guest device driver
           attempts to write to an I/O register or execute a privileged
-          instruction, the VirtualBox hypervisor in the "real" ring 0
-          can take over.
+          instruction, the &product-name; hypervisor in the "real" ring
+          0 can take over.
         </para>
       </listitem>
@@ -1004,15 +1055,15 @@
         <para>
           The hypervisor (VMM) can be active. Every time a fault occurs,
-          VirtualBox looks at the offending instruction and can relegate
-          it to a virtual device or the host OS or the guest OS or run
-          it in the recompiler.
+          &product-name; looks at the offending instruction and can
+          relegate it to a virtual device or the host OS or the guest OS
+          or run it in the recompiler.
         </para>
 
         <para>
           In particular, the recompiler is used when guest code disables
-          interrupts and VirtualBox cannot figure out when they will be
-          switched back on. In these situations, VirtualBox actually
-          analyzes the guest code using its own disassembler. Also,
-          certain privileged instructions such as LIDT need to be
+          interrupts and &product-name; cannot figure out when they will
+          be switched back on. In these situations, &product-name;
+          actually analyzes the guest code using its own disassembler.
+          Also, certain privileged instructions such as LIDT need to be
           handled specially. Finally, any real-mode or protected-mode
           code, such as BIOS code, a DOS guest, or any operating system
@@ -1090,6 +1141,7 @@
           register in 32-bit mode. Accesses to this register must be
           trapped by the hypervisor. But certain guest operating
-          systems, notably Windows and Solaris, write this register very
-          often, which adversely affects virtualization performance.
+          systems, notably Windows and Oracle Solaris, write this
+          register very often, which adversely affects virtualization
+          performance.
         </para>
       </listitem>
@@ -1098,8 +1150,8 @@
 
     <para>
-      To fix these performance and security issues, VirtualBox contains
-      a Code Scanning and Analysis Manager (CSAM), which disassembles
-      guest code, and the Patch Manager (PATM), which can replace it at
-      runtime.
+      To fix these performance and security issues, &product-name;
+      contains a Code Scanning and Analysis Manager (CSAM), which
+      disassembles guest code, and the Patch Manager (PATM), which can
+      replace it at runtime.
     </para>
 
@@ -1117,7 +1169,7 @@
 
     <para>
-      In addition, every time a fault occurs, VirtualBox analyzes the
-      offending code to determine if it is possible to patch it in order
-      to prevent it from causing more faults in the future. This
+      In addition, every time a fault occurs, &product-name; analyzes
+      the offending code to determine if it is possible to patch it in
+      order to prevent it from causing more faults in the future. This
       approach works well in practice and dramatically improves software
       virtualization performance.
@@ -1233,13 +1285,4 @@
       In addition to normal hardware virtualization, your processor may
       also support the following additional sophisticated techniques:
-
-      <footnote>
-
-        <para>
-          VirtualBox 2.0 added support for AMD's nested paging; support
-          for Intel's EPT and VPIDs was added with version 2.1.
-        </para>
-
-      </footnote>
     </para>
 
@@ -1248,8 +1291,8 @@
       <listitem>
         <para>
-          A newer feature called <emphasis>nested paging</emphasis>
-          implements some memory management in hardware, which can
-          greatly accelerate hardware virtualization since these tasks
-          no longer need to be performed by the virtualization software.
+          Nested paging implements some memory management in hardware,
+          which can greatly accelerate hardware virtualization since
+          these tasks no longer need to be performed by the
+          virtualization software.
         </para>
 
@@ -1275,6 +1318,6 @@
         <para>
           On AMD processors, nested paging has been available starting
-          with the Barcelona (K10) architecture. They now call it "rapid
-          virtualization indexing" (RVI). Intel added support for nested
+          with the Barcelona (K10) architecture. They now call it rapid
+          virtualization indexing (RVI). Intel added support for nested
           paging, which they call extended page tables (EPT), with their
           Core i7 (Nehalem) processors.
@@ -1282,9 +1325,9 @@
 
         <para>
-          If nested paging is enabled, the VirtualBox hypervisor can
-          also use <emphasis role="bold">large pages</emphasis> to
-          reduce TLB usage and overhead. This can yield a performance
-          improvement of up to 5%. To enable this feature for a VM, you
-          need to use the <computeroutput>VBoxManage modifyvm
+          If nested paging is enabled, the &product-name; hypervisor can
+          also use <emphasis>large pages</emphasis> to reduce TLB usage
+          and overhead. This can yield a performance improvement of up
+          to 5%. To enable this feature for a VM, you need to use the
+          <computeroutput>VBoxManage modifyvm
           </computeroutput><computeroutput>--largepages</computeroutput>
           command. See <xref linkend="vboxmanage-modifyvm" />.
@@ -1294,8 +1337,8 @@
       <listitem>
         <para>
-          On Intel CPUs, another hardware feature called Virtual
-          Processor Identifiers" (VPIDs) can greatly accelerate context
-          switching by reducing the need for expensive flushing of the
-          processor's Translation Lookaside Buffers (TLBs).
+          On Intel CPUs, a hardware feature called Virtual Processor
+          Identifiers (VPIDs) can greatly accelerate context switching
+          by reducing the need for expensive flushing of the processor's
+          Translation Lookaside Buffers (TLBs).
         </para>
 
@@ -1304,6 +1347,5 @@
           <computeroutput>VBoxManage modifyvm --vtxvpid</computeroutput>
           and <computeroutput>--largepages</computeroutput> commands.
-          See <xref
-          linkend="vboxmanage-modifyvm" />.
+          See <xref linkend="vboxmanage-modifyvm" />.
         </para>
       </listitem>
Index: trunk/doc/manual/en_US/user_ThirdParty.xml
===================================================================
--- trunk/doc/manual/en_US/user_ThirdParty.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_ThirdParty.xml	(revision 76078)
@@ -5,327 +5,502 @@
 %all.entities;
 ]>
-
 <appendix id="ThirdParty">
+
   <title>Third-Party Materials and Licenses</title>
 
-  <para>VirtualBox incorporates materials from several Open Source software
-  projects. Therefore the use of these materials by VirtualBox is governed by
-  different Open Source licenses. This document reproduces these licenses and
-  provides a list of the materials used and their respective licensing
-  conditions. Section 1 contains a list of the materials used. Section 2
-  reproduces the applicable Open Source licenses. For each material, a
-  reference to its license is provided.</para>
-
-  <para>The source code for the materials listed below as well as the rest of
-  the VirtualBox code which is released as open source are available at <ulink
-  url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>, both as
-  tarballs for particular releases and as a live SVN repository.</para>
+  <para>
+    &product-name; incorporates materials from several Open Source
+    software projects. Therefore the use of these materials by
+    &product-name; is governed by different Open Source licenses. This
+    document reproduces these licenses and provides a list of the
+    materials used and their respective licensing conditions. Section 1
+    contains a list of the materials used. Section 2 reproduces the
+    applicable Open Source licenses. For each material, a reference to
+    its license is provided.
+  </para>
+
+  <para>
+    The source code for the materials listed below as well as the rest
+    of the &product-name; code which is released as open source are
+    available at
+    <ulink
+  url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>,
+    both as tarballs for particular releases and as a live SVN
+    repository.
+  </para>
 
   <sect1 id="third-party-materials">
+
     <title>Third-Party Materials</title>
 
     <itemizedlist>
+
       <listitem>
-        <para>VirtualBox contains portions of QEMU which is governed by the
-        licenses in <xref linkend="licX11" xrefstyle="template: %n" /> and
-        <xref linkend="licLGPL" xrefstyle="template: %n" /> and</para>
-
-        <para>(C) 2003-2005 Fabrice Bellard; Copyright (C) 2004-2005 Vassili
-        Karpov (malc); Copyright (c) 2004 Antony T Curtis; Copyright (C) 2003
-        Jocelyn Mayer</para>
+        <para>
+          &product-name; contains portions of QEMU which is governed by
+          the licenses in
+          <xref linkend="licX11" xrefstyle="template: %n" /> and
+          <xref linkend="licLGPL" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          (C) 2003-2005 Fabrice Bellard; Copyright (C) 2004-2005 Vassili
+          Karpov (malc); Copyright (c) 2004 Antony T Curtis; Copyright
+          (C) 2003 Jocelyn Mayer
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains code which is governed by the license in
-        <xref linkend="licX11" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright 2004 by the Massachusetts Institute of
-        Technology.</para>
+        <para>
+          &product-name; contains code which is governed by the license
+          in <xref linkend="licX11" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright 2004 by the Massachusetts Institute of Technology.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains code of the BOCHS VGA BIOS which is governed
-        by the license in <xref linkend="licLGPL" xrefstyle="template: %n" />
-        and</para>
-
-        <para>Copyright (C) 2001, 2002 the LGPL VGABios developers
-        Team.</para>
+        <para>
+          &product-name; contains code of the BOCHS VGA BIOS which is
+          governed by the license in
+          <xref linkend="licLGPL" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 2001, 2002 the LGPL VGABios developers Team.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains code of the BOCHS ROM BIOS which is governed
-        by the license in <xref linkend="licLGPL" xrefstyle="template: %n" />
-        and</para>
-
-        <para>Copyright (C) 2002 MandrakeSoft S.A.; Copyright (C) 2004 Fabrice
-        Bellard; Copyright (C) 2005 Struan Bartlett.</para>
+        <para>
+          &product-name; contains code of the BOCHS ROM BIOS which is
+          governed by the license in
+          <xref linkend="licLGPL" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 2002 MandrakeSoft S.A.; Copyright (C) 2004
+          Fabrice Bellard; Copyright (C) 2005 Struan Bartlett.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains the zlib library which is governed by the
-        license in <xref linkend="licZLIB" xrefstyle="template: %n" />
-        and</para>
-
-        <para>Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler.</para>
+        <para>
+          &product-name; contains the zlib library which is governed by
+          the license in
+          <xref linkend="licZLIB" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may contain OpenSSL which is governed by the license
-        in <xref linkend="licSSL" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com). This
-        product includes software written by Tim Hudson
-        (tjh@cryptsoft.com).</para>
+        <para>
+          &product-name; may contain OpenSSL which is governed by the
+          license in <xref linkend="licSSL" xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com). This
+          product includes software written by Tim Hudson
+          (tjh@cryptsoft.com).
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may contain NSPR and XPCOM which is governed by the
-        license in <xref linkend="licMPL" xrefstyle="template: %n" />
-        and</para>
-
-        <para>Copyright (C) The Authors.</para>
+        <para>
+          &product-name; may contain NSPR and XPCOM which is governed by
+          the license in
+          <xref linkend="licMPL" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) The Authors.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains Slirp which is governed by the license in
-        <xref linkend="licSlirp" xrefstyle="template: %n" /> and was written
-        by Danny Gasparovski.</para>
-
-        <para>Copyright (C) 1995, 1996 All Rights Reserved.</para>
+        <para>
+          &product-name; contains Slirp which is governed by the license
+          in <xref linkend="licSlirp" xrefstyle="template: %n" /> and
+          was written by Danny Gasparovski.
+        </para>
+
+        <para>
+          Copyright (C) 1995, 1996 All Rights Reserved.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains liblzf which is governed by the license in
-        <xref linkend="licLZF" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) 2000-2005 Marc Alexander Lehmann
-        &lt;schmorp@schmorp.de&gt;</para>
+        <para>
+          &product-name; contains liblzf which is governed by the
+          license in <xref linkend="licLZF" xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright (C) 2000-2005 Marc Alexander Lehmann
+          &lt;schmorp@schmorp.de&gt;
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may ship with a modified copy of rdesktop which is
-        governed by the license in <xref linkend="licGPL"
-        xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) Matthew Chapman and others.</para>
+        <para>
+          &product-name; may ship with a modified copy of rdesktop which
+          is governed by the license in
+          <xref linkend="licGPL"
+        xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) Matthew Chapman and others.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may ship with a copy of kchmviewer which is governed
-        by the license in <xref linkend="licGPL" xrefstyle="template: %n" />
-        and</para>
-
-        <para>Copyright (C) George Yunaev and others.</para>
+        <para>
+          &product-name; may ship with a copy of kchmviewer which is
+          governed by the license in
+          <xref linkend="licGPL" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) George Yunaev and others.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may contain Etherboot which is governed by the
-        license in <xref linkend="licGPL" xrefstyle="template: %n" /> with the
-        exception that aggregating Etherboot with another work does not
-        require the other work to be released under the same license (see
-        <literal><ulink
-        url="http://etherboot.sourceforge.net/clinks.html">http://etherboot.sourceforge.net/clinks.html</ulink></literal>).
-        Etherboot is</para>
-
-        <para>Copyright (C) Etherboot team.</para>
+        <para>
+          &product-name; may contain Etherboot which is governed by the
+          license in <xref linkend="licGPL" xrefstyle="template: %n" />
+          with the exception that aggregating Etherboot with another
+          work does not require the other work to be released under the
+          same license (see
+          <ulink
+        url="http://etherboot.sourceforge.net/clinks.html">http://etherboot.sourceforge.net/clinks.html</ulink>).
+          Etherboot is
+        </para>
+
+        <para>
+          Copyright (C) Etherboot team.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may contain iPXE which is governed by the license
-          in <xref linkend="licGPL" xrefstyle="template: %n" /> and</para>
-        <para>Copyright (C) Michael Brown &lt;mbrown@fensystems.co.uk&gt;
-          and others.</para>
+        <para>
+          &product-name; may contain iPXE which is governed by the
+          license in <xref linkend="licGPL" xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright (C) Michael Brown &lt;mbrown@fensystems.co.uk&gt;
+          and others.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains code from Wine which is governed by the
-        license in <xref linkend="licLGPL" xrefstyle="template: %n" />
-        and</para>
-
-        <para>Copyright 1993 Bob Amstadt, Copyright 1996 Albrecht Kleine,
-        Copyright 1997 David Faure, Copyright 1998 Morten Welinder, Copyright
-        1998 Ulrich Weigand, Copyright 1999 Ove Koven</para>
+        <para>
+          &product-name; contains code from Wine which is governed by
+          the license in
+          <xref linkend="licLGPL" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright 1993 Bob Amstadt, Copyright 1996 Albrecht Kleine,
+          Copyright 1997 David Faure, Copyright 1998 Morten Welinder,
+          Copyright 1998 Ulrich Weigand, Copyright 1999 Ove Koven
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains code from lwIP which is governed by the
-        license in <xref linkend="licLWIP" xrefstyle="template: %n" />
-        and</para>
-
-        <para>Copyright (C) 2001, 2002 Swedish Institute of Computer
-        Science.</para>
+        <para>
+          &product-name; contains code from lwIP which is governed by
+          the license in
+          <xref linkend="licLWIP" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 2001, 2002 Swedish Institute of Computer
+          Science.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains libxml which is governed by the license in
-        <xref linkend="licLibXML" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) 1998-2003 Daniel Veillard.</para>
+        <para>
+          &product-name; contains libxml which is governed by the
+          license in
+          <xref linkend="licLibXML" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 1998-2003 Daniel Veillard.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains libxslt which is governed by the license in
-        <xref linkend="licLibXSLT" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) 2001-2002 Daniel Veillard and Copyright (C)
-        2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard.</para>
+        <para>
+          &product-name; contains libxslt which is governed by the
+          license in
+          <xref linkend="licLibXSLT" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 2001-2002 Daniel Veillard and Copyright (C)
+          2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains code from the gSOAP XML web services
-        tools, which are licensed under the license in <xref
-        linkend="licgSOAP" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) 2000-2007, Robert van Engelen, Genivia Inc., and
-        others.</para>
+        <para>
+          &product-name; contains code from the gSOAP XML web services
+          tools, which are licensed under the license in
+          <xref
+        linkend="licgSOAP" xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright (C) 2000-2007, Robert van Engelen, Genivia Inc., and
+          others.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox ships with the application tunctl (shipped as
-        VBoxTunctl) from the User-mode Linux suite which is governed by the
-        license in <xref linkend="licGPL" xrefstyle="template: %n" />
-        and</para>
-
-        <para>Copyright (C) 2002 Jeff Dike.</para>
+        <para>
+          &product-name; ships with the application tunctl (shipped as
+          VBoxTunctl) from the User-mode Linux suite which is governed
+          by the license in
+          <xref linkend="licGPL" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 2002 Jeff Dike.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains code from Chromium, an OpenGL
-        implementation, which is goverened by the licenses in <xref
-        linkend="licChromium" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) Stanford University, The Regents of the University
-        of California, Red Hat, and others.</para>
+        <para>
+          &product-name; contains code from Chromium, an OpenGL
+          implementation, which is goverened by the licenses in
+          <xref
+        linkend="licChromium" xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright (C) Stanford University, The Regents of the
+          University of California, Red Hat, and others.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains libcurl which is governed by the license in
-        <xref linkend="licLibCurl" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) 1996-2009, Daniel Stenberg.</para>
+        <para>
+          &product-name; contains libcurl which is governed by the
+          license in
+          <xref linkend="licLibCurl" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 1996-2009, Daniel Stenberg.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains dnsproxy which is governed by the license in
-        <xref linkend="licMIT" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (c) 2003, 2004, 2005 Armin Wolfermann.</para>
+        <para>
+          &product-name; contains dnsproxy which is governed by the
+          license in <xref linkend="licMIT" xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright (c) 2003, 2004, 2005 Armin Wolfermann.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may contain iniparser which is governed by the
-        license in <xref linkend="licMIT" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (c) 2000-2008 by Nicolas Devillard.</para>
+        <para>
+          &product-name; may contain iniparser which is governed by the
+          license in <xref linkend="licMIT" xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright (c) 2000-2008 by Nicolas Devillard.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains some code from libgd which is governed by
-        the license in <xref linkend="licLibgd" xrefstyle="template: %n"/> and</para>
-
-        <para>Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-        Pierre-Alain Joye (pierre@libgd.org).</para>
+        <para>
+          &product-name; contains some code from libgd which is governed
+          by the license in
+          <xref linkend="licLibgd" xrefstyle="template: %n"/> and
+        </para>
+
+        <para>
+          Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+          Pierre-Alain Joye (pierre@libgd.org).
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains code from the EFI Development Kit II
+        <para>
+          &product-name; contains code from the EFI Development Kit II
           which is governed by the license in
-          <xref linkend="licBsdIntel" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (c) 2004-2008, Intel Corporation.</para>
+          <xref linkend="licBsdIntel" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (c) 2004-2008, Intel Corporation.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains libjpeg which is governed by the
-        license in <xref linkend="licJPEG" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.</para>
+        <para>
+          &product-name; contains libjpeg which is governed by the
+          license in <xref linkend="licJPEG" xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may contain x86 SIMD extension for IJG JPEG library
-        which is governed by the license in <xref linkend="licJPEGSIMD"
-        xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright 2009 Pierre Ossman &lt;ossman@cendio.se&gt; for Cendio AB;
-        Copyright 2010 D. R. Commander; Copyright (C) 1999-2006, MIYASAKA Masaru.
+        <para>
+          &product-name; may contain x86 SIMD extension for IJG JPEG
+          library which is governed by the license in
+          <xref linkend="licJPEGSIMD"
+        xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright 2009 Pierre Ossman &lt;ossman@cendio.se&gt; for
+          Cendio AB; Copyright 2010 D. R. Commander; Copyright (C)
+          1999-2006, MIYASAKA Masaru.
         </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may ship a copy of Qt which is governed by the license in
-          <xref linkend="licLGPL" xrefstyle="template: %n" />
-        and</para>
-
-        <para>Copyright (C) 2010, 2011 Nokia Corporation and/or its subsidiary(-ies).</para>
+        <para>
+          &product-name; may ship a copy of Qt which is governed by the
+          license in <xref linkend="licLGPL" xrefstyle="template: %n" />
+          and
+        </para>
+
+        <para>
+          Copyright (C) 2010, 2011 Nokia Corporation and/or its
+          subsidiary(-ies).
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains parts of the FreeBSD kernel which is governed by
-          the license in <xref linkend="licFreeBsd" xrefstyle="template: %n" />.
+        <para>
+          &product-name; contains parts of the FreeBSD kernel which is
+          governed by the license in
+          <xref linkend="licFreeBsd" xrefstyle="template: %n" />.
         </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains parts of the NetBSD kernel which is governed by
-          the license in <xref linkend="licNetBsd" xrefstyle="template: %n" />.
+        <para>
+          &product-name; contains parts of the NetBSD kernel which is
+          governed by the license in
+          <xref linkend="licNetBsd" xrefstyle="template: %n" />.
         </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains portions of liblightdm-gobject which is governed by the
-        license in <xref linkend="licLGPL" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) 2010-2013 Canonical Ltd.; Copyright (C) 2010-2011 Robert Ancell.</para>
+        <para>
+          &product-name; contains portions of liblightdm-gobject which
+          is governed by the license in
+          <xref linkend="licLGPL" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 2010-2013 Canonical Ltd.; Copyright (C)
+          2010-2011 Robert Ancell.
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains portions of glib which is governed by the
-          license in <xref linkend="licLGPL" xrefstyle="template: %n" /> and</para>
-
-        <para>Copyright (C) 1995-2011 The Glib team</para>
+        <para>
+          &product-name; contains portions of glib which is governed by
+          the license in
+          <xref linkend="licLGPL" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (C) 1995-2011 The Glib team
+        </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains portions of PCRE which is governed by the
-          license in <xref linkend="licPcre" xrefstyle="template: %n" /> and</para>
-        <para>Copyright (c) 1997-2012 University of Cambridge;
-          Copyright(c) 2009-2012 Zoltan Herczeg;
-          Copyright (c) 2007-2012, Google Inc.
+        <para>
+          &product-name; contains portions of PCRE which is governed by
+          the license in
+          <xref linkend="licPcre" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (c) 1997-2012 University of Cambridge; Copyright(c)
+          2009-2012 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.
         </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains portions of libffi which is governed by the
-          license in <xref linkend="licLibffi" xrefstyle="template: %n" /> and</para>
-        <para>
-          Copyright (c) 1996-2012  Anthony Green, Red Hat, Inc and others.
-          See source files for details.
+        <para>
+          &product-name; contains portions of libffi which is governed
+          by the license in
+          <xref linkend="licLibffi" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (c) 1996-2012 Anthony Green, Red Hat, Inc and
+          others. See source files for details.
         </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains portions of FLTK which is governed by the
-          licenses in <xref linkend="licFltk" xrefstyle="template: %n" /> and
-          <xref linkend="licLGPL" xrefstyle="template: %n"/> and  </para>
-        <para>
-          Copyright (C) 1991-2012  The FLTK team
+        <para>
+          &product-name; contains portions of FLTK which is governed by
+          the licenses in
+          <xref linkend="licFltk" xrefstyle="template: %n" /> and
+          <xref linkend="licLGPL" xrefstyle="template: %n"/> and
+        </para>
+
+        <para>
+          Copyright (C) 1991-2012 The FLTK team
         </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains portions of Expat which is governed by the
-          license in <xref linkend="licExpat" xrefstyle="template: %n" /> and</para>
-        <para>
-          Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-          and Clark Cooper; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat
-          maintainers.
+        <para>
+          &product-name; contains portions of Expat which is governed by
+          the license in
+          <xref linkend="licExpat" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (c) 1998, 1999, 2000 Thai Open Source Software
+          Center Ltd and Clark Cooper; Copyright (c) 2001, 2002, 2003,
+          2004, 2005, 2006 Expat maintainers.
         </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox contains portions of Fontconfig which is governed by the
-          license in <xref linkend="licFontconfig" xrefstyle="template: %n" />
-          and</para>
+        <para>
+          &product-name; contains portions of Fontconfig which is
+          governed by the license in
+          <xref linkend="licFontconfig" xrefstyle="template: %n" /> and
+        </para>
+
         <para>
           Copyright (C) 2001, 2003 Keith Packard
@@ -334,2612 +509,3704 @@
 
       <listitem>
-        <para>VirtualBox contains portions of Freetype which is governed by the
-          license in <xref linkend="licFreetype" xrefstyle="template: %n" />
-          and</para>
-        <para>
-          Copyright 2012 The FreeType Project (www.freetype.org). All rights reserved.
+        <para>
+          &product-name; contains portions of Freetype which is governed
+          by the license in
+          <xref linkend="licFreetype" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright 2012 The FreeType Project (www.freetype.org). All
+          rights reserved.
         </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may contain code from the WebM VP8 Codec SDK which
-          is governed by the license in <xref linkend="licVPX" xrefstyle="template: %n" />
-          and </para>
-        <para>
-          Copyright (c) 2010, The WebM Project authors. All rights reserved.
+        <para>
+          &product-name; may contain code from the WebM VP8 Codec SDK
+          which is governed by the license in
+          <xref linkend="licVPX" xrefstyle="template: %n" /> and
+        </para>
+
+        <para>
+          Copyright (c) 2010, The WebM Project authors. All rights
+          reserved.
         </para>
       </listitem>
 
       <listitem>
-        <para>VirtualBox may contain code from libopus ("Opus") which
-          is governed by the license in <xref linkend="licOpus" xrefstyle="template: %n" />
-          and </para>
+        <para>
+          &product-name; may contain code from libopus ("Opus") which is
+          governed by the license in
+          <xref linkend="licOpus" xrefstyle="template: %n" /> and
+        </para>
+
         <para>
           Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic,
-                              Jean-Marc Valin, Timothy B. Terriberry,
-                              CSIRO, Gregory Maxwell, Mark Borgerding,
-                              Erik de Castro Lopo
+          Jean-Marc Valin, Timothy B. Terriberry, CSIRO, Gregory
+          Maxwell, Mark Borgerding, Erik de Castro Lopo
         </para>
       </listitem>
 
     </itemizedlist>
+
   </sect1>
 
   <sect1 id="third-party-licenses">
+
     <title>Third-Party Licenses</title>
 
     <sect2 id="licGPL">
+
       <title>GNU General Public License (GPL)</title>
 
-      <para>GNU GENERAL PUBLIC LICENSE Version 2, June 1991</para>
-
-      <para>Copyright (C) 1989, 1991 Free Software Foundation, Inc.</para>
-
-      <para>51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</para>
-
-      <para>Everyone is permitted to copy and distribute verbatim copies of
-      this license document, but changing it is not allowed.</para>
-
-      <para>Preamble</para>
-
-      <para>The licenses for most software are designed to take away your
-      freedom to share and change it. By contrast, the GNU General Public
-      License is intended to guarantee your freedom to share and change free
-      software--to make sure the software is free for all its users. This
-      General Public License applies to most of the Free Software Foundation's
-      software and to any other program whose authors commit to using it.
-      (Some other Free Software Foundation software is covered by the GNU
-      Library General Public License instead.) You can apply it to your
-      programs, too.</para>
-
-      <para>When we speak of free software, we are referring to freedom, not
-      price. Our General Public Licenses are designed to make sure that you
-      have the freedom to distribute copies of free software (and charge for
-      this service if you wish), that you receive source code or can get it if
-      you want it, that you can change the software or use pieces of it in new
-      free programs; and that you know you can do these things.</para>
-
-      <para>To protect your rights, we need to make restrictions that forbid
-      anyone to deny you these rights or to ask you to surrender the rights.
-      These restrictions translate to certain responsibilities for you if you
-      distribute copies of the software, or if you modify it.</para>
-
-      <para>For example, if you distribute copies of such a program, whether
-      gratis or for a fee, you must give the recipients all the rights that
-      you have. You must make sure that they, too, receive or can get the
-      source code. And you must show them these terms so they know their
-      rights.</para>
-
-      <para>We protect your rights with two steps: (1) copyright the software,
-      and (2) offer you this license which gives you legal permission to copy,
-      distribute and/or modify the software.</para>
-
-      <para>Also, for each author's protection and ours, we want to make
-      certain that everyone understands that there is no warranty for this
-      free software. If the software is modified by someone else and passed
-      on, we want its recipients to know that what they have is not the
-      original, so that any problems introduced by others will not reflect on
-      the original authors' reputations.</para>
-
-      <para>Finally, any free program is threatened constantly by software
-      patents. We wish to avoid the danger that redistributors of a free
-      program will individually obtain patent licenses, in effect making the
-      program proprietary. To prevent this, we have made it clear that any
-      patent must be licensed for everyone's free use or not licensed at
-      all.</para>
-
-      <para>The precise terms and conditions for copying, distribution and
-      modification follow.</para>
-
-      <para>GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING,
-      DISTRIBUTION AND MODIFICATION</para>
-
-      <para>0. This License applies to any program or other work which
-      contains a notice placed by the copyright holder saying it may be
-      distributed under the terms of this General Public License. The
-      "Program", below, refers to any such program or work, and a "work based
-      on the Program" means either the Program or any derivative work under
-      copyright law: that is to say, a work containing the Program or a
-      portion of it, either verbatim or with modifications and/or translated
-      into another language. (Hereinafter, translation is included without
-      limitation in the term "modification".) Each licensee is addressed as
-      "you".</para>
-
-      <para>Activities other than copying, distribution and modification are
-      not covered by this License; they are outside its scope. The act of
-      running the Program is not restricted, and the output from the Program
-      is covered only if its contents constitute a work based on the Program
-      (independent of having been made by running the Program). Whether that
-      is true depends on what the Program does.</para>
-
-      <para>1. You may copy and distribute verbatim copies of the Program's
-      source code as you receive it, in any medium, provided that you
-      conspicuously and appropriately publish on each copy an appropriate
-      copyright notice and disclaimer of warranty; keep intact all the notices
-      that refer to this License and to the absence of any warranty; and give
-      any other recipients of the Program a copy of this License along with
-      the Program.</para>
-
-      <para>You may charge a fee for the physical act of transferring a copy,
-      and you may at your option offer warranty protection in exchange for a
-      fee.</para>
-
-      <para>2. You may modify your copy or copies of the Program or any
-      portion of it, thus forming a work based on the Program, and copy and
-      distribute such modifications or work under the terms of Section 1
-      above, provided that you also meet all of these conditions:</para>
-
-      <para>a) You must cause the modified files to carry prominent notices
-      stating that you changed the files and the date of any change.</para>
-
-      <para>b) You must cause any work that you distribute or publish, that in
-      whole or in part contains or is derived from the Program or any part
-      thereof, to be licensed as a whole at no charge to all third parties
-      under the terms of this License.</para>
-
-      <para>c) If the modified program normally reads commands interactively
-      when run, you must cause it, when started running for such interactive
-      use in the most ordinary way, to print or display an announcement
-      including an appropriate copyright notice and a notice that there is no
-      warranty (or else, saying that you provide a warranty) and that users
-      may redistribute the program under these conditions, and telling the
-      user how to view a copy of this License. (Exception: if the Program
-      itself is interactive but does not normally print such an announcement,
-      your work based on the Program is not required to print an
-      announcement.)</para>
-
-      <para>These requirements apply to the modified work as a whole. If
-      identifiable sections of that work are not derived from the Program, and
-      can be reasonably considered independent and separate works in
-      themselves, then this License, and its terms, do not apply to those
-      sections when you distribute them as separate works. But when you
-      distribute the same sections as part of a whole which is a work based on
-      the Program, the distribution of the whole must be on the terms of this
-      License, whose permissions for other licensees extend to the entire
-      whole, and thus to each and every part regardless of who wrote
-      it.</para>
-
-      <para>Thus, it is not the intent of this section to claim rights or
-      contest your rights to work written entirely by you; rather, the intent
-      is to exercise the right to control the distribution of derivative or
-      collective works based on the Program.</para>
-
-      <para>In addition, mere aggregation of another work not based on the
-      Program with the Program (or with a work based on the Program) on a
-      volume of a storage or distribution medium does not bring the other work
-      under the scope of this License.</para>
-
-      <para>3. You may copy and distribute the Program (or a work based on it,
-      under Section 2) in object code or executable form under the terms of
-      Sections 1 and 2 above provided that you also do one of the
-      following:</para>
-
-      <para>a) Accompany it with the complete corresponding machine-readable
-      source code, which must be distributed under the terms of Sections 1 and
-      2 above on a medium customarily used for software interchange;
-      or,</para>
-
-      <para>b) Accompany it with a written offer, valid for at least three
-      years, to give any third party, for a charge no more than your cost of
-      physically performing source distribution, a complete machine-readable
-      copy of the corresponding source code, to be distributed under the terms
-      of Sections 1 and 2 above on a medium customarily used for software
-      interchange; or,</para>
-
-      <para>c) Accompany it with the information you received as to the offer
-      to distribute corresponding source code. (This alternative is allowed
-      only for noncommercial distribution and only if you received the program
-      in object code or executable form with such an offer, in accord with
-      Subsection b above.)</para>
-
-      <para>The source code for a work means the preferred form of the work
-      for making modifications to it. For an executable work, complete source
-      code means all the source code for all modules it contains, plus any
-      associated interface definition files, plus the scripts used to control
-      compilation and installation of the executable. However, as a special
-      exception, the source code distributed need not include anything that is
-      normally distributed (in either source or binary form) with the major
-      components (compiler, kernel, and so on) of the operating system on
-      which the executable runs, unless that component itself accompanies the
-      executable.</para>
-
-      <para>If distribution of executable or object code is made by offering
-      access to copy from a designated place, then offering equivalent access
-      to copy the source code from the same place counts as distribution of
-      the source code, even though third parties are not compelled to copy the
-      source along with the object code.</para>
-
-      <para>4. You may not copy, modify, sublicense, or distribute the Program
-      except as expressly provided under this License. Any attempt otherwise
-      to copy, modify, sublicense or distribute the Program is void, and will
-      automatically terminate your rights under this License. However, parties
-      who have received copies, or rights, from you under this License will
-      not have their licenses terminated so long as such parties remain in
-      full compliance.</para>
-
-      <para>5. You are not required to accept this License, since you have not
-      signed it. However, nothing else grants you permission to modify or
-      distribute the Program or its derivative works. These actions are
-      prohibited by law if you do not accept this License. Therefore, by
-      modifying or distributing the Program (or any work based on the
-      Program), you indicate your acceptance of this License to do so, and all
-      its terms and conditions for copying, distributing or modifying the
-      Program or works based on it.</para>
-
-      <para>6. Each time you redistribute the Program (or any work based on
-      the Program), the recipient automatically receives a license from the
-      original licensor to copy, distribute or modify the Program subject to
-      these terms and conditions. You may not impose any further restrictions
-      on the recipients' exercise of the rights granted herein. You are not
-      responsible for enforcing compliance by third parties to this
-      License.</para>
-
-      <para>7. If, as a consequence of a court judgment or allegation of
-      patent infringement or for any other reason (not limited to patent
-      issues), conditions are imposed on you (whether by court order,
-      agreement or otherwise) that contradict the conditions of this License,
-      they do not excuse you from the conditions of this License. If you
-      cannot distribute so as to satisfy simultaneously your obligations under
-      this License and any other pertinent obligations, then as a consequence
-      you may not distribute the Program at all. For example, if a patent
-      license would not permit royalty-free redistribution of the Program by
-      all those who receive copies directly or indirectly through you, then
-      the only way you could satisfy both it and this License would be to
-      refrain entirely from distribution of the Program.</para>
-
-      <para>If any portion of this section is held invalid or unenforceable
-      under any particular circumstance, the balance of the section is
-      intended to apply and the section as a whole is intended to apply in
-      other circumstances.</para>
-
-      <para>It is not the purpose of this section to induce you to infringe
-      any patents or other property right claims or to contest validity of any
-      such claims; this section has the sole purpose of protecting the
-      integrity of the free software distribution system, which is implemented
-      by public license practices. Many people have made generous
-      contributions to the wide range of software distributed through that
-      system in reliance on consistent application of that system; it is up to
-      the author/donor to decide if he or she is willing to distribute
-      software through any other system and a licensee cannot impose that
-      choice.</para>
-
-      <para>This section is intended to make thoroughly clear what is believed
-      to be a consequence of the rest of this License.</para>
-
-      <para>8. If the distribution and/or use of the Program is restricted in
-      certain countries either by patents or by copyrighted interfaces, the
-      original copyright holder who places the Program under this License may
-      add an explicit geographical distribution limitation excluding those
-      countries, so that distribution is permitted only in or among countries
-      not thus excluded. In such case, this License incorporates the
-      limitation as if written in the body of this License.</para>
-
-      <para>9. The Free Software Foundation may publish revised and/or new
-      versions of the General Public License from time to time. Such new
-      versions will be similar in spirit to the present version, but may
-      differ in detail to address new problems or concerns.</para>
-
-      <para>Each version is given a distinguishing version number. If the
-      Program specifies a version number of this License which applies to it
-      and "any later version", you have the option of following the terms and
-      conditions either of that version or of any later version published by
-      the Free Software Foundation. If the Program does not specify a version
-      number of this License, you may choose any version ever published by the
-      Free Software Foundation.</para>
-
-      <para>10. If you wish to incorporate parts of the Program into other
-      free programs whose distribution conditions are different, write to the
-      author to ask for permission. For software which is copyrighted by the
-      Free Software Foundation, write to the Free Software Foundation; we
-      sometimes make exceptions for this. Our decision will be guided by the
-      two goals of preserving the free status of all derivatives of our free
-      software and of promoting the sharing and reuse of software
-      generally.</para>
-
-      <para>NO WARRANTY</para>
-
-      <para>11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-      WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-      EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-      OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
-      EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-      ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
-      YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-      NECESSARY SERVICING, REPAIR OR CORRECTION.</para>
-
-      <para>12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-      WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-      AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-      DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-      DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-      (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-      INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-      THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
-      OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</para>
-
-      <para>END OF TERMS AND CONDITIONS</para>
+      <para>
+        GNU GENERAL PUBLIC LICENSE Version 2, June 1991
+      </para>
+
+      <para>
+        Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+      </para>
+
+      <para>
+        51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+      </para>
+
+      <para>
+        Everyone is permitted to copy and distribute verbatim copies of
+        this license document, but changing it is not allowed.
+      </para>
+
+      <para>
+        Preamble
+      </para>
+
+      <para>
+        The licenses for most software are designed to take away your
+        freedom to share and change it. By contrast, the GNU General
+        Public License is intended to guarantee your freedom to share
+        and change free software--to make sure the software is free for
+        all its users. This General Public License applies to most of
+        the Free Software Foundation's software and to any other program
+        whose authors commit to using it. (Some other Free Software
+        Foundation software is covered by the GNU Library General Public
+        License instead.) You can apply it to your programs, too.
+      </para>
+
+      <para>
+        When we speak of free software, we are referring to freedom, not
+        price. Our General Public Licenses are designed to make sure
+        that you have the freedom to distribute copies of free software
+        (and charge for this service if you wish), that you receive
+        source code or can get it if you want it, that you can change
+        the software or use pieces of it in new free programs; and that
+        you know you can do these things.
+      </para>
+
+      <para>
+        To protect your rights, we need to make restrictions that forbid
+        anyone to deny you these rights or to ask you to surrender the
+        rights. These restrictions translate to certain responsibilities
+        for you if you distribute copies of the software, or if you
+        modify it.
+      </para>
+
+      <para>
+        For example, if you distribute copies of such a program, whether
+        gratis or for a fee, you must give the recipients all the rights
+        that you have. You must make sure that they, too, receive or can
+        get the source code. And you must show them these terms so they
+        know their rights.
+      </para>
+
+      <para>
+        We protect your rights with two steps: (1) copyright the
+        software, and (2) offer you this license which gives you legal
+        permission to copy, distribute and/or modify the software.
+      </para>
+
+      <para>
+        Also, for each author's protection and ours, we want to make
+        certain that everyone understands that there is no warranty for
+        this free software. If the software is modified by someone else
+        and passed on, we want its recipients to know that what they
+        have is not the original, so that any problems introduced by
+        others will not reflect on the original authors' reputations.
+      </para>
+
+      <para>
+        Finally, any free program is threatened constantly by software
+        patents. We wish to avoid the danger that redistributors of a
+        free program will individually obtain patent licenses, in effect
+        making the program proprietary. To prevent this, we have made it
+        clear that any patent must be licensed for everyone's free use
+        or not licensed at all.
+      </para>
+
+      <para>
+        The precise terms and conditions for copying, distribution and
+        modification follow.
+      </para>
+
+      <para>
+        GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING,
+        DISTRIBUTION AND MODIFICATION
+      </para>
+
+      <para>
+        0. This License applies to any program or other work which
+        contains a notice placed by the copyright holder saying it may
+        be distributed under the terms of this General Public License.
+        The "Program", below, refers to any such program or work, and a
+        "work based on the Program" means either the Program or any
+        derivative work under copyright law: that is to say, a work
+        containing the Program or a portion of it, either verbatim or
+        with modifications and/or translated into another language.
+        (Hereinafter, translation is included without limitation in the
+        term "modification".) Each licensee is addressed as "you".
+      </para>
+
+      <para>
+        Activities other than copying, distribution and modification are
+        not covered by this License; they are outside its scope. The act
+        of running the Program is not restricted, and the output from
+        the Program is covered only if its contents constitute a work
+        based on the Program (independent of having been made by running
+        the Program). Whether that is true depends on what the Program
+        does.
+      </para>
+
+      <para>
+        1. You may copy and distribute verbatim copies of the Program's
+        source code as you receive it, in any medium, provided that you
+        conspicuously and appropriately publish on each copy an
+        appropriate copyright notice and disclaimer of warranty; keep
+        intact all the notices that refer to this License and to the
+        absence of any warranty; and give any other recipients of the
+        Program a copy of this License along with the Program.
+      </para>
+
+      <para>
+        You may charge a fee for the physical act of transferring a
+        copy, and you may at your option offer warranty protection in
+        exchange for a fee.
+      </para>
+
+      <para>
+        2. You may modify your copy or copies of the Program or any
+        portion of it, thus forming a work based on the Program, and
+        copy and distribute such modifications or work under the terms
+        of Section 1 above, provided that you also meet all of these
+        conditions:
+      </para>
+
+      <para>
+        a) You must cause the modified files to carry prominent notices
+        stating that you changed the files and the date of any change.
+      </para>
+
+      <para>
+        b) You must cause any work that you distribute or publish, that
+        in whole or in part contains or is derived from the Program or
+        any part thereof, to be licensed as a whole at no charge to all
+        third parties under the terms of this License.
+      </para>
+
+      <para>
+        c) If the modified program normally reads commands interactively
+        when run, you must cause it, when started running for such
+        interactive use in the most ordinary way, to print or display an
+        announcement including an appropriate copyright notice and a
+        notice that there is no warranty (or else, saying that you
+        provide a warranty) and that users may redistribute the program
+        under these conditions, and telling the user how to view a copy
+        of this License. (Exception: if the Program itself is
+        interactive but does not normally print such an announcement,
+        your work based on the Program is not required to print an
+        announcement.)
+      </para>
+
+      <para>
+        These requirements apply to the modified work as a whole. If
+        identifiable sections of that work are not derived from the
+        Program, and can be reasonably considered independent and
+        separate works in themselves, then this License, and its terms,
+        do not apply to those sections when you distribute them as
+        separate works. But when you distribute the same sections as
+        part of a whole which is a work based on the Program, the
+        distribution of the whole must be on the terms of this License,
+        whose permissions for other licensees extend to the entire
+        whole, and thus to each and every part regardless of who wrote
+        it.
+      </para>
+
+      <para>
+        Thus, it is not the intent of this section to claim rights or
+        contest your rights to work written entirely by you; rather, the
+        intent is to exercise the right to control the distribution of
+        derivative or collective works based on the Program.
+      </para>
+
+      <para>
+        In addition, mere aggregation of another work not based on the
+        Program with the Program (or with a work based on the Program)
+        on a volume of a storage or distribution medium does not bring
+        the other work under the scope of this License.
+      </para>
+
+      <para>
+        3. You may copy and distribute the Program (or a work based on
+        it, under Section 2) in object code or executable form under the
+        terms of Sections 1 and 2 above provided that you also do one of
+        the following:
+      </para>
+
+      <para>
+        a) Accompany it with the complete corresponding machine-readable
+        source code, which must be distributed under the terms of
+        Sections 1 and 2 above on a medium customarily used for software
+        interchange; or,
+      </para>
+
+      <para>
+        b) Accompany it with a written offer, valid for at least three
+        years, to give any third party, for a charge no more than your
+        cost of physically performing source distribution, a complete
+        machine-readable copy of the corresponding source code, to be
+        distributed under the terms of Sections 1 and 2 above on a
+        medium customarily used for software interchange; or,
+      </para>
+
+      <para>
+        c) Accompany it with the information you received as to the
+        offer to distribute corresponding source code. (This alternative
+        is allowed only for noncommercial distribution and only if you
+        received the program in object code or executable form with such
+        an offer, in accord with Subsection b above.)
+      </para>
+
+      <para>
+        The source code for a work means the preferred form of the work
+        for making modifications to it. For an executable work, complete
+        source code means all the source code for all modules it
+        contains, plus any associated interface definition files, plus
+        the scripts used to control compilation and installation of the
+        executable. However, as a special exception, the source code
+        distributed need not include anything that is normally
+        distributed (in either source or binary form) with the major
+        components (compiler, kernel, and so on) of the operating system
+        on which the executable runs, unless that component itself
+        accompanies the executable.
+      </para>
+
+      <para>
+        If distribution of executable or object code is made by offering
+        access to copy from a designated place, then offering equivalent
+        access to copy the source code from the same place counts as
+        distribution of the source code, even though third parties are
+        not compelled to copy the source along with the object code.
+      </para>
+
+      <para>
+        4. You may not copy, modify, sublicense, or distribute the
+        Program except as expressly provided under this License. Any
+        attempt otherwise to copy, modify, sublicense or distribute the
+        Program is void, and will automatically terminate your rights
+        under this License. However, parties who have received copies,
+        or rights, from you under this License will not have their
+        licenses terminated so long as such parties remain in full
+        compliance.
+      </para>
+
+      <para>
+        5. You are not required to accept this License, since you have
+        not signed it. However, nothing else grants you permission to
+        modify or distribute the Program or its derivative works. These
+        actions are prohibited by law if you do not accept this License.
+        Therefore, by modifying or distributing the Program (or any work
+        based on the Program), you indicate your acceptance of this
+        License to do so, and all its terms and conditions for copying,
+        distributing or modifying the Program or works based on it.
+      </para>
+
+      <para>
+        6. Each time you redistribute the Program (or any work based on
+        the Program), the recipient automatically receives a license
+        from the original licensor to copy, distribute or modify the
+        Program subject to these terms and conditions. You may not
+        impose any further restrictions on the recipients' exercise of
+        the rights granted herein. You are not responsible for enforcing
+        compliance by third parties to this License.
+      </para>
+
+      <para>
+        7. If, as a consequence of a court judgment or allegation of
+        patent infringement or for any other reason (not limited to
+        patent issues), conditions are imposed on you (whether by court
+        order, agreement or otherwise) that contradict the conditions of
+        this License, they do not excuse you from the conditions of this
+        License. If you cannot distribute so as to satisfy
+        simultaneously your obligations under this License and any other
+        pertinent obligations, then as a consequence you may not
+        distribute the Program at all. For example, if a patent license
+        would not permit royalty-free redistribution of the Program by
+        all those who receive copies directly or indirectly through you,
+        then the only way you could satisfy both it and this License
+        would be to refrain entirely from distribution of the Program.
+      </para>
+
+      <para>
+        If any portion of this section is held invalid or unenforceable
+        under any particular circumstance, the balance of the section is
+        intended to apply and the section as a whole is intended to
+        apply in other circumstances.
+      </para>
+
+      <para>
+        It is not the purpose of this section to induce you to infringe
+        any patents or other property right claims or to contest
+        validity of any such claims; this section has the sole purpose
+        of protecting the integrity of the free software distribution
+        system, which is implemented by public license practices. Many
+        people have made generous contributions to the wide range of
+        software distributed through that system in reliance on
+        consistent application of that system; it is up to the
+        author/donor to decide if he or she is willing to distribute
+        software through any other system and a licensee cannot impose
+        that choice.
+      </para>
+
+      <para>
+        This section is intended to make thoroughly clear what is
+        believed to be a consequence of the rest of this License.
+      </para>
+
+      <para>
+        8. If the distribution and/or use of the Program is restricted
+        in certain countries either by patents or by copyrighted
+        interfaces, the original copyright holder who places the Program
+        under this License may add an explicit geographical distribution
+        limitation excluding those countries, so that distribution is
+        permitted only in or among countries not thus excluded. In such
+        case, this License incorporates the limitation as if written in
+        the body of this License.
+      </para>
+
+      <para>
+        9. The Free Software Foundation may publish revised and/or new
+        versions of the General Public License from time to time. Such
+        new versions will be similar in spirit to the present version,
+        but may differ in detail to address new problems or concerns.
+      </para>
+
+      <para>
+        Each version is given a distinguishing version number. If the
+        Program specifies a version number of this License which applies
+        to it and "any later version", you have the option of following
+        the terms and conditions either of that version or of any later
+        version published by the Free Software Foundation. If the
+        Program does not specify a version number of this License, you
+        may choose any version ever published by the Free Software
+        Foundation.
+      </para>
+
+      <para>
+        10. If you wish to incorporate parts of the Program into other
+        free programs whose distribution conditions are different, write
+        to the author to ask for permission. For software which is
+        copyrighted by the Free Software Foundation, write to the Free
+        Software Foundation; we sometimes make exceptions for this. Our
+        decision will be guided by the two goals of preserving the free
+        status of all derivatives of our free software and of promoting
+        the sharing and reuse of software generally.
+      </para>
+
+      <para>
+        NO WARRANTY
+      </para>
+
+      <para>
+        11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+        WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
+        LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+        HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+        WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+        BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+        AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE
+        QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+        PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
+        SERVICING, REPAIR OR CORRECTION.
+      </para>
+
+      <para>
+        12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO
+        IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
+        MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
+        LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+        INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+        INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS
+        OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+        YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH
+        ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
+        ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+      </para>
+
+      <para>
+        END OF TERMS AND CONDITIONS
+      </para>
+
     </sect2>
 
     <sect2 id="licLGPL">
+
       <title>GNU Lesser General Public License (LGPL)</title>
 
-      <para>GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February
-      1999</para>
-
-      <para>Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple
-      Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to
-      copy and distribute verbatim copies of this license document, but
-      changing it is not allowed.</para>
-
-      <para>[This is the first released version of the Lesser GPL. It also
-      counts as the successor of the GNU Library Public License, version 2,
-      hence the version number 2.1.]</para>
-
-      <para>Preamble</para>
-
-      <para>The licenses for most software are designed to take away your
-      freedom to share and change it. By contrast, the GNU General Public
-      Licenses are intended to guarantee your freedom to share and change free
-      software--to make sure the software is free for all its users.</para>
-
-      <para>This license, the Lesser General Public License, applies to some
-      specially designated software packages--typically libraries--of the Free
-      Software Foundation and other authors who decide to use it. You can use
-      it too, but we suggest you first think carefully about whether this
-      license or the ordinary General Public License is the better strategy to
-      use in any particular case, based on the explanations below.</para>
-
-      <para>When we speak of free software, we are referring to freedom of
-      use, not price. Our General Public Licenses are designed to make sure
-      that you have the freedom to distribute copies of free software (and
-      charge for this service if you wish); that you receive source code or
-      can get it if you want it; that you can change the software and use
-      pieces of it in new free programs; and that you are informed that you
-      can do these things.</para>
-
-      <para>To protect your rights, we need to make restrictions that forbid
-      distributors to deny you these rights or to ask you to surrender these
-      rights. These restrictions translate to certain responsibilities for you
-      if you distribute copies of the library or if you modify it.</para>
-
-      <para>For example, if you distribute copies of the library, whether
-      gratis or for a fee, you must give the recipients all the rights that we
-      gave you. You must make sure that they, too, receive or can get the
-      source code. If you link other code with the library, you must provide
-      complete object files to the recipients, so that they can relink them
-      with the library after making changes to the library and recompiling it.
-      And you must show them these terms so they know their rights.</para>
-
-      <para>We protect your rights with a two-step method: (1) we copyright
-      the library, and (2) we offer you this license, which gives you legal
-      permission to copy, distribute and/or modify the library.</para>
-
-      <para>To protect each distributor, we want to make it very clear that
-      there is no warranty for the free library. Also, if the library is
-      modified by someone else and passed on, the recipients should know that
-      what they have is not the original version, so that the original
-      author's reputation will not be affected by problems that might be
-      introduced by others.</para>
-
-      <para>Finally, software patents pose a constant threat to the existence
-      of any free program. We wish to make sure that a company cannot
-      effectively restrict the users of a free program by obtaining a
-      restrictive license from a patent holder. Therefore, we insist that any
-      patent license obtained for a version of the library must be consistent
-      with the full freedom of use specified in this license.</para>
-
-      <para>Most GNU software, including some libraries, is covered by the
-      ordinary GNU General Public License. This license, the GNU Lesser
-      General Public License, applies to certain designated libraries, and is
-      quite different from the ordinary General Public License. We use this
-      license for certain libraries in order to permit linking those libraries
-      into non-free programs.</para>
-
-      <para>When a program is linked with a library, whether statically or
-      using a shared library, the combination of the two is legally speaking a
-      combined work, a derivative of the original library. The ordinary
-      General Public License therefore permits such linking only if the entire
-      combination fits its criteria of freedom. The Lesser General Public
-      License permits more lax criteria for linking other code with the
-      library.</para>
-
-      <para>We call this license the "Lesser" General Public License because
-      it does Less to protect the user's freedom than the ordinary General
-      Public License. It also provides other free software developers Less of
-      an advantage over competing non-free programs. These disadvantages are
-      the reason we use the ordinary General Public License for many
-      libraries. However, the Lesser license provides advantages in certain
-      special circumstances.</para>
-
-      <para>For example, on rare occasions, there may be a special need to
-      encourage the widest possible use of a certain library, so that it
-      becomes a de-facto standard. To achieve this, non-free programs must be
-      allowed to use the library. A more frequent case is that a free library
-      does the same job as widely used non-free libraries. In this case, there
-      is little to gain by limiting the free library to free software only, so
-      we use the Lesser General Public License.</para>
-
-      <para>In other cases, permission to use a particular library in non-free
-      programs enables a greater number of people to use a large body of free
-      software. For example, permission to use the GNU C Library in non-free
-      programs enables many more people to use the whole GNU operating system,
-      as well as its variant, the GNU/Linux operating system.</para>
-
-      <para>Although the Lesser General Public License is Less protective of
-      the users' freedom, it does ensure that the user of a program that is
-      linked with the Library has the freedom and the wherewithal to run that
-      program using a modified version of the Library.</para>
-
-      <para>The precise terms and conditions for copying, distribution and
-      modification follow. Pay close attention to the difference between a
-      "work based on the library" and a "work that uses the library". The
-      former contains code derived from the library, whereas the latter must
-      be combined with the library in order to run.</para>
-
-      <para>GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR
-      COPYING, DISTRIBUTION AND MODIFICATION</para>
-
-      <para>0. This License Agreement applies to any software library or other
-      program which contains a notice placed by the copyright holder or other
-      authorized party saying it may be distributed under the terms of this
-      Lesser General Public License (also called "this License"). Each
-      licensee is addressed as "you".</para>
-
-      <para>A "library" means a collection of software functions and/or data
-      prepared so as to be conveniently linked with application programs
-      (which use some of those functions and data) to form executables.</para>
-
-      <para>The "Library", below, refers to any such software library or work
-      which has been distributed under these terms. A "work based on the
-      Library" means either the Library or any derivative work under copyright
-      law: that is to say, a work containing the Library or a portion of it,
-      either verbatim or with modifications and/or translated
-      straightforwardly into another language. (Hereinafter, translation is
-      included without limitation in the term "modification".)</para>
-
-      <para>"Source code" for a work means the preferred form of the work for
-      making modifications to it. For a library, complete source code means
-      all the source code for all modules it contains, plus any associated
-      interface definition files, plus the scripts used to control compilation
-      and installation of the library.</para>
-
-      <para>Activities other than copying, distribution and modification are
-      not covered by this License; they are outside its scope. The act of
-      running a program using the Library is not restricted, and output from
-      such a program is covered only if its contents constitute a work based
-      on the Library (independent of the use of the Library in a tool for
-      writing it). Whether that is true depends on what the Library does and
-      what the program that uses the Library does.</para>
-
-      <para>1. You may copy and distribute verbatim copies of the Library's
-      complete source code as you receive it, in any medium, provided that you
-      conspicuously and appropriately publish on each copy an appropriate
-      copyright notice and disclaimer of warranty; keep intact all the notices
-      that refer to this License and to the absence of any warranty; and
-      distribute a copy of this License along with the Library.</para>
-
-      <para>You may charge a fee for the physical act of transferring a copy,
-      and you may at your option offer warranty protection in exchange for a
-      fee.</para>
-
-      <para>2. You may modify your copy or copies of the Library or any
-      portion of it, thus forming a work based on the Library, and copy and
-      distribute such modifications or work under the terms of Section 1
-      above, provided that you also meet all of these conditions:</para>
-
-      <para>a) The modified work must itself be a software library.</para>
-
-      <para>b) You must cause the files modified to carry prominent notices
-      stating that you changed the files and the date of any change.</para>
-
-      <para>c) You must cause the whole of the work to be licensed at no
-      charge to all third parties under the terms of this License.</para>
-
-      <para>d) If a facility in the modified Library refers to a function or a
-      table of data to be supplied by an application program that uses the
-      facility, other than as an argument passed when the facility is invoked,
-      then you must make a good faith effort to ensure that, in the event an
-      application does not supply such function or table, the facility still
-      operates, and performs whatever part of its purpose remains
-      meaningful.</para>
-
-      <para>(For example, a function in a library to compute square roots has
-      a purpose that is entirely well-defined independent of the application.
-      Therefore, Subsection 2d requires that any application-supplied function
-      or table used by this function must be optional: if the application does
-      not supply it, the square root function must still compute square
-      roots.)</para>
-
-      <para>These requirements apply to the modified work as a whole. If
-      identifiable sections of that work are not derived from the Library, and
-      can be reasonably considered independent and separate works in
-      themselves, then this License, and its terms, do not apply to those
-      sections when you distribute them as separate works. But when you
-      distribute the same sections as part of a whole which is a work based on
-      the Library, the distribution of the whole must be on the terms of this
-      License, whose permissions for other licensees extend to the entire
-      whole, and thus to each and every part regardless of who wrote
-      it.</para>
-
-      <para>Thus, it is not the intent of this section to claim rights or
-      contest your rights to work written entirely by you; rather, the intent
-      is to exercise the right to control the distribution of derivative or
-      collective works based on the Library.</para>
-
-      <para>In addition, mere aggregation of another work not based on the
-      Library with the Library (or with a work based on the Library) on a
-      volume of a storage or distribution medium does not bring the other work
-      under the scope of this License.</para>
-
-      <para>3. You may opt to apply the terms of the ordinary GNU General
-      Public License instead of this License to a given copy of the Library.
-      To do this, you must alter all the notices that refer to this License,
-      so that they refer to the ordinary GNU General Public License, version
-      2, instead of to this License. (If a newer version than version 2 of the
-      ordinary GNU General Public License has appeared, then you can specify
-      that version instead if you wish.) Do not make any other change in these
-      notices.</para>
-
-      <para>Once this change is made in a given copy, it is irreversible for
-      that copy, so the ordinary GNU General Public License applies to all
-      subsequent copies and derivative works made from that copy.</para>
-
-      <para>This option is useful when you wish to copy part of the code of
-      the Library into a program that is not a library.</para>
-
-      <para>4. You may copy and distribute the Library (or a portion or
-      derivative of it, under Section 2) in object code or executable form
-      under the terms of Sections 1 and 2 above provided that you accompany it
-      with the complete corresponding machine-readable source code, which must
-      be distributed under the terms of Sections 1 and 2 above on a medium
-      customarily used for software interchange.</para>
-
-      <para>If distribution of object code is made by offering access to copy
-      from a designated place, then offering equivalent access to copy the
-      source code from the same place satisfies the requirement to distribute
-      the source code, even though third parties are not compelled to copy the
-      source along with the object code.</para>
-
-      <para>5. A program that contains no derivative of any portion of the
-      Library, but is designed to work with the Library by being compiled or
-      linked with it, is called a "work that uses the Library". Such a work,
-      in isolation, is not a derivative work of the Library, and therefore
-      falls outside the scope of this License.</para>
-
-      <para>However, linking a "work that uses the Library" with the Library
-      creates an executable that is a derivative of the Library (because it
-      contains portions of the Library), rather than a "work that uses the
-      library". The executable is therefore covered by this License. Section 6
-      states terms for distribution of such executables.</para>
-
-      <para>When a "work that uses the Library" uses material from a header
-      file that is part of the Library, the object code for the work may be a
-      derivative work of the Library even though the source code is not.
-      Whether this is true is especially significant if the work can be linked
-      without the Library, or if the work is itself a library. The threshold
-      for this to be true is not precisely defined by law.</para>
-
-      <para>If such an object file uses only numerical parameters, data
-      structure layouts and accessors, and small macros and small inline
-      functions (ten lines or less in length), then the use of the object file
-      is unrestricted, regardless of whether it is legally a derivative work.
-      (Executables containing this object code plus portions of the Library
-      will still fall under Section 6.) Otherwise, if the work is a derivative
-      of the Library, you may distribute the object code for the work under
-      the terms of Section 6. Any executables containing that work also fall
-      under Section 6, whether or not they are linked directly with the
-      Library itself.</para>
-
-      <para>6. As an exception to the Sections above, you may also combine or
-      link a "work that uses the Library" with the Library to produce a work
-      containing portions of the Library, and distribute that work under terms
-      of your choice, provided that the terms permit modification of the work
-      for the customer's own use and reverse engineering for debugging such
-      modifications.</para>
-
-      <para>You must give prominent notice with each copy of the work that the
-      Library is used in it and that the Library and its use are covered by
-      this License. You must supply a copy of this License. If the work during
-      execution displays copyright notices, you must include the copyright
-      notice for the Library among them, as well as a reference directing the
-      user to the copy of this License. Also, you must do one of these
-      things:</para>
-
-      <para>a) Accompany the work with the complete corresponding
-      machine-readable source code for the Library including whatever changes
-      were used in the work (which must be distributed under Sections 1 and 2
-      above); and, if the work is an executable linked with the Library, with
-      the complete machine-readable "work that uses the Library", as object
-      code and/or source code, so that the user can modify the Library and
-      then relink to produce a modified executable containing the modified
-      Library. (It is understood that the user who changes the contents of
-      definitions files in the Library will not necessarily be able to
-      recompile the application to use the modified definitions.)</para>
-
-      <para>b) Use a suitable shared library mechanism for linking with the
-      Library. A suitable mechanism is one that (1) uses at run time a copy of
-      the library already present on the user's computer system, rather than
-      copying library functions into the executable, and (2) will operate
-      properly with a modified version of the library, if the user installs
-      one, as long as the modified version is interface-compatible with the
-      version that the work was made with.</para>
-
-      <para>c) Accompany the work with a written offer, valid for at least
-      three years, to give the same user the materials specified in Subsection
-      6a, above, for a charge no more than the cost of performing this
-      distribution.</para>
-
-      <para>d) If distribution of the work is made by offering access to copy
-      from a designated place, offer equivalent access to copy the above
-      specified materials from the same place.</para>
-
-      <para>e) Verify that the user has already received a copy of these
-      materials or that you have already sent this user a copy.</para>
-
-      <para>For an executable, the required form of the "work that uses the
-      Library" must include any data and utility programs needed for
-      reproducing the executable from it. However, as a special exception, the
-      materials to be distributed need not include anything that is normally
-      distributed (in either source or binary form) with the major components
-      (compiler, kernel, and so on) of the operating system on which the
-      executable runs, unless that component itself accompanies the
-      executable.</para>
-
-      <para>It may happen that this requirement contradicts the license
-      restrictions of other proprietary libraries that do not normally
-      accompany the operating system. Such a contradiction means you cannot
-      use both them and the Library together in an executable that you
-      distribute.</para>
-
-      <para>7. You may place library facilities that are a work based on the
-      Library side-by-side in a single library together with other library
-      facilities not covered by this License, and distribute such a combined
-      library, provided that the separate distribution of the work based on
-      the Library and of the other library facilities is otherwise permitted,
-      and provided that you do these two things:</para>
-
-      <para>a) Accompany the combined library with a copy of the same work
-      based on the Library, uncombined with any other library facilities. This
-      must be distributed under the terms of the Sections above.</para>
-
-      <para>b) Give prominent notice with the combined library of the fact
-      that part of it is a work based on the Library, and explaining where to
-      find the accompanying uncombined form of the same work.</para>
-
-      <para>8. You may not copy, modify, sublicense, link with, or distribute
-      the Library except as expressly provided under this License. Any attempt
-      otherwise to copy, modify, sublicense, link with, or distribute the
-      Library is void, and will automatically terminate your rights under this
-      License. However, parties who have received copies, or rights, from you
-      under this License will not have their licenses terminated so long as
-      such parties remain in full compliance.</para>
-
-      <para>9. You are not required to accept this License, since you have not
-      signed it. However, nothing else grants you permission to modify or
-      distribute the Library or its derivative works. These actions are
-      prohibited by law if you do not accept this License. Therefore, by
-      modifying or distributing the Library (or any work based on the
-      Library), you indicate your acceptance of this License to do so, and all
-      its terms and conditions for copying, distributing or modifying the
-      Library or works based on it.</para>
-
-      <para>10. Each time you redistribute the Library (or any work based on
-      the Library), the recipient automatically receives a license from the
-      original licensor to copy, distribute, link with or modify the Library
-      subject to these terms and conditions. You may not impose any further
-      restrictions on the recipients' exercise of the rights granted herein.
-      You are not responsible for enforcing compliance by third parties with
-      this License.</para>
-
-      <para>11. If, as a consequence of a court judgment or allegation of
-      patent infringement or for any other reason (not limited to patent
-      issues), conditions are imposed on you (whether by court order,
-      agreement or otherwise) that contradict the conditions of this License,
-      they do not excuse you from the conditions of this License. If you
-      cannot distribute so as to satisfy simultaneously your obligations under
-      this License and any other pertinent obligations, then as a consequence
-      you may not distribute the Library at all. For example, if a patent
-      license would not permit royalty-free redistribution of the Library by
-      all those who receive copies directly or indirectly through you, then
-      the only way you could satisfy both it and this License would be to
-      refrain entirely from distribution of the Library.</para>
-
-      <para>If any portion of this section is held invalid or unenforceable
-      under any particular circumstance, the balance of the section is
-      intended to apply, and the section as a whole is intended to apply in
-      other circumstances.</para>
-
-      <para>It is not the purpose of this section to induce you to infringe
-      any patents or other property right claims or to contest validity of any
-      such claims; this section has the sole purpose of protecting the
-      integrity of the free software distribution system which is implemented
-      by public license practices. Many people have made generous
-      contributions to the wide range of software distributed through that
-      system in reliance on consistent application of that system; it is up to
-      the author/donor to decide if he or she is willing to distribute
-      software through any other system and a licensee cannot impose that
-      choice.</para>
-
-      <para>This section is intended to make thoroughly clear what is believed
-      to be a consequence of the rest of this License.</para>
-
-      <para>12. If the distribution and/or use of the Library is restricted in
-      certain countries either by patents or by copyrighted interfaces, the
-      original copyright holder who places the Library under this License may
-      add an explicit geographical distribution limitation excluding those
-      countries, so that distribution is permitted only in or among countries
-      not thus excluded. In such case, this License incorporates the
-      limitation as if written in the body of this License.</para>
-
-      <para>13. The Free Software Foundation may publish revised and/or new
-      versions of the Lesser General Public License from time to time. Such
-      new versions will be similar in spirit to the present version, but may
-      differ in detail to address new problems or concerns.</para>
-
-      <para>Each version is given a distinguishing version number. If the
-      Library specifies a version number of this License which applies to it
-      and "any later version", you have the option of following the terms and
-      conditions either of that version or of any later version published by
-      the Free Software Foundation. If the Library does not specify a license
-      version number, you may choose any version ever published by the Free
-      Software Foundation.</para>
-
-      <para>14. If you wish to incorporate parts of the Library into other
-      free programs whose distribution conditions are incompatible with these,
-      write to the author to ask for permission. For software which is
-      copyrighted by the Free Software Foundation, write to the Free Software
-      Foundation; we sometimes make exceptions for this. Our decision will be
-      guided by the two goals of preserving the free status of all derivatives
-      of our free software and of promoting the sharing and reuse of software
-      generally.</para>
-
-      <para>NO WARRANTY</para>
-
-      <para>15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-      WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-      EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-      OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND,
-      EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-      ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH
-      YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-      NECESSARY SERVICING, REPAIR OR CORRECTION.</para>
-
-      <para>16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-      WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-      AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-      DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-      DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY
-      (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-      INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-      THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR
-      OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</para>
-
-      <para>END OF TERMS AND CONDITIONS</para>
+      <para>
+        GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
+      </para>
+
+      <para>
+        Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59
+        Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is
+        permitted to copy and distribute verbatim copies of this license
+        document, but changing it is not allowed.
+      </para>
+
+      <para>
+        [This is the first released version of the Lesser GPL. It also
+        counts as the successor of the GNU Library Public License,
+        version 2, hence the version number 2.1.]
+      </para>
+
+      <para>
+        Preamble
+      </para>
+
+      <para>
+        The licenses for most software are designed to take away your
+        freedom to share and change it. By contrast, the GNU General
+        Public Licenses are intended to guarantee your freedom to share
+        and change free software--to make sure the software is free for
+        all its users.
+      </para>
+
+      <para>
+        This license, the Lesser General Public License, applies to some
+        specially designated software packages--typically libraries--of
+        the Free Software Foundation and other authors who decide to use
+        it. You can use it too, but we suggest you first think carefully
+        about whether this license or the ordinary General Public
+        License is the better strategy to use in any particular case,
+        based on the explanations below.
+      </para>
+
+      <para>
+        When we speak of free software, we are referring to freedom of
+        use, not price. Our General Public Licenses are designed to make
+        sure that you have the freedom to distribute copies of free
+        software (and charge for this service if you wish); that you
+        receive source code or can get it if you want it; that you can
+        change the software and use pieces of it in new free programs;
+        and that you are informed that you can do these things.
+      </para>
+
+      <para>
+        To protect your rights, we need to make restrictions that forbid
+        distributors to deny you these rights or to ask you to surrender
+        these rights. These restrictions translate to certain
+        responsibilities for you if you distribute copies of the library
+        or if you modify it.
+      </para>
+
+      <para>
+        For example, if you distribute copies of the library, whether
+        gratis or for a fee, you must give the recipients all the rights
+        that we gave you. You must make sure that they, too, receive or
+        can get the source code. If you link other code with the
+        library, you must provide complete object files to the
+        recipients, so that they can relink them with the library after
+        making changes to the library and recompiling it. And you must
+        show them these terms so they know their rights.
+      </para>
+
+      <para>
+        We protect your rights with a two-step method: (1) we copyright
+        the library, and (2) we offer you this license, which gives you
+        legal permission to copy, distribute and/or modify the library.
+      </para>
+
+      <para>
+        To protect each distributor, we want to make it very clear that
+        there is no warranty for the free library. Also, if the library
+        is modified by someone else and passed on, the recipients should
+        know that what they have is not the original version, so that
+        the original author's reputation will not be affected by
+        problems that might be introduced by others.
+      </para>
+
+      <para>
+        Finally, software patents pose a constant threat to the
+        existence of any free program. We wish to make sure that a
+        company cannot effectively restrict the users of a free program
+        by obtaining a restrictive license from a patent holder.
+        Therefore, we insist that any patent license obtained for a
+        version of the library must be consistent with the full freedom
+        of use specified in this license.
+      </para>
+
+      <para>
+        Most GNU software, including some libraries, is covered by the
+        ordinary GNU General Public License. This license, the GNU
+        Lesser General Public License, applies to certain designated
+        libraries, and is quite different from the ordinary General
+        Public License. We use this license for certain libraries in
+        order to permit linking those libraries into non-free programs.
+      </para>
+
+      <para>
+        When a program is linked with a library, whether statically or
+        using a shared library, the combination of the two is legally
+        speaking a combined work, a derivative of the original library.
+        The ordinary General Public License therefore permits such
+        linking only if the entire combination fits its criteria of
+        freedom. The Lesser General Public License permits more lax
+        criteria for linking other code with the library.
+      </para>
+
+      <para>
+        We call this license the "Lesser" General Public License because
+        it does Less to protect the user's freedom than the ordinary
+        General Public License. It also provides other free software
+        developers Less of an advantage over competing non-free
+        programs. These disadvantages are the reason we use the ordinary
+        General Public License for many libraries. However, the Lesser
+        license provides advantages in certain special circumstances.
+      </para>
+
+      <para>
+        For example, on rare occasions, there may be a special need to
+        encourage the widest possible use of a certain library, so that
+        it becomes a de-facto standard. To achieve this, non-free
+        programs must be allowed to use the library. A more frequent
+        case is that a free library does the same job as widely used
+        non-free libraries. In this case, there is little to gain by
+        limiting the free library to free software only, so we use the
+        Lesser General Public License.
+      </para>
+
+      <para>
+        In other cases, permission to use a particular library in
+        non-free programs enables a greater number of people to use a
+        large body of free software. For example, permission to use the
+        GNU C Library in non-free programs enables many more people to
+        use the whole GNU operating system, as well as its variant, the
+        GNU/Linux operating system.
+      </para>
+
+      <para>
+        Although the Lesser General Public License is Less protective of
+        the users' freedom, it does ensure that the user of a program
+        that is linked with the Library has the freedom and the
+        wherewithal to run that program using a modified version of the
+        Library.
+      </para>
+
+      <para>
+        The precise terms and conditions for copying, distribution and
+        modification follow. Pay close attention to the difference
+        between a "work based on the library" and a "work that uses the
+        library". The former contains code derived from the library,
+        whereas the latter must be combined with the library in order to
+        run.
+      </para>
+
+      <para>
+        GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR
+        COPYING, DISTRIBUTION AND MODIFICATION
+      </para>
+
+      <para>
+        0. This License Agreement applies to any software library or
+        other program which contains a notice placed by the copyright
+        holder or other authorized party saying it may be distributed
+        under the terms of this Lesser General Public License (also
+        called "this License"). Each licensee is addressed as "you".
+      </para>
+
+      <para>
+        A "library" means a collection of software functions and/or data
+        prepared so as to be conveniently linked with application
+        programs (which use some of those functions and data) to form
+        executables.
+      </para>
+
+      <para>
+        The "Library", below, refers to any such software library or
+        work which has been distributed under these terms. A "work based
+        on the Library" means either the Library or any derivative work
+        under copyright law: that is to say, a work containing the
+        Library or a portion of it, either verbatim or with
+        modifications and/or translated straightforwardly into another
+        language. (Hereinafter, translation is included without
+        limitation in the term "modification".)
+      </para>
+
+      <para>
+        "Source code" for a work means the preferred form of the work
+        for making modifications to it. For a library, complete source
+        code means all the source code for all modules it contains, plus
+        any associated interface definition files, plus the scripts used
+        to control compilation and installation of the library.
+      </para>
+
+      <para>
+        Activities other than copying, distribution and modification are
+        not covered by this License; they are outside its scope. The act
+        of running a program using the Library is not restricted, and
+        output from such a program is covered only if its contents
+        constitute a work based on the Library (independent of the use
+        of the Library in a tool for writing it). Whether that is true
+        depends on what the Library does and what the program that uses
+        the Library does.
+      </para>
+
+      <para>
+        1. You may copy and distribute verbatim copies of the Library's
+        complete source code as you receive it, in any medium, provided
+        that you conspicuously and appropriately publish on each copy an
+        appropriate copyright notice and disclaimer of warranty; keep
+        intact all the notices that refer to this License and to the
+        absence of any warranty; and distribute a copy of this License
+        along with the Library.
+      </para>
+
+      <para>
+        You may charge a fee for the physical act of transferring a
+        copy, and you may at your option offer warranty protection in
+        exchange for a fee.
+      </para>
+
+      <para>
+        2. You may modify your copy or copies of the Library or any
+        portion of it, thus forming a work based on the Library, and
+        copy and distribute such modifications or work under the terms
+        of Section 1 above, provided that you also meet all of these
+        conditions:
+      </para>
+
+      <para>
+        a) The modified work must itself be a software library.
+      </para>
+
+      <para>
+        b) You must cause the files modified to carry prominent notices
+        stating that you changed the files and the date of any change.
+      </para>
+
+      <para>
+        c) You must cause the whole of the work to be licensed at no
+        charge to all third parties under the terms of this License.
+      </para>
+
+      <para>
+        d) If a facility in the modified Library refers to a function or
+        a table of data to be supplied by an application program that
+        uses the facility, other than as an argument passed when the
+        facility is invoked, then you must make a good faith effort to
+        ensure that, in the event an application does not supply such
+        function or table, the facility still operates, and performs
+        whatever part of its purpose remains meaningful.
+      </para>
+
+      <para>
+        (For example, a function in a library to compute square roots
+        has a purpose that is entirely well-defined independent of the
+        application. Therefore, Subsection 2d requires that any
+        application-supplied function or table used by this function
+        must be optional: if the application does not supply it, the
+        square root function must still compute square roots.)
+      </para>
+
+      <para>
+        These requirements apply to the modified work as a whole. If
+        identifiable sections of that work are not derived from the
+        Library, and can be reasonably considered independent and
+        separate works in themselves, then this License, and its terms,
+        do not apply to those sections when you distribute them as
+        separate works. But when you distribute the same sections as
+        part of a whole which is a work based on the Library, the
+        distribution of the whole must be on the terms of this License,
+        whose permissions for other licensees extend to the entire
+        whole, and thus to each and every part regardless of who wrote
+        it.
+      </para>
+
+      <para>
+        Thus, it is not the intent of this section to claim rights or
+        contest your rights to work written entirely by you; rather, the
+        intent is to exercise the right to control the distribution of
+        derivative or collective works based on the Library.
+      </para>
+
+      <para>
+        In addition, mere aggregation of another work not based on the
+        Library with the Library (or with a work based on the Library)
+        on a volume of a storage or distribution medium does not bring
+        the other work under the scope of this License.
+      </para>
+
+      <para>
+        3. You may opt to apply the terms of the ordinary GNU General
+        Public License instead of this License to a given copy of the
+        Library. To do this, you must alter all the notices that refer
+        to this License, so that they refer to the ordinary GNU General
+        Public License, version 2, instead of to this License. (If a
+        newer version than version 2 of the ordinary GNU General Public
+        License has appeared, then you can specify that version instead
+        if you wish.) Do not make any other change in these notices.
+      </para>
+
+      <para>
+        Once this change is made in a given copy, it is irreversible for
+        that copy, so the ordinary GNU General Public License applies to
+        all subsequent copies and derivative works made from that copy.
+      </para>
+
+      <para>
+        This option is useful when you wish to copy part of the code of
+        the Library into a program that is not a library.
+      </para>
+
+      <para>
+        4. You may copy and distribute the Library (or a portion or
+        derivative of it, under Section 2) in object code or executable
+        form under the terms of Sections 1 and 2 above provided that you
+        accompany it with the complete corresponding machine-readable
+        source code, which must be distributed under the terms of
+        Sections 1 and 2 above on a medium customarily used for software
+        interchange.
+      </para>
+
+      <para>
+        If distribution of object code is made by offering access to
+        copy from a designated place, then offering equivalent access to
+        copy the source code from the same place satisfies the
+        requirement to distribute the source code, even though third
+        parties are not compelled to copy the source along with the
+        object code.
+      </para>
+
+      <para>
+        5. A program that contains no derivative of any portion of the
+        Library, but is designed to work with the Library by being
+        compiled or linked with it, is called a "work that uses the
+        Library". Such a work, in isolation, is not a derivative work of
+        the Library, and therefore falls outside the scope of this
+        License.
+      </para>
+
+      <para>
+        However, linking a "work that uses the Library" with the Library
+        creates an executable that is a derivative of the Library
+        (because it contains portions of the Library), rather than a
+        "work that uses the library". The executable is therefore
+        covered by this License. Section 6 states terms for distribution
+        of such executables.
+      </para>
+
+      <para>
+        When a "work that uses the Library" uses material from a header
+        file that is part of the Library, the object code for the work
+        may be a derivative work of the Library even though the source
+        code is not. Whether this is true is especially significant if
+        the work can be linked without the Library, or if the work is
+        itself a library. The threshold for this to be true is not
+        precisely defined by law.
+      </para>
+
+      <para>
+        If such an object file uses only numerical parameters, data
+        structure layouts and accessors, and small macros and small
+        inline functions (ten lines or less in length), then the use of
+        the object file is unrestricted, regardless of whether it is
+        legally a derivative work. (Executables containing this object
+        code plus portions of the Library will still fall under Section
+        6.) Otherwise, if the work is a derivative of the Library, you
+        may distribute the object code for the work under the terms of
+        Section 6. Any executables containing that work also fall under
+        Section 6, whether or not they are linked directly with the
+        Library itself.
+      </para>
+
+      <para>
+        6. As an exception to the Sections above, you may also combine
+        or link a "work that uses the Library" with the Library to
+        produce a work containing portions of the Library, and
+        distribute that work under terms of your choice, provided that
+        the terms permit modification of the work for the customer's own
+        use and reverse engineering for debugging such modifications.
+      </para>
+
+      <para>
+        You must give prominent notice with each copy of the work that
+        the Library is used in it and that the Library and its use are
+        covered by this License. You must supply a copy of this License.
+        If the work during execution displays copyright notices, you
+        must include the copyright notice for the Library among them, as
+        well as a reference directing the user to the copy of this
+        License. Also, you must do one of these things:
+      </para>
+
+      <para>
+        a) Accompany the work with the complete corresponding
+        machine-readable source code for the Library including whatever
+        changes were used in the work (which must be distributed under
+        Sections 1 and 2 above); and, if the work is an executable
+        linked with the Library, with the complete machine-readable
+        "work that uses the Library", as object code and/or source code,
+        so that the user can modify the Library and then relink to
+        produce a modified executable containing the modified Library.
+        (It is understood that the user who changes the contents of
+        definitions files in the Library will not necessarily be able to
+        recompile the application to use the modified definitions.)
+      </para>
+
+      <para>
+        b) Use a suitable shared library mechanism for linking with the
+        Library. A suitable mechanism is one that (1) uses at run time a
+        copy of the library already present on the user's computer
+        system, rather than copying library functions into the
+        executable, and (2) will operate properly with a modified
+        version of the library, if the user installs one, as long as the
+        modified version is interface-compatible with the version that
+        the work was made with.
+      </para>
+
+      <para>
+        c) Accompany the work with a written offer, valid for at least
+        three years, to give the same user the materials specified in
+        Subsection 6a, above, for a charge no more than the cost of
+        performing this distribution.
+      </para>
+
+      <para>
+        d) If distribution of the work is made by offering access to
+        copy from a designated place, offer equivalent access to copy
+        the above specified materials from the same place.
+      </para>
+
+      <para>
+        e) Verify that the user has already received a copy of these
+        materials or that you have already sent this user a copy.
+      </para>
+
+      <para>
+        For an executable, the required form of the "work that uses the
+        Library" must include any data and utility programs needed for
+        reproducing the executable from it. However, as a special
+        exception, the materials to be distributed need not include
+        anything that is normally distributed (in either source or
+        binary form) with the major components (compiler, kernel, and so
+        on) of the operating system on which the executable runs, unless
+        that component itself accompanies the executable.
+      </para>
+
+      <para>
+        It may happen that this requirement contradicts the license
+        restrictions of other proprietary libraries that do not normally
+        accompany the operating system. Such a contradiction means you
+        cannot use both them and the Library together in an executable
+        that you distribute.
+      </para>
+
+      <para>
+        7. You may place library facilities that are a work based on the
+        Library side-by-side in a single library together with other
+        library facilities not covered by this License, and distribute
+        such a combined library, provided that the separate distribution
+        of the work based on the Library and of the other library
+        facilities is otherwise permitted, and provided that you do
+        these two things:
+      </para>
+
+      <para>
+        a) Accompany the combined library with a copy of the same work
+        based on the Library, uncombined with any other library
+        facilities. This must be distributed under the terms of the
+        Sections above.
+      </para>
+
+      <para>
+        b) Give prominent notice with the combined library of the fact
+        that part of it is a work based on the Library, and explaining
+        where to find the accompanying uncombined form of the same work.
+      </para>
+
+      <para>
+        8. You may not copy, modify, sublicense, link with, or
+        distribute the Library except as expressly provided under this
+        License. Any attempt otherwise to copy, modify, sublicense, link
+        with, or distribute the Library is void, and will automatically
+        terminate your rights under this License. However, parties who
+        have received copies, or rights, from you under this License
+        will not have their licenses terminated so long as such parties
+        remain in full compliance.
+      </para>
+
+      <para>
+        9. You are not required to accept this License, since you have
+        not signed it. However, nothing else grants you permission to
+        modify or distribute the Library or its derivative works. These
+        actions are prohibited by law if you do not accept this License.
+        Therefore, by modifying or distributing the Library (or any work
+        based on the Library), you indicate your acceptance of this
+        License to do so, and all its terms and conditions for copying,
+        distributing or modifying the Library or works based on it.
+      </para>
+
+      <para>
+        10. Each time you redistribute the Library (or any work based on
+        the Library), the recipient automatically receives a license
+        from the original licensor to copy, distribute, link with or
+        modify the Library subject to these terms and conditions. You
+        may not impose any further restrictions on the recipients'
+        exercise of the rights granted herein. You are not responsible
+        for enforcing compliance by third parties with this License.
+      </para>
+
+      <para>
+        11. If, as a consequence of a court judgment or allegation of
+        patent infringement or for any other reason (not limited to
+        patent issues), conditions are imposed on you (whether by court
+        order, agreement or otherwise) that contradict the conditions of
+        this License, they do not excuse you from the conditions of this
+        License. If you cannot distribute so as to satisfy
+        simultaneously your obligations under this License and any other
+        pertinent obligations, then as a consequence you may not
+        distribute the Library at all. For example, if a patent license
+        would not permit royalty-free redistribution of the Library by
+        all those who receive copies directly or indirectly through you,
+        then the only way you could satisfy both it and this License
+        would be to refrain entirely from distribution of the Library.
+      </para>
+
+      <para>
+        If any portion of this section is held invalid or unenforceable
+        under any particular circumstance, the balance of the section is
+        intended to apply, and the section as a whole is intended to
+        apply in other circumstances.
+      </para>
+
+      <para>
+        It is not the purpose of this section to induce you to infringe
+        any patents or other property right claims or to contest
+        validity of any such claims; this section has the sole purpose
+        of protecting the integrity of the free software distribution
+        system which is implemented by public license practices. Many
+        people have made generous contributions to the wide range of
+        software distributed through that system in reliance on
+        consistent application of that system; it is up to the
+        author/donor to decide if he or she is willing to distribute
+        software through any other system and a licensee cannot impose
+        that choice.
+      </para>
+
+      <para>
+        This section is intended to make thoroughly clear what is
+        believed to be a consequence of the rest of this License.
+      </para>
+
+      <para>
+        12. If the distribution and/or use of the Library is restricted
+        in certain countries either by patents or by copyrighted
+        interfaces, the original copyright holder who places the Library
+        under this License may add an explicit geographical distribution
+        limitation excluding those countries, so that distribution is
+        permitted only in or among countries not thus excluded. In such
+        case, this License incorporates the limitation as if written in
+        the body of this License.
+      </para>
+
+      <para>
+        13. The Free Software Foundation may publish revised and/or new
+        versions of the Lesser General Public License from time to time.
+        Such new versions will be similar in spirit to the present
+        version, but may differ in detail to address new problems or
+        concerns.
+      </para>
+
+      <para>
+        Each version is given a distinguishing version number. If the
+        Library specifies a version number of this License which applies
+        to it and "any later version", you have the option of following
+        the terms and conditions either of that version or of any later
+        version published by the Free Software Foundation. If the
+        Library does not specify a license version number, you may
+        choose any version ever published by the Free Software
+        Foundation.
+      </para>
+
+      <para>
+        14. If you wish to incorporate parts of the Library into other
+        free programs whose distribution conditions are incompatible
+        with these, write to the author to ask for permission. For
+        software which is copyrighted by the Free Software Foundation,
+        write to the Free Software Foundation; we sometimes make
+        exceptions for this. Our decision will be guided by the two
+        goals of preserving the free status of all derivatives of our
+        free software and of promoting the sharing and reuse of software
+        generally.
+      </para>
+
+      <para>
+        NO WARRANTY
+      </para>
+
+      <para>
+        15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+        WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
+        LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+        HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT
+        WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+        BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+        AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE
+        QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE
+        LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
+        SERVICING, REPAIR OR CORRECTION.
+      </para>
+
+      <para>
+        16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO
+        IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
+        MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE
+        LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+        INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+        INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS
+        OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+        YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH
+        ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
+        ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+      </para>
+
+      <para>
+        END OF TERMS AND CONDITIONS
+      </para>
+
     </sect2>
 
     <sect2 id="licMPL">
+
       <title>Mozilla Public License (MPL)</title>
 
-      <para>MOZILLA PUBLIC LICENSE Version 1.1</para>
-
-      <para>1. Definitions.</para>
-
-      <para>1.0.1. "Commercial Use" means distribution or otherwise making the
-      Covered Code available to a third party.</para>
-
-      <para>1.1. "Contributor" means each entity that creates or contributes
-      to the creation of Modifications.</para>
-
-      <para>1.2. "Contributor Version" means the combination of the Original
-      Code, prior Modifications used by a Contributor, and the Modifications
-      made by that particular Contributor.</para>
-
-      <para>1.3. "Covered Code" means the Original Code or Modifications or
-      the combination of the Original Code and Modifications, in each case
-      including portions thereof.</para>
-
-      <para>1.4. "Electronic Distribution Mechanism" means a mechanism
-      generally accepted in the software development community for the
-      electronic transfer of data.</para>
-
-      <para>1.5. "Executable" means Covered Code in any form other than Source
-      Code.</para>
-
-      <para>1.6. "Initial Developer" means the individual or entity identified
-      as the Initial Developer in the Source Code notice required by Exhibit
-      A.</para>
-
-      <para>1.7. "Larger Work" means a work which combines Covered Code or
-      portions thereof with code not governed by the terms of this
-      License.</para>
-
-      <para>1.8. "License" means this document.</para>
-
-      <para>1.8.1. "Licensable" means having the right to grant, to the
-      maximum extent possible, whether at the time of the initial grant or
-      subsequently acquired, any and all of the rights conveyed herein.</para>
-
-      <para>1.9. "Modifications" means any addition to or deletion from the
-      substance or structure of either the Original Code or any previous
-      Modifications. When Covered Code is released as a series of files, a
-      Modification is:</para>
-
-      <para>A. Any addition to or deletion from the contents of a file
-      containing Original Code or previous Modifications.</para>
-
-      <para>B. Any new file that contains any part of the Original Code or
-      previous Modifications.</para>
-
-      <para>1.10. "Original Code" means Source Code of computer software code
-      which is described in the Source Code notice required by Exhibit A as
-      Original Code, and which, at the time of its release under this License
-      is not already Covered Code governed by this License.</para>
-
-      <para>1.10.1. "Patent Claims" means any patent claim(s), now owned or
-      hereafter acquired, including without limitation, method, process, and
-      apparatus claims, in any patent Licensable by grantor.</para>
-
-      <para>1.11. "Source Code" means the preferred form of the Covered Code
-      for making modifications to it, including all modules it contains, plus
-      any associated interface definition files, scripts used to control
-      compilation and installation of an Executable, or source code
-      differential comparisons against either the Original Code or another
-      well known, available Covered Code of the Contributor's choice. The
-      Source Code can be in a compressed or archival form, provided the
-      appropriate decompression or de-archiving software is widely available
-      for no charge.</para>
-
-      <para>1.12. "You" (or "Your") means an individual or a legal entity
-      exercising rights under, and complying with all of the terms of, this
-      License or a future version of this License issued under Section 6.1.
-      For legal entities, "You" includes any entity which controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, "control" means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.</para>
-
-      <para>2. Source Code License.</para>
-
-      <para>2.1. The Initial Developer Grant. The Initial Developer hereby
-      grants You a world-wide, royalty-free, non-exclusive license, subject to
-      third party intellectual property claims:</para>
-
-      <para>(a) under intellectual property rights (other than patent or
-      trademark) Licensable by Initial Developer to use, reproduce, modify,
-      display, perform, sublicense and distribute the Original Code (or
-      portions thereof) with or without Modifications, and/or as part of a
-      Larger Work; and</para>
-
-      <para>(b) under Patents Claims infringed by the making, using or selling
-      of Original Code, to make, have made, use, practice, sell, and offer for
-      sale, and/or otherwise dispose of the Original Code (or portions
-      thereof).</para>
-
-      <para>(c) the licenses granted in this Section 2.1(a) and (b) are
-      effective on the date Initial Developer first distributes Original Code
-      under the terms of this License.</para>
-
-      <para>(d) Notwithstanding Section 2.1(b) above, no patent license is
-      granted: 1) for code that You delete from the Original Code; 2) separate
-      from the Original Code; or 3) for infringements caused by: i) the
-      modification of the Original Code or ii) the combination of the Original
-      Code with other software or devices.</para>
-
-      <para>2.2. Contributor Grant. Subject to third party intellectual
-      property claims, each Contributor hereby grants You a world-wide,
-      royalty-free, non-exclusive license</para>
-
-      <para>(a) under intellectual property rights (other than patent or
-      trademark) Licensable by Contributor, to use, reproduce, modify,
-      display, perform, sublicense and distribute the Modifications created by
-      such Contributor (or portions thereof) either on an unmodified basis,
-      with other Modifications, as Covered Code and/or as part of a Larger
-      Work; and</para>
-
-      <para>(b) under Patent Claims infringed by the making, using, or selling
-      of Modifications made by that Contributor either alone and/or in
-      combination with its Contributor Version (or portions of such
-      combination), to make, use, sell, offer for sale, have made, and/or
-      otherwise dispose of: 1) Modifications made by that Contributor (or
-      portions thereof); and 2) the combination of Modifications made by that
-      Contributor with its Contributor Version (or portions of such
-      combination).</para>
-
-      <para>(c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-      effective on the date Contributor first makes Commercial Use of the
-      Covered Code.</para>
-
-      <para>(d) Notwithstanding Section 2.2(b) above, no patent license is
-      granted: 1) for any code that Contributor has deleted from the
-      Contributor Version; 2) separate from the Contributor Version; 3) for
-      infringements caused by: i) third party modifications of Contributor
-      Version or ii) the combination of Modifications made by that Contributor
-      with other software (except as part of the Contributor Version) or other
-      devices; or 4) under Patent Claims infringed by Covered Code in the
-      absence of Modifications made by that Contributor.</para>
-
-      <para>3. Distribution Obligations.</para>
-
-      <para>3.1. Application of License. The Modifications which You create or
-      to which You contribute are governed by the terms of this License,
-      including without limitation Section 2.2. The Source Code version of
-      Covered Code may be distributed only under the terms of this License or
-      a future version of this License released under Section 6.1, and You
-      must include a copy of this License with every copy of the Source Code
-      You distribute. You may not offer or impose any terms on any Source Code
-      version that alters or restricts the applicable version of this License
-      or the recipients' rights hereunder. However, You may include an
-      additional document offering the additional rights described in Section
-      3.5.</para>
-
-      <para>3.2. Availability of Source Code. Any Modification which You
-      create or to which You contribute must be made available in Source Code
-      form under the terms of this License either on the same media as an
-      Executable version or via an accepted Electronic Distribution Mechanism
-      to anyone to whom you made an Executable version available; and if made
-      available via Electronic Distribution Mechanism, must remain available
-      for at least twelve (12) months after the date it initially became
-      available, or at least six (6) months after a subsequent version of that
-      particular Modification has been made available to such recipients. You
-      are responsible for ensuring that the Source Code version remains
-      available even if the Electronic Distribution Mechanism is maintained by
-      a third party.</para>
-
-      <para>3.3. Description of Modifications. You must cause all Covered Code
-      to which You contribute to contain a file documenting the changes You
-      made to create that Covered Code and the date of any change. You must
-      include a prominent statement that the Modification is derived, directly
-      or indirectly, from Original Code provided by the Initial Developer and
-      including the name of the Initial Developer in (a) the Source Code, and
-      (b) in any notice in an Executable version or related documentation in
-      which You describe the origin or ownership of the Covered Code.</para>
-
-      <para>3.4. Intellectual Property Matters</para>
-
-      <para>(a) Third Party Claims. If Contributor has knowledge that a
-      license under a third party's intellectual property rights is required
-      to exercise the rights granted by such Contributor under Sections 2.1 or
-      2.2, Contributor must include a text file with the Source Code
-      distribution titled "LEGAL" which describes the claim and the party
-      making the claim in sufficient detail that a recipient will know whom to
-      contact. If Contributor obtains such knowledge after the Modification is
-      made available as described in Section 3.2, Contributor shall promptly
-      modify the LEGAL file in all copies Contributor makes available
-      thereafter and shall take other steps (such as notifying appropriate
-      mailing lists or newsgroups) reasonably calculated to inform those who
-      received the Covered Code that new knowledge has been obtained.</para>
-
-      <para>(b) Contributor APIs. If Contributor's Modifications include an
-      application programming interface and Contributor has knowledge of
-      patent licenses which are reasonably necessary to implement that API,
-      Contributor must also include this information in the LEGAL file.</para>
-
-      <para>3.5. Required Notices. You must duplicate the notice in Exhibit A
-      in each file of the Source Code. If it is not possible to put such
-      notice in a particular Source Code file due to its structure, then You
-      must include such notice in a location (such as a relevant directory)
-      where a user would be likely to look for such a notice. If You created
-      one or more Modification(s) You may add your name as a Contributor to
-      the notice described in Exhibit A. You must also duplicate this License
-      in any documentation for the Source Code where You describe recipients'
-      rights or ownership rights relating to Covered Code. You may choose to
-      offer, and to charge a fee for, warranty, support, indemnity or
-      liability obligations to one or more recipients of Covered Code.
-      However, You may do so only on Your own behalf, and not on behalf of the
-      Initial Developer or any Contributor. You must make it absolutely clear
-      than any such warranty, support, indemnity or liability obligation is
-      offered by You alone, and You hereby agree to indemnify the Initial
-      Developer and every Contributor for any liability incurred by the
-      Initial Developer or such Contributor as a result of warranty, support,
-      indemnity or liability terms You offer.</para>
-
-      <para>3.6. Distribution of Executable Versions. You may distribute
-      Covered Code in Executable form only if the requirements of Section
-      3.1-3.5 have been met for that Covered Code, and if You include a notice
-      stating that the Source Code version of the Covered Code is available
-      under the terms of this License, including a description of how and
-      where You have fulfilled the obligations of Section 3.2. The notice must
-      be conspicuously included in any notice in an Executable version,
-      related documentation or collateral in which You describe recipients'
-      rights relating to the Covered Code. You may distribute the Executable
-      version of Covered Code or ownership rights under a license of Your
-      choice, which may contain terms different from this License, provided
-      that You are in compliance with the terms of this License and that the
-      license for the Executable version does not attempt to limit or alter
-      the recipient's rights in the Source Code version from the rights set
-      forth in this License. If You distribute the Executable version under a
-      different license You must make it absolutely clear that any terms which
-      differ from this License are offered by You alone, not by the Initial
-      Developer or any Contributor. You hereby agree to indemnify the Initial
-      Developer and every Contributor for any liability incurred by the
-      Initial Developer or such Contributor as a result of any such terms You
-      offer.</para>
-
-      <para>3.7. Larger Works. You may create a Larger Work by combining
-      Covered Code with other code not governed by the terms of this License
-      and distribute the Larger Work as a single product. In such a case, You
-      must make sure the requirements of this License are fulfilled for the
-      Covered Code.</para>
-
-      <para>4. Inability to Comply Due to Statute or Regulation.If it is
-      impossible for You to comply with any of the terms of this License with
-      respect to some or all of the Covered Code due to statute, judicial
-      order, or regulation then You must: (a) comply with the terms of this
-      License to the maximum extent possible; and (b) describe the limitations
-      and the code they affect. Such description must be included in the LEGAL
-      file described in Section 3.4 and must be included with all
-      distributions of the Source Code. Except to the extent prohibited by
-      statute or regulation, such description must be sufficiently detailed
-      for a recipient of ordinary skill to be able to understand it.</para>
-
-      <para>5. Application of this License. This License applies to code to
-      which the Initial Developer has attached the notice in Exhibit A and to
-      related Covered Code.</para>
-
-      <para>6. Versions of the License.</para>
-
-      <para>6.1. New Versions. Netscape Communications Corporation
-      ("Netscape") may publish revised and/or new versions of the License from
-      time to time. Each version will be given a distinguishing version
-      number.</para>
-
-      <para>6.2. Effect of New Versions. Once Covered Code has been published
-      under a particular version of the License, You may always continue to
-      use it under the terms of that version. You may also choose to use such
-      Covered Code under the terms of any subsequent version of the License
-      published by Netscape. No one other than Netscape has the right to
-      modify the terms applicable to Covered Code created under this
-      License.</para>
-
-      <para>6.3. Derivative Works. If You create or use a modified version of
-      this License (which you may only do in order to apply it to code which
-      is not already Covered Code governed by this License), You must (a)
-      rename Your license so that the phrases "Mozilla", "MOZILLAPL", "MOZPL",
-      "Netscape", "MPL", "NPL" or any confusingly similar phrase do not appear
-      in your license (except to note that your license differs from this
-      License) and (b) otherwise make it clear that Your version of the
-      license contains terms which differ from the Mozilla Public License and
-      Netscape Public License. (Filling in the name of the Initial Developer,
-      Original Code or Contributor in the notice described in Exhibit A shall
-      not of themselves be deemed to be modifications of this License.)</para>
-
-      <para>7. DISCLAIMER OF WARRANTY.</para>
-
-      <para>COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-      WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS,
-      MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
-      RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU.
-      SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-      NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
-      CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
-      CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.</para>
-
-      <para>8. TERMINATION.</para>
-
-      <para>8.1. This License and the rights granted hereunder will terminate
-      automatically if You fail to comply with terms herein and fail to cure
-      such breach within 30 days of becoming aware of the breach. All
-      sublicenses to the Covered Code which are properly granted shall survive
-      any termination of this License. Provisions which, by their nature, must
-      remain in effect beyond the termination of this License shall
-      survive.</para>
-
-      <para>8.2. If You initiate litigation by asserting a patent infringement
-      claim (excluding declaratory judgment actions) against Initial Developer
-      or a Contributor (the Initial Developer or Contributor against whom You
-      file such action is referred to as "Participant") alleging that:</para>
-
-      <para>(a) such Participant's Contributor Version directly or indirectly
-      infringes any patent, then any and all rights granted by such
-      Participant to You under Sections 2.1 and/or 2.2 of this License shall,
-      upon 60 days notice from Participant terminate prospectively, unless if
-      within 60 days after receipt of notice You either: (i) agree in writing
-      to pay Participant a mutually agreeable reasonable royalty for Your past
-      and future use of Modifications made by such Participant, or (ii)
-      withdraw Your litigation claim with respect to the Contributor Version
-      against such Participant. If within 60 days of notice, a reasonable
-      royalty and payment arrangement are not mutually agreed upon in writing
-      by the parties or the litigation claim is not withdrawn, the rights
-      granted by Participant to You under Sections 2.1 and/or 2.2
-      automatically terminate at the expiration of the 60 day notice period
-      specified above.</para>
-
-      <para>(b) any software, hardware, or device, other than such
-      Participant's Contributor Version, directly or indirectly infringes any
-      patent, then any rights granted to You by such Participant under
-      Sections 2.1(b) and 2.2(b) are revoked effective as of the date You
-      first made, used, sold, distributed, or had made, Modifications made by
-      that Participant.</para>
-
-      <para>8.3. If You assert a patent infringement claim against Participant
-      alleging that such Participant's Contributor Version directly or
-      indirectly infringes any patent where such claim is resolved (such as by
-      license or settlement) prior to the initiation of patent infringement
-      litigation, then the reasonable value of the licenses granted by such
-      Participant under Sections 2.1 or 2.2 shall be taken into account in
-      determining the amount or value of any payment or license.</para>
-
-      <para>8.4. In the event of termination under Sections 8.1 or 8.2 above,
-      all end user license agreements (excluding distributors and resellers)
-      which have been validly granted by You or any distributor hereunder
-      prior to termination shall survive termination.</para>
-
-      <para>9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO
-      LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR
-      OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR
-      ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES,
-      BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION,
-      DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
-      MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF
-      SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.
-      THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR
-      PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT
-      ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL
-      DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.</para>
-
-      <para>10. U.S. GOVERNMENT END USERS. The Covered Code is a "commercial
-      item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
-      consisting of "commercial computer software" and "commercial computer
-      software documentation," as such terms are used in 48 C.F.R. 12.212
-      (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users acquire
-      Covered Code with only those rights set forth herein.</para>
-
-      <para>11. MISCELLANEOUS. This License represents the complete agreement
-      concerning subject matter hereof. If any provision of this License is
-      held to be unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be governed
-      by California law provisions (except to the extent applicable law, if
-      any, provides otherwise), excluding its conflict-of-law provisions. With
-      respect to disputes in which at least one party is a citizen of, or an
-      entity chartered or registered to do business in the United States of
-      America, any litigation relating to this License shall be subject to the
-      jurisdiction of the Federal Courts of the Northern District of
-      California, with venue lying in Santa Clara County, California, with the
-      losing party responsible for costs, including without limitation, court
-      costs and reasonable attorneys' fees and expenses. The application of
-      the United Nations Convention on Contracts for the International Sale of
-      Goods is expressly excluded. Any law or regulation which provides that
-      the language of a contract shall be construed against the drafter shall
-      not apply to this License.</para>
-
-      <para>12. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and
-      the Contributors, each party is responsible for claims and damages
-      arising, directly or indirectly, out of its utilization of rights under
-      this License and You agree to work with Initial Developer and
-      Contributors to distribute such responsibility on an equitable basis.
-      Nothing herein is intended or shall be deemed to constitute any
-      admission of liability.</para>
-
-      <para>13. MULTIPLE-LICENSED CODE. Initial Developer may designate
-      portions of the Covered Code as "Multiple-Licensed". "Multiple-Licensed"
-      means that the Initial Developer permits you to utilize portions of the
-      Covered Code under Your choice of the NPL or the alternative licenses,
-      if any, specified by the Initial Developer in the file described in
-      Exhibit A.</para>
-
-      <para>EXHIBIT A -Mozilla Public License.</para>
-
-      <para>``The contents of this file are subject to the Mozilla Public
-      License Version 1.1 (the "License"); you may not use this file except in
-      compliance with the License. You may obtain a copy of the License at
-      http://www.mozilla.org/MPL/</para>
-
-      <para>Software distributed under the License is distributed on an "AS
-      IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.</para>
-
-      <para>The Original Code is
-      ______________________________________.</para>
-
-      <para>The Initial Developer of the Original Code is
-      ________________________. Portions created by ______________________ are
-      Copyright (C) ______ _______________________. All Rights
-      Reserved.</para>
-
-      <para>Contributor(s): ______________________________________.</para>
-
-      <para>Alternatively, the contents of this file may be used under the
-      terms of the _____ license (the "[___] License"), in which case the
-      provisions of [______] License are applicable instead of those above. If
-      you wish to allow use of your version of this file only under the terms
-      of the [____] License and not to allow others to use your version of
-      this file under the MPL, indicate your decision by deleting the
-      provisions above and replace them with the notice and other provisions
-      required by the [___] License. If you do not delete the provisions
-      above, a recipient may use your version of this file under either the
-      MPL or the [___] License."</para>
-
-      <para>[NOTE: The text of this Exhibit A may differ slightly from the
-      text of the notices in the Source Code files of the Original Code. You
-      should use the text of this Exhibit A rather than the text found in the
-      Original Code Source Code for Your Modifications.]</para>
+      <para>
+        MOZILLA PUBLIC LICENSE Version 1.1
+      </para>
+
+      <para>
+        1. Definitions.
+      </para>
+
+      <para>
+        1.0.1. "Commercial Use" means distribution or otherwise making
+        the Covered Code available to a third party.
+      </para>
+
+      <para>
+        1.1. "Contributor" means each entity that creates or contributes
+        to the creation of Modifications.
+      </para>
+
+      <para>
+        1.2. "Contributor Version" means the combination of the Original
+        Code, prior Modifications used by a Contributor, and the
+        Modifications made by that particular Contributor.
+      </para>
+
+      <para>
+        1.3. "Covered Code" means the Original Code or Modifications or
+        the combination of the Original Code and Modifications, in each
+        case including portions thereof.
+      </para>
+
+      <para>
+        1.4. "Electronic Distribution Mechanism" means a mechanism
+        generally accepted in the software development community for the
+        electronic transfer of data.
+      </para>
+
+      <para>
+        1.5. "Executable" means Covered Code in any form other than
+        Source Code.
+      </para>
+
+      <para>
+        1.6. "Initial Developer" means the individual or entity
+        identified as the Initial Developer in the Source Code notice
+        required by Exhibit A.
+      </para>
+
+      <para>
+        1.7. "Larger Work" means a work which combines Covered Code or
+        portions thereof with code not governed by the terms of this
+        License.
+      </para>
+
+      <para>
+        1.8. "License" means this document.
+      </para>
+
+      <para>
+        1.8.1. "Licensable" means having the right to grant, to the
+        maximum extent possible, whether at the time of the initial
+        grant or subsequently acquired, any and all of the rights
+        conveyed herein.
+      </para>
+
+      <para>
+        1.9. "Modifications" means any addition to or deletion from the
+        substance or structure of either the Original Code or any
+        previous Modifications. When Covered Code is released as a
+        series of files, a Modification is:
+      </para>
+
+      <para>
+        A. Any addition to or deletion from the contents of a file
+        containing Original Code or previous Modifications.
+      </para>
+
+      <para>
+        B. Any new file that contains any part of the Original Code or
+        previous Modifications.
+      </para>
+
+      <para>
+        1.10. "Original Code" means Source Code of computer software
+        code which is described in the Source Code notice required by
+        Exhibit A as Original Code, and which, at the time of its
+        release under this License is not already Covered Code governed
+        by this License.
+      </para>
+
+      <para>
+        1.10.1. "Patent Claims" means any patent claim(s), now owned or
+        hereafter acquired, including without limitation, method,
+        process, and apparatus claims, in any patent Licensable by
+        grantor.
+      </para>
+
+      <para>
+        1.11. "Source Code" means the preferred form of the Covered Code
+        for making modifications to it, including all modules it
+        contains, plus any associated interface definition files,
+        scripts used to control compilation and installation of an
+        Executable, or source code differential comparisons against
+        either the Original Code or another well known, available
+        Covered Code of the Contributor's choice. The Source Code can be
+        in a compressed or archival form, provided the appropriate
+        decompression or de-archiving software is widely available for
+        no charge.
+      </para>
+
+      <para>
+        1.12. "You" (or "Your") means an individual or a legal entity
+        exercising rights under, and complying with all of the terms of,
+        this License or a future version of this License issued under
+        Section 6.1. For legal entities, "You" includes any entity which
+        controls, is controlled by, or is under common control with You.
+        For purposes of this definition, "control" means (a) the power,
+        direct or indirect, to cause the direction or management of such
+        entity, whether by contract or otherwise, or (b) ownership of
+        more than fifty percent (50%) of the outstanding shares or
+        beneficial ownership of such entity.
+      </para>
+
+      <para>
+        2. Source Code License.
+      </para>
+
+      <para>
+        2.1. The Initial Developer Grant. The Initial Developer hereby
+        grants You a world-wide, royalty-free, non-exclusive license,
+        subject to third party intellectual property claims:
+      </para>
+
+      <para>
+        (a) under intellectual property rights (other than patent or
+        trademark) Licensable by Initial Developer to use, reproduce,
+        modify, display, perform, sublicense and distribute the Original
+        Code (or portions thereof) with or without Modifications, and/or
+        as part of a Larger Work; and
+      </para>
+
+      <para>
+        (b) under Patents Claims infringed by the making, using or
+        selling of Original Code, to make, have made, use, practice,
+        sell, and offer for sale, and/or otherwise dispose of the
+        Original Code (or portions thereof).
+      </para>
+
+      <para>
+        (c) the licenses granted in this Section 2.1(a) and (b) are
+        effective on the date Initial Developer first distributes
+        Original Code under the terms of this License.
+      </para>
+
+      <para>
+        (d) Notwithstanding Section 2.1(b) above, no patent license is
+        granted: 1) for code that You delete from the Original Code; 2)
+        separate from the Original Code; or 3) for infringements caused
+        by: i) the modification of the Original Code or ii) the
+        combination of the Original Code with other software or devices.
+      </para>
+
+      <para>
+        2.2. Contributor Grant. Subject to third party intellectual
+        property claims, each Contributor hereby grants You a
+        world-wide, royalty-free, non-exclusive license
+      </para>
+
+      <para>
+        (a) under intellectual property rights (other than patent or
+        trademark) Licensable by Contributor, to use, reproduce, modify,
+        display, perform, sublicense and distribute the Modifications
+        created by such Contributor (or portions thereof) either on an
+        unmodified basis, with other Modifications, as Covered Code
+        and/or as part of a Larger Work; and
+      </para>
+
+      <para>
+        (b) under Patent Claims infringed by the making, using, or
+        selling of Modifications made by that Contributor either alone
+        and/or in combination with its Contributor Version (or portions
+        of such combination), to make, use, sell, offer for sale, have
+        made, and/or otherwise dispose of: 1) Modifications made by that
+        Contributor (or portions thereof); and 2) the combination of
+        Modifications made by that Contributor with its Contributor
+        Version (or portions of such combination).
+      </para>
+
+      <para>
+        (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+        effective on the date Contributor first makes Commercial Use of
+        the Covered Code.
+      </para>
+
+      <para>
+        (d) Notwithstanding Section 2.2(b) above, no patent license is
+        granted: 1) for any code that Contributor has deleted from the
+        Contributor Version; 2) separate from the Contributor Version;
+        3) for infringements caused by: i) third party modifications of
+        Contributor Version or ii) the combination of Modifications made
+        by that Contributor with other software (except as part of the
+        Contributor Version) or other devices; or 4) under Patent Claims
+        infringed by Covered Code in the absence of Modifications made
+        by that Contributor.
+      </para>
+
+      <para>
+        3. Distribution Obligations.
+      </para>
+
+      <para>
+        3.1. Application of License. The Modifications which You create
+        or to which You contribute are governed by the terms of this
+        License, including without limitation Section 2.2. The Source
+        Code version of Covered Code may be distributed only under the
+        terms of this License or a future version of this License
+        released under Section 6.1, and You must include a copy of this
+        License with every copy of the Source Code You distribute. You
+        may not offer or impose any terms on any Source Code version
+        that alters or restricts the applicable version of this License
+        or the recipients' rights hereunder. However, You may include an
+        additional document offering the additional rights described in
+        Section 3.5.
+      </para>
+
+      <para>
+        3.2. Availability of Source Code. Any Modification which You
+        create or to which You contribute must be made available in
+        Source Code form under the terms of this License either on the
+        same media as an Executable version or via an accepted
+        Electronic Distribution Mechanism to anyone to whom you made an
+        Executable version available; and if made available via
+        Electronic Distribution Mechanism, must remain available for at
+        least twelve (12) months after the date it initially became
+        available, or at least six (6) months after a subsequent version
+        of that particular Modification has been made available to such
+        recipients. You are responsible for ensuring that the Source
+        Code version remains available even if the Electronic
+        Distribution Mechanism is maintained by a third party.
+      </para>
+
+      <para>
+        3.3. Description of Modifications. You must cause all Covered
+        Code to which You contribute to contain a file documenting the
+        changes You made to create that Covered Code and the date of any
+        change. You must include a prominent statement that the
+        Modification is derived, directly or indirectly, from Original
+        Code provided by the Initial Developer and including the name of
+        the Initial Developer in (a) the Source Code, and (b) in any
+        notice in an Executable version or related documentation in
+        which You describe the origin or ownership of the Covered Code.
+      </para>
+
+      <para>
+        3.4. Intellectual Property Matters
+      </para>
+
+      <para>
+        (a) Third Party Claims. If Contributor has knowledge that a
+        license under a third party's intellectual property rights is
+        required to exercise the rights granted by such Contributor
+        under Sections 2.1 or 2.2, Contributor must include a text file
+        with the Source Code distribution titled "LEGAL" which describes
+        the claim and the party making the claim in sufficient detail
+        that a recipient will know whom to contact. If Contributor
+        obtains such knowledge after the Modification is made available
+        as described in Section 3.2, Contributor shall promptly modify
+        the LEGAL file in all copies Contributor makes available
+        thereafter and shall take other steps (such as notifying
+        appropriate mailing lists or newsgroups) reasonably calculated
+        to inform those who received the Covered Code that new knowledge
+        has been obtained.
+      </para>
+
+      <para>
+        (b) Contributor APIs. If Contributor's Modifications include an
+        application programming interface and Contributor has knowledge
+        of patent licenses which are reasonably necessary to implement
+        that API, Contributor must also include this information in the
+        LEGAL file.
+      </para>
+
+      <para>
+        3.5. Required Notices. You must duplicate the notice in Exhibit
+        A in each file of the Source Code. If it is not possible to put
+        such notice in a particular Source Code file due to its
+        structure, then You must include such notice in a location (such
+        as a relevant directory) where a user would be likely to look
+        for such a notice. If You created one or more Modification(s)
+        You may add your name as a Contributor to the notice described
+        in Exhibit A. You must also duplicate this License in any
+        documentation for the Source Code where You describe recipients'
+        rights or ownership rights relating to Covered Code. You may
+        choose to offer, and to charge a fee for, warranty, support,
+        indemnity or liability obligations to one or more recipients of
+        Covered Code. However, You may do so only on Your own behalf,
+        and not on behalf of the Initial Developer or any Contributor.
+        You must make it absolutely clear than any such warranty,
+        support, indemnity or liability obligation is offered by You
+        alone, and You hereby agree to indemnify the Initial Developer
+        and every Contributor for any liability incurred by the Initial
+        Developer or such Contributor as a result of warranty, support,
+        indemnity or liability terms You offer.
+      </para>
+
+      <para>
+        3.6. Distribution of Executable Versions. You may distribute
+        Covered Code in Executable form only if the requirements of
+        Section 3.1-3.5 have been met for that Covered Code, and if You
+        include a notice stating that the Source Code version of the
+        Covered Code is available under the terms of this License,
+        including a description of how and where You have fulfilled the
+        obligations of Section 3.2. The notice must be conspicuously
+        included in any notice in an Executable version, related
+        documentation or collateral in which You describe recipients'
+        rights relating to the Covered Code. You may distribute the
+        Executable version of Covered Code or ownership rights under a
+        license of Your choice, which may contain terms different from
+        this License, provided that You are in compliance with the terms
+        of this License and that the license for the Executable version
+        does not attempt to limit or alter the recipient's rights in the
+        Source Code version from the rights set forth in this License.
+        If You distribute the Executable version under a different
+        license You must make it absolutely clear that any terms which
+        differ from this License are offered by You alone, not by the
+        Initial Developer or any Contributor. You hereby agree to
+        indemnify the Initial Developer and every Contributor for any
+        liability incurred by the Initial Developer or such Contributor
+        as a result of any such terms You offer.
+      </para>
+
+      <para>
+        3.7. Larger Works. You may create a Larger Work by combining
+        Covered Code with other code not governed by the terms of this
+        License and distribute the Larger Work as a single product. In
+        such a case, You must make sure the requirements of this License
+        are fulfilled for the Covered Code.
+      </para>
+
+      <para>
+        4. Inability to Comply Due to Statute or Regulation.If it is
+        impossible for You to comply with any of the terms of this
+        License with respect to some or all of the Covered Code due to
+        statute, judicial order, or regulation then You must: (a) comply
+        with the terms of this License to the maximum extent possible;
+        and (b) describe the limitations and the code they affect. Such
+        description must be included in the LEGAL file described in
+        Section 3.4 and must be included with all distributions of the
+        Source Code. Except to the extent prohibited by statute or
+        regulation, such description must be sufficiently detailed for a
+        recipient of ordinary skill to be able to understand it.
+      </para>
+
+      <para>
+        5. Application of this License. This License applies to code to
+        which the Initial Developer has attached the notice in Exhibit A
+        and to related Covered Code.
+      </para>
+
+      <para>
+        6. Versions of the License.
+      </para>
+
+      <para>
+        6.1. New Versions. Netscape Communications Corporation
+        ("Netscape") may publish revised and/or new versions of the
+        License from time to time. Each version will be given a
+        distinguishing version number.
+      </para>
+
+      <para>
+        6.2. Effect of New Versions. Once Covered Code has been
+        published under a particular version of the License, You may
+        always continue to use it under the terms of that version. You
+        may also choose to use such Covered Code under the terms of any
+        subsequent version of the License published by Netscape. No one
+        other than Netscape has the right to modify the terms applicable
+        to Covered Code created under this License.
+      </para>
+
+      <para>
+        6.3. Derivative Works. If You create or use a modified version
+        of this License (which you may only do in order to apply it to
+        code which is not already Covered Code governed by this
+        License), You must (a) rename Your license so that the phrases
+        "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL", "NPL" or any
+        confusingly similar phrase do not appear in your license (except
+        to note that your license differs from this License) and (b)
+        otherwise make it clear that Your version of the license
+        contains terms which differ from the Mozilla Public License and
+        Netscape Public License. (Filling in the name of the Initial
+        Developer, Original Code or Contributor in the notice described
+        in Exhibit A shall not of themselves be deemed to be
+        modifications of this License.)
+      </para>
+
+      <para>
+        7. DISCLAIMER OF WARRANTY.
+      </para>
+
+      <para>
+        COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+        WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+        INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE
+        IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
+        OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+        PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED
+        CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL
+        DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+        NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+        WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE
+        OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+        DISCLAIMER.
+      </para>
+
+      <para>
+        8. TERMINATION.
+      </para>
+
+      <para>
+        8.1. This License and the rights granted hereunder will
+        terminate automatically if You fail to comply with terms herein
+        and fail to cure such breach within 30 days of becoming aware of
+        the breach. All sublicenses to the Covered Code which are
+        properly granted shall survive any termination of this License.
+        Provisions which, by their nature, must remain in effect beyond
+        the termination of this License shall survive.
+      </para>
+
+      <para>
+        8.2. If You initiate litigation by asserting a patent
+        infringement claim (excluding declaratory judgment actions)
+        against Initial Developer or a Contributor (the Initial
+        Developer or Contributor against whom You file such action is
+        referred to as "Participant") alleging that:
+      </para>
+
+      <para>
+        (a) such Participant's Contributor Version directly or
+        indirectly infringes any patent, then any and all rights granted
+        by such Participant to You under Sections 2.1 and/or 2.2 of this
+        License shall, upon 60 days notice from Participant terminate
+        prospectively, unless if within 60 days after receipt of notice
+        You either: (i) agree in writing to pay Participant a mutually
+        agreeable reasonable royalty for Your past and future use of
+        Modifications made by such Participant, or (ii) withdraw Your
+        litigation claim with respect to the Contributor Version against
+        such Participant. If within 60 days of notice, a reasonable
+        royalty and payment arrangement are not mutually agreed upon in
+        writing by the parties or the litigation claim is not withdrawn,
+        the rights granted by Participant to You under Sections 2.1
+        and/or 2.2 automatically terminate at the expiration of the 60
+        day notice period specified above.
+      </para>
+
+      <para>
+        (b) any software, hardware, or device, other than such
+        Participant's Contributor Version, directly or indirectly
+        infringes any patent, then any rights granted to You by such
+        Participant under Sections 2.1(b) and 2.2(b) are revoked
+        effective as of the date You first made, used, sold,
+        distributed, or had made, Modifications made by that
+        Participant.
+      </para>
+
+      <para>
+        8.3. If You assert a patent infringement claim against
+        Participant alleging that such Participant's Contributor Version
+        directly or indirectly infringes any patent where such claim is
+        resolved (such as by license or settlement) prior to the
+        initiation of patent infringement litigation, then the
+        reasonable value of the licenses granted by such Participant
+        under Sections 2.1 or 2.2 shall be taken into account in
+        determining the amount or value of any payment or license.
+      </para>
+
+      <para>
+        8.4. In the event of termination under Sections 8.1 or 8.2
+        above, all end user license agreements (excluding distributors
+        and resellers) which have been validly granted by You or any
+        distributor hereunder prior to termination shall survive
+        termination.
+      </para>
+
+      <para>
+        9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO
+        LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR
+        OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
+        CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER
+        OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY
+        INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+        CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+        GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY
+        AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY
+        SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.
+        THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR
+        DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE
+        TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+        JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF
+        INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND
+        LIMITATION MAY NOT APPLY TO YOU.
+      </para>
+
+      <para>
+        10. U.S. GOVERNMENT END USERS. The Covered Code is a "commercial
+        item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
+        consisting of "commercial computer software" and "commercial
+        computer software documentation," as such terms are used in 48
+        C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
+        48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S.
+        Government End Users acquire Covered Code with only those rights
+        set forth herein.
+      </para>
+
+      <para>
+        11. MISCELLANEOUS. This License represents the complete
+        agreement concerning subject matter hereof. If any provision of
+        this License is held to be unenforceable, such provision shall
+        be reformed only to the extent necessary to make it enforceable.
+        This License shall be governed by California law provisions
+        (except to the extent applicable law, if any, provides
+        otherwise), excluding its conflict-of-law provisions. With
+        respect to disputes in which at least one party is a citizen of,
+        or an entity chartered or registered to do business in the
+        United States of America, any litigation relating to this
+        License shall be subject to the jurisdiction of the Federal
+        Courts of the Northern District of California, with venue lying
+        in Santa Clara County, California, with the losing party
+        responsible for costs, including without limitation, court costs
+        and reasonable attorneys' fees and expenses. The application of
+        the United Nations Convention on Contracts for the International
+        Sale of Goods is expressly excluded. Any law or regulation which
+        provides that the language of a contract shall be construed
+        against the drafter shall not apply to this License.
+      </para>
+
+      <para>
+        12. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and
+        the Contributors, each party is responsible for claims and
+        damages arising, directly or indirectly, out of its utilization
+        of rights under this License and You agree to work with Initial
+        Developer and Contributors to distribute such responsibility on
+        an equitable basis. Nothing herein is intended or shall be
+        deemed to constitute any admission of liability.
+      </para>
+
+      <para>
+        13. MULTIPLE-LICENSED CODE. Initial Developer may designate
+        portions of the Covered Code as "Multiple-Licensed".
+        "Multiple-Licensed" means that the Initial Developer permits you
+        to utilize portions of the Covered Code under Your choice of the
+        NPL or the alternative licenses, if any, specified by the
+        Initial Developer in the file described in Exhibit A.
+      </para>
+
+      <para>
+        EXHIBIT A -Mozilla Public License.
+      </para>
+
+      <para>
+        ``The contents of this file are subject to the Mozilla Public
+        License Version 1.1 (the "License"); you may not use this file
+        except in compliance with the License. You may obtain a copy of
+        the License at http://www.mozilla.org/MPL/
+      </para>
+
+      <para>
+        Software distributed under the License is distributed on an "AS
+        IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+        implied. See the License for the specific language governing
+        rights and limitations under the License.
+      </para>
+
+      <para>
+        The Original Code is ______________________________________.
+      </para>
+
+      <para>
+        The Initial Developer of the Original Code is
+        ________________________. Portions created by
+        ______________________ are Copyright (C) ______
+        _______________________. All Rights Reserved.
+      </para>
+
+      <para>
+        Contributor(s): ______________________________________.
+      </para>
+
+      <para>
+        Alternatively, the contents of this file may be used under the
+        terms of the _____ license (the "[___] License"), in which case
+        the provisions of [______] License are applicable instead of
+        those above. If you wish to allow use of your version of this
+        file only under the terms of the [____] License and not to allow
+        others to use your version of this file under the MPL, indicate
+        your decision by deleting the provisions above and replace them
+        with the notice and other provisions required by the [___]
+        License. If you do not delete the provisions above, a recipient
+        may use your version of this file under either the MPL or the
+        [___] License."
+      </para>
+
+      <para>
+        [NOTE: The text of this Exhibit A may differ slightly from the
+        text of the notices in the Source Code files of the Original
+        Code. You should use the text of this Exhibit A rather than the
+        text found in the Original Code Source Code for Your
+        Modifications.]
+      </para>
+
     </sect2>
 
     <sect2 id="licMIT">
+
       <title>MIT License</title>
 
-      <para>Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation files
-      (the "Software"), to deal in the Software without restriction, including
-      without limitation the rights to use, copy, modify, merge, publish,
-      distribute, sublicense, and/or sell copies of the Software, and to
-      permit persons to whom the Software is furnished to do so, subject to
-      the following conditions:</para>
-
-      <para>The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.</para>
-
-      <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-      IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-      TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-      SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</para>
+      <para>
+        Permission is hereby granted, free of charge, to any person
+        obtaining a copy of this software and associated documentation
+        files (the "Software"), to deal in the Software without
+        restriction, including without limitation the rights to use,
+        copy, modify, merge, publish, distribute, sublicense, and/or
+        sell copies of the Software, and to permit persons to whom the
+        Software is furnished to do so, subject to the following
+        conditions:
+      </para>
+
+      <para>
+        The above copyright notice and this permission notice shall be
+        included in all copies or substantial portions of the Software.
+      </para>
+
+      <para>
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+        OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+        NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+        HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+        WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+        OTHER DEALINGS IN THE SOFTWARE.
+      </para>
+
     </sect2>
 
     <sect2 id="licX11">
+
       <title>X Consortium License (X11)</title>
 
-      <para>Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation files
-      (the "Software"), to deal in the Software without restriction, including
-      without limitation the rights to use, copy, modify, merge, publish,
-      distribute, sublicense, and/or sell copies of the Software, and to
-      permit persons to whom the Software is furnished to do so, subject to
-      the following conditions:</para>
-
-      <para>The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.</para>
-
-      <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-      IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-      TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-      SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</para>
+      <para>
+        Permission is hereby granted, free of charge, to any person
+        obtaining a copy of this software and associated documentation
+        files (the "Software"), to deal in the Software without
+        restriction, including without limitation the rights to use,
+        copy, modify, merge, publish, distribute, sublicense, and/or
+        sell copies of the Software, and to permit persons to whom the
+        Software is furnished to do so, subject to the following
+        conditions:
+      </para>
+
+      <para>
+        The above copyright notice and this permission notice shall be
+        included in all copies or substantial portions of the Software.
+      </para>
+
+      <para>
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+        OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+        NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+        HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+        WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+        OTHER DEALINGS IN THE SOFTWARE.
+      </para>
+
     </sect2>
 
     <sect2 id="licZLIB">
+
       <title>zlib License</title>
 
-      <para>This software is provided 'as-is', without any express or implied
-      warranty. In no event will the authors be held liable for any damages
-      arising from the use of this software.</para>
-
-      <para>Permission is granted to anyone to use this software for any
-      purpose, including commercial applications, and to alter it and
-      redistribute it freely, subject to the following restrictions:</para>
-
-      <para>1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use this
-      software in a product, an acknowledgment in the product documentation
-      would be appreciated but is not required.</para>
-
-      <para>2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.</para>
-
-      <para>3. This notice may not be removed or altered from any source
-      distribution.</para>
-
-      <screen>Jean-loup Gailly        Mark Adler
+      <para>
+        This software is provided 'as-is', without any express or
+        implied warranty. In no event will the authors be held liable
+        for any damages arising from the use of this software.
+      </para>
+
+      <para>
+        Permission is granted to anyone to use this software for any
+        purpose, including commercial applications, and to alter it and
+        redistribute it freely, subject to the following restrictions:
+      </para>
+
+      <para>
+        1. The origin of this software must not be misrepresented; you
+        must not claim that you wrote the original software. If you use
+        this software in a product, an acknowledgment in the product
+        documentation would be appreciated but is not required.
+      </para>
+
+      <para>
+        2. Altered source versions must be plainly marked as such, and
+        must not be misrepresented as being the original software.
+      </para>
+
+      <para>
+        3. This notice may not be removed or altered from any source
+        distribution.
+      </para>
+
+<screen>Jean-loup Gailly        Mark Adler
 jloup@gzip.org          madler@alumni.caltech.edu</screen>
+
     </sect2>
 
     <sect2 id="licSSL">
+
       <title>OpenSSL License</title>
 
-      <para>This package is an SSL implementation written by Eric Young
-      (eay@cryptsoft.com). The implementation was written so as to conform
-      with Netscape's SSL.</para>
-
-      <para>This library is free for commercial and non-commercial use as long
-      as the following conditions are adhered to. The following conditions
-      apply to all code found in this distribution, be it the RC4, RSA, lhash,
-      DES, etc., code; not just the SSL code. The SSL documentation included
-      with this distribution is covered by the same copyright terms except
-      that the holder is Tim Hudson (tjh@cryptsoft.com).</para>
-
-      <para>Copyright remains Eric Young's, and as such any Copyright notices
-      in the code are not to be removed. If this package is used in a product,
-      Eric Young should be given attribution as the author of the parts of the
-      library used. This can be in the form of a textual message at program
-      startup or in documentation (online or textual) provided with the
-      package.</para>
-
-      <para>Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are
-      met:</para>
-
-      <para>1. Redistributions of source code must retain the copyright
-      notice, this list of conditions and the following disclaimer.</para>
-
-      <para>2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following disclaimer
-      in the documentation and/or other materials provided with the
-      distribution.</para>
-
-      <para>3. All advertising materials mentioning features or use of this
-      software must display the following acknowledgement: "This product
-      includes cryptographic software written by Eric Young
-      (eay@cryptsoft.com)" The word 'cryptographic' can be left out if the
-      routines from the library being used are not cryptographic related
-      :-).</para>
-
-      <para>4. If you include any Windows specific code (or a derivative
-      thereof) from the apps directory (application code) you must include an
-      acknowledgement: "This product includes software written by Tim Hudson
-      (tjh@cryptsoft.com)"</para>
-
-      <para>THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ANY EXPRESS
-      OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-      DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-      ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-      DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-      OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-      STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-      ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.</para>
-
-      <para>The licence and distribution terms for any publicly available
-      version or derivative of this code cannot be changed. i.e. this code
-      cannot simply be copied and put under another distribution licence
-      [including the GNU Public Licence.]</para>
-    </sect2>
-
-    <sect2 id="licSlirp">
-      <title>Slirp License</title>
-
-      <para>Copyright (c) 1995,1996 Danny Gasparovski.  All rights reserved.</para>
-
-      <para>Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are
-      met:</para>
-
-      <para>1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.</para>
-
-      <para>2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following disclaimer
-      in the documentation and/or other materials provided with the
-      distribution.</para>
-
-      <para>3. All advertising materials mentioning features or use of this
-      software must display the following acknowledgment: This product
-      includes software developed by Danny Gasparovski.</para>
-
-      <para>THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-      WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-      NO EVENT SHALL DANNY GASPAROVSKI OR CONTRIBUTORS BE LIABLE FOR ANY
-      DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-      DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-      OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-      STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-      ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.</para>
-    </sect2>
-
-    <sect2 id="licLZF">
-      <title>liblzf License</title>
-
-      <para>Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are
-      met:</para>
-
-      <para>1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.</para>
-
-      <para>2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following disclaimer
-      in the documentation and/or other materials provided with the
-      distribution.</para>
-
-      <para>3. The name of the author may not be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.</para>
-
-      <para>THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-      OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-      DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-      (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-      SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-      STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-      ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.</para>
-    </sect2>
-
-    <sect2 id="liclibping">
-      <title>libpng License</title>
-
-      <para>The PNG Reference Library is supplied "AS IS". The Contributing
-      Authors and Group 42, Inc. disclaim all warranties, expressed or
-      implied, including, without limitation, the warranties of
-      merchantability and of fitness for any purpose. The Contributing Authors
-      and Group 42, Inc. assume no liability for direct, indirect, incidental,
-      special, exemplary, or consequential damages, which may result from the
-      use of the PNG Reference Library, even if advised of the possibility of
-      such damage.</para>
-
-      <para>Permission is hereby granted to use, copy, modify, and distribute
-      this source code, or portions hereof, for any purpose, without fee,
-      subject to the following restrictions:</para>
-
-      <para>1. The origin of this source code must not be
-      misrepresented.</para>
-
-      <para>2. Altered versions must be plainly marked as such and must not be
-      misrepresented as being the original source.</para>
-
-      <para>3. This Copyright notice may not be removed or altered from any
-      source or altered source distribution.</para>
-
-      <para>The Contributing Authors and Group 42, Inc. specifically permit,
-      without fee, and encourage the use of this source code as a component to
-      supporting the PNG file format in commercial products. If you use this
-      source code in a product, acknowledgment is not required but would be
-      appreciated.</para>
-    </sect2>
-
-    <sect2 id="licLWIP">
-      <title>lwIP License</title>
-
-      <para>Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are
-      met:</para>
-
-      <para>1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.</para>
-
-      <para>2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following disclaimer
-      in the documentation and/or other materials provided with the
-      distribution.</para>
-
-      <para>3. The name of the author may not be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.</para>
-
-      <para>THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-      OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-      DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-      (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-      SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-      STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-      ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.</para>
-    </sect2>
-
-    <sect2 id="licLibXML">
-      <title>libxml License</title>
-
-      <para>Except where otherwise noted in the source code (e.g. the files
-      hash.c, list.c and the trio files, which are covered by a similar
-      licence but with different Copyright notices) all the files are:</para>
-
-      <para>Copyright (C) 1998-2003 Daniel Veillard. All Rights
-      Reserved.</para>
-
-      <para>Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation files
-      (the "Software"), to deal in the Software without restriction, including
-      without limitation the rights to use, copy, modify, merge, publish,
-      distribute, sublicense, and/or sell copies of the Software, and to
-      permit persons to whom the Software is furnished to do so, subject to
-      the following conditions:</para>
-
-      <para>The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.</para>
-
-      <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-      IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES
-      OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-      OTHER DEALINGS IN THE SOFTWARE.</para>
-
-      <para>Except as contained in this notice, the name of Daniel Veillard
-      shall not be used in advertising or otherwise to promote the sale, use
-      or other dealings in this Software without prior written authorization
-      from him.</para>
-    </sect2>
-
-    <sect2 id="licLibXSLT">
-      <title>libxslt Licenses</title>
-
-      <para>Licence for libxslt except libexslt:</para>
-
-      <para>Copyright (C) 2001-2002 Daniel Veillard. All Rights
-      Reserved.</para>
-
-      <para>Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation files
-      (the "Software"), to deal in the Software without restriction, including
-      without limitation the rights to use, copy, modify, merge, publish,
-      distribute, sublicense, and/or sell copies of the Software, and to
-      permit persons to whom the Software is furnished to do so, subject to
-      the following conditions:</para>
-
-      <para>The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.</para>
-
-      <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-      IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES
-      OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-      OTHER DEALINGS IN THE SOFTWARE.</para>
-
-      <para>Except as contained in this notice, the name of Daniel Veillard
-      shall not be used in advertising or otherwise to promote the sale, use
-      or other dealings in this Software without prior written authorization
-      from him.</para>
-
-      <para>Licence for libexslt:</para>
-
-      <para>Copyright (C) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel
-      Veillard. All Rights Reserved.</para>
-
-      <para>Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation files
-      (the "Software"), to deal in the Software without restriction, including
-      without limitation the rights to use, copy, modify, merge, publish,
-      distribute, sublicense, and/or sell copies of the Software, and to
-      permit persons to whom the Software is furnished to do so, subject to
-      the following conditions:</para>
-
-      <para>The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.</para>
-
-      <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-      IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-      FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-      DEALINGS IN THE SOFTWARE.</para>
-
-      <para>Except as contained in this notice, the name of the authors shall
-      not be used in advertising or otherwise to promote the sale, use or
-      other dealings in this Software without prior written authorization from
-      him.</para>
-    </sect2>
-
-    <sect2 id="licgSOAP">
-      <title>gSOAP Public License Version 1.3a</title>
-
-      <para>The gSOAP public license is derived from the Mozilla Public
-      License (MPL1.1). The sections that were deleted from the original
-      MPL1.1 text are 1.0.1, 2.1.(c),(d), 2.2.(c),(d), 8.2.(b), 10, and 11.
-      Section 3.8 was added. The modified sections are 2.1.(b), 2.2.(b), 3.2
-      (simplified), 3.5 (deleted the last sentence), and 3.6
-      (simplified).</para>
-
-      <para>1 DEFINITIONS</para>
-
-      <para>1.1. "Contributor" means each entity that creates or contributes
-      to the creation of Modifications.</para>
-
-      <para>1.2. "Contributor Version" means the combination of the Original
-      Code, prior Modifications used by a Contributor, and the Modifications
-      made by that particular Contributor.</para>
-
-      <para>1.3. "Covered Code" means the Original Code, or Modifications or
-      the combination of the Original Code, and Modifications, in each case
-      including portions thereof.</para>
-
-      <para>1.4. "Electronic Distribution Mechanism" means a mechanism
-      generally accepted in the software development community for the
-      electronic transfer of data.</para>
-
-      <para>1.5. "Executable" means Covered Code in any form other than Source
-      Code.</para>
-
-      <para>1.6. "Initial Developer" means the individual or entity identified
-      as the Initial Developer in the Source Code notice required by Exhibit
-      A.</para>
-
-      <para>1.7. "Larger Work" means a work which combines Covered Code or
-      portions thereof with code not governed by the terms of this
-      License.</para>
-
-      <para>1.8. "License" means this document.</para>
-
-      <para>1.8.1. "Licensable" means having the right to grant, to the
-      maximum extent possible, whether at the time of the initial grant or
-      subsequently acquired, any and all of the rights conveyed herein.</para>
-
-      <para>1.9. "Modifications" means any addition to or deletion from the
-      substance or structure of either the Original Code or any previous
-      Modifications. When Covered Code is released as a series of files, a
-      Modification is:</para>
-
-      <para>A. Any addition to or deletion from the contents of a file
-      containing Original Code or previous Modifications.</para>
-
-      <para>B. Any new file that contains any part of the Original Code, or
-      previous Modifications.</para>
-
-      <para>1.10. "Original Code" means Source Code of computer software code
-      which is described in the Source Code notice required by Exhibit A as
-      Original Code, and which, at the time of its release under this License
-      is not already Covered Code governed by this License.</para>
-
-      <para>1.10.1. "Patent Claims" means any patent claim(s), now owned or
-      hereafter acquired, including without limitation, method, process, and
-      apparatus claims, in any patent Licensable by grantor.</para>
-
-      <para>1.11. "Source Code" means the preferred form of the Covered Code
-      for making modifications to it, including all modules it contains, plus
-      any associated interface definition files, scripts used to control
-      compilation and installation of an Executable, or source code
-      differential comparisons against either the Original Code or another
-      well known, available Covered Code of the Contributor's choice. The
-      Source Code can be in a compressed or archival form, provided the
-      appropriate decompression or de-archiving software is widely available
-      for no charge.</para>
-
-      <para>1.12. "You" (or "Your") means an individual or a legal entity
-      exercising rights under, and complying with all of the terms of, this
-      License or a future version of this License issued under Section 6.1.
-      For legal entities, "You" includes any entity which controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, "control" means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.</para>
-
-      <para>2 SOURCE CODE LICENSE.</para>
-
-      <para>2.1. The Initial Developer Grant.</para>
-
-      <para>The Initial Developer hereby grants You a world-wide,
-      royalty-free, non-exclusive license, subject to third party intellectual
-      property claims:</para>
-
-      <para>(a) under intellectual property rights (other than patent or
-      trademark) Licensable by Initial Developer to use, reproduce, modify,
-      display, perform, sublicense and distribute the Original Code (or
-      portions thereof) with or without Modifications, and/or as part of a
-      Larger Work; and</para>
-
-      <para>(b) under patents now or hereafter owned or controlled by Initial
-      Developer, to make, have made, use and sell ("offer to sell and import")
-      the Original Code, Modifications, or portions thereof, but solely to the
-      extent that any such patent is reasonably necessary to enable You to
-      utilize, alone or in combination with other software, the Original Code,
-      Modifications, or any combination or portions thereof.</para>
-
-      <para>(c)</para>
-
-      <para>(d)</para>
-
-      <para>2.2. Contributor Grant.</para>
-
-      <para>Subject to third party intellectual property claims, each
-      Contributor hereby grants You a world-wide, royalty-free, non-exclusive
-      license</para>
-
-      <para>(a) under intellectual property rights (other than patent or
-      trademark) Licensable by Contributor, to use, reproduce, modify,
-      display, perform, sublicense and distribute the Modifications created by
-      such Contributor (or portions thereof) either on an unmodified basis,
-      with other Modifications, as Covered Code and/or as part of a Larger
-      Work; and</para>
-
-      <para>(b) under patents now or hereafter owned or controlled by
-      Contributor, to make, have made, use and sell ("offer to sell and
-      import") the Contributor Version (or portions thereof), but solely to
-      the extent that any such patent is reasonably necessary to enable You to
-      utilize, alone or in combination with other software, the Contributor
-      Version (or portions thereof).</para>
-
-      <para>(c)</para>
-
-      <para>(d)</para>
-
-      <para>3 DISTRIBUTION OBLIGATIONS.</para>
-
-      <para>3.1. Application of License.</para>
-
-      <para>The Modifications which You create or to which You contribute are
-      governed by the terms of this License, including without limitation
-      Section 2.2. The Source Code version of Covered Code may be distributed
-      only under the terms of this License or a future version of this License
-      released under Section 6.1, and You must include a copy of this License
-      with every copy of the Source Code You distribute. You may not offer or
-      impose any terms on any Source Code version that alters or restricts the
-      applicable version of this License or the recipients' rights hereunder.
-      However, You may include an additional document offering the additional
-      rights described in Section 3.5.</para>
-
-      <para>3.2. Availability of Source Code.</para>
-
-      <para>Any Modification created by You will be provided to the Initial
-      Developer in Source Code form and are subject to the terms of the
-      License. 3.3. Description of Modifications.</para>
-
-      <para>You must cause all Covered Code to which You contribute to contain
-      a file documenting the changes You made to create that Covered Code and
-      the date of any change. You must include a prominent statement that the
-      Modification is derived, directly or indirectly, from Original Code
-      provided by the Initial Developer and including the name of the Initial
-      Developer in (a) the Source Code, and (b) in any notice in an Executable
-      version or related documentation in which You describe the origin or
-      ownership of the Covered Code.</para>
-
-      <para>3.4. Intellectual Property Matters.</para>
-
-      <para>(a) Third Party Claims. If Contributor has knowledge that a
-      license under a third party's intellectual property rights is required
-      to exercise the rights granted by such Contributor under Sections 2.1 or
-      2.2, Contributor must include a text file with the Source Code
-      distribution titled "LEGAL" which describes the claim and the party
-      making the claim in sufficient detail that a recipient will know whom to
-      contact. If Contributor obtains such knowledge after the Modification is
-      made available as described in Section 3.2, Contributor shall promptly
-      modify the LEGAL file in all copies Contributor makes available
-      thereafter and shall take other steps (such as notifying appropriate
-      mailing lists or newsgroups) reasonably calculated to inform those who
-      received the Covered Code that new knowledge has been obtained.</para>
-
-      <para>(b) Contributor APIs. If Contributor's Modifications include an
-      application programming interface and Contributor has knowledge of
-      patent licenses which are reasonably necessary to implement that API,
-      Contributor must also include this information in the LEGAL file.</para>
-
-      <para>(c) Representations. Contributor represents that, except as
-      disclosed pursuant to Section 3.4(a) above, Contributor believes that
-      Contributor's Modifications are Contributor's original creation(s)
-      and/or Contributor has sufficient rights to grant the rights conveyed by
-      this License.</para>
-
-      <para>3.5. Required Notices. You must duplicate the notice in Exhibit A
-      in each file of the Source Code. If it is not possible to put such
-      notice in a particular Source Code file due to its structure, then You
-      must include such notice in a location (such as a relevant directory)
-      where a user would be likely to look for such a notice. If You created
-      one or more Modification(s) You may add your name as a Contributor to
-      the notice described in Exhibit A. You must also duplicate this License
-      in any documentation for the Source Code where You describe recipients'
-      rights or ownership rights relating to Covered Code. You may choose to
-      offer, and to charge a fee for, warranty, support, indemnity or
-      liability obligations to one or more recipients of Covered Code.
-      However, You may do so only on Your own behalf, and not on behalf of the
-      Initial Developer or any Contributor.</para>
-
-      <para>3.6. Distribution of Executable Versions. You may distribute
-      Covered Code in Executable form only if the requirements of Section
-      3.1-3.5 have been met for that Covered Code. You may distribute the
-      Executable version of Covered Code or ownership rights under a license
-      of Your choice, which may contain terms different from this License,
-      provided that You are in compliance with the terms of this License and
-      that the license for the Executable version does not attempt to limit or
-      alter the recipient's rights in the Source Code version from the rights
-      set forth in this License. If You distribute the Executable version
-      under a different license You must make it absolutely clear that any
-      terms which differ from this License are offered by You alone, not by
-      the Initial Developer or any Contributor. If you distribute executable
-      versions containing Covered Code as part of a product, you must
-      reproduce the notice in Exhibit B in the documentation and/or other
-      materials provided with the product.</para>
-
-      <para>3.7. Larger Works. You may create a Larger Work by combining
-      Covered Code with other code not governed by the terms of this License
-      and distribute the Larger Work as a single product. In such a case, You
-      must make sure the requirements of this License are fulfilled for the
-      Covered Code.</para>
-
-      <para>3.8. Restrictions. You may not remove any product identification,
-      copyright, proprietary notices or labels from gSOAP.</para>
-
-      <para>4 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION.</para>
-
-      <para>If it is impossible for You to comply with any of the terms of
-      this License with respect to some or all of the Covered Code due to
-      statute, judicial order, or regulation then You must: (a) comply with
-      the terms of this License to the maximum extent possible; and (b)
-      describe the limitations and the code they affect. Such description must
-      be included in the LEGAL file described in Section 3.4 and must be
-      included with all distributions of the Source Code. Except to the extent
-      prohibited by statute or regulation, such description must be
-      sufficiently detailed for a recipient of ordinary skill to be able to
-      understand it.</para>
-
-      <para>5 APPLICATION OF THIS LICENSE.</para>
-
-      <para>This License applies to code to which the Initial Developer has
-      attached the notice in Exhibit A and to related Covered Code.</para>
-
-      <para>6 VERSIONS OF THE LICENSE.</para>
-
-      <para>6.1. New Versions.</para>
-
-      <para>Grantor may publish revised and/or new versions of the License
-      from time to time. Each version will be given a distinguishing version
-      number.</para>
-
-      <para>6.2. Effect of New Versions.</para>
-
-      <para>Once Covered Code has been published under a particular version of
-      the License, You may always continue to use it under the terms of that
-      version. You may also choose to use such Covered Code under the terms of
-      any subsequent version of the License.</para>
-
-      <para>6.3. Derivative Works.</para>
-
-      <para>If You create or use a modified version of this License (which you
-      may only do in order to apply it to code which is not already Covered
-      Code governed by this License), You must (a) rename Your license so that
-      the phrase "gSOAP" or any confusingly similar phrase do not appear in
-      your license (except to note that your license differs from this
-      License) and (b) otherwise make it clear that Your version of the
-      license contains terms which differ from the gSOAP Public License.
-      (Filling in the name of the Initial Developer, Original Code or
-      Contributor in the notice described in Exhibit A shall not of themselves
-      be deemed to be modifications of this License.)</para>
-
-      <para>7 DISCLAIMER OF WARRANTY.</para>
-
-      <para>COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED OR STATUTORY,
-      INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-      MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT OF
-      THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, AND ANY WARRANTY THAT MAY
-      ARISE BY REASON OF TRADE USAGE, CUSTOM, OR COURSE OF DEALING. WITHOUT
-      LIMITING THE FOREGOING, YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED
-      "AS IS" AND THAT THE AUTHORS DO NOT WARRANT THE SOFTWARE WILL RUN
-      UNINTERRUPTED OR ERROR FREE. LIMITED LIABILITY THE ENTIRE RISK AS TO
-      RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. UNDER NO
-      CIRCUMSTANCES WILL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT,
-      INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES OF ANY KIND OR NATURE
-      WHATSOEVER, WHETHER BASED ON CONTRACT, WARRANTY, TORT (INCLUDING
-      NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, ARISING OUT OF OR IN ANY WAY
-      RELATED TO THE SOFTWARE, EVEN IF THE AUTHORS HAVE BEEN ADVISED ON THE
-      POSSIBILITY OF SUCH DAMAGE OR IF SUCH DAMAGE COULD HAVE BEEN REASONABLY
-      FORESEEN, AND NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY
-      EXCLUSIVE REMEDY PROVIDED. SUCH LIMITATION ON DAMAGES INCLUDES, BUT IS
-      NOT LIMITED TO, DAMAGES FOR LOSS OF GOODWILL, LOST PROFITS, LOSS OF DATA
-      OR SOFTWARE, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION OR
-      IMPAIRMENT OF OTHER GOODS. IN NO EVENT WILL THE AUTHORS BE LIABLE FOR
-      THE COSTS OF PROCUREMENT OF SUBSTITUTE SOFTWARE OR SERVICES. YOU
-      ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED FOR USE IN ON-LINE
-      EQUIPMENT IN HAZARDOUS ENVIRONMENTS SUCH AS OPERATION OF NUCLEAR
-      FACILITIES, AIRCRAFT NAVIGATION OR CONTROL, OR LIFE-CRITICAL
-      APPLICATIONS. THE AUTHORS EXPRESSLY DISCLAIM ANY LIABILITY RESULTING
-      FROM USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS
-      ENVIRONMENTS AND ACCEPTS NO LIABILITY IN RESPECT OF ANY ACTIONS OR
-      CLAIMS BASED ON THE USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN
-      HAZARDOUS ENVIRONMENTS BY YOU. FOR PURPOSES OF THIS PARAGRAPH, THE TERM
-      "LIFE-CRITICAL APPLICATION" MEANS AN APPLICATION IN WHICH THE
-      FUNCTIONING OR MALFUNCTIONING OF THE SOFTWARE MAY RESULT DIRECTLY OR
-      INDIRECTLY IN PHYSICAL INJURY OR LOSS OF HUMAN LIFE. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY
-      COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER.</para>
-
-      <para>8 TERMINATION.</para>
-
-      <para>8.1.</para>
-
-      <para>This License and the rights granted hereunder will terminate
-      automatically if You fail to comply with terms herein and fail to cure
-      such breach within 30 days of becoming aware of the breach. All
-      sublicenses to the Covered Code which are properly granted shall survive
-      any termination of this License. Provisions which, by their nature, must
-      remain in effect beyond the termination of this License shall
-      survive.</para>
-
-      <para>8.2.</para>
-
-      <para>8.3.</para>
-
-      <para>If You assert a patent infringement claim against Participant
-      alleging that such Participant's Contributor Version directly or
-      indirectly infringes any patent where such claim is resolved (such as by
-      license or settlement) prior to the initiation of patent infringement
-      litigation, then the reasonable value of the licenses granted by such
-      Participant under Sections 2.1 or 2.2 shall be taken into account in
-      determining the amount or value of any payment or license.</para>
-
-      <para>8.4. In the event of termination under Sections 8.1 or 8.2 above,
-      all end user license agreements (excluding distributors and resellers)
-      which have been validly granted by You or any distributor hereunder
-      prior to termination shall survive termination.</para>
-
-      <para>9 LIMITATION OF LIABILITY.</para>
-
-      <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-      DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR
-      ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY
-      INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER
-      INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-      RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-      PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
-      OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
-      AND LIMITATION MAY NOT APPLY TO YOU.</para>
-
-      <para>10 U.S. GOVERNMENT END USERS.</para>
-
-      <para>11 MISCELLANEOUS.</para>
-
-      <para>12 RESPONSIBILITY FOR CLAIMS.</para>
-
-      <para>As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or indirectly, out
-      of its utilization of rights under this License and You agree to work
-      with Initial Developer and Contributors to distribute such
-      responsibility on an equitable basis. Nothing herein is intended or
-      shall be deemed to constitute any admission of liability.</para>
-
-      <para>EXHIBIT A.</para>
-
-      <para>"The contents of this file are subject to the gSOAP Public License
-      Version 1.3 (the "License"); you may not use this file except in
-      compliance with the License. You may obtain a copy of the License at
-      <ulink
-      url="http://www.cs.fsu.edu/~engelen/soaplicense.html">http://www.cs.fsu.edu/~engelen/soaplicense.html</ulink>.
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-      License for the specific language governing rights and limitations under
-      the License.</para>
-
-      <para>The Original Code of the gSOAP Software is: stdsoap.h, stdsoap2.h,
-      stdsoap.c, stdsoap2.c, stdsoap.cpp, stdsoap2.cpp, soapcpp2.h,
-      soapcpp2.c, soapcpp2_lex.l, soapcpp2_yacc.y, error2.h, error2.c,
-      symbol2.c, init2.c, soapdoc2.html, and soapdoc2.pdf, httpget.h,
-      httpget.c, stl.h, stldeque.h, stllist.h, stlvector.h, stlset.h.</para>
-
-      <para>The Initial Developer of the Original Code is Robert A. van
-      Engelen. Portions created by Robert A. van Engelen are Copyright (C)
-      2001-2004 Robert A. van Engelen, Genivia inc. All Rights
-      Reserved.</para>
-
-      <para>Contributor(s): "________________________." [Note: The text of
-      this Exhibit A may differ slightly form the text of the notices in the
-      Source Code files of the Original code. You should use the text of this
-      Exhibit A rather than the text found in the Original Code Source Code
-      for Your Modifications.]</para>
-
-      <para>EXHIBIT B.</para>
-
-      <para>"Part of the software embedded in this product is gSOAP software.
-      Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van
-      Engelen, Genivia inc. All Rights Reserved. THE SOFTWARE IN THIS PRODUCT
-      WAS IN PART PROVIDED BY GENIVIA INC AND ANY EXPRESS OR IMPLIED
-      WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-      NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-      INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-      USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-      ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-      (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-      THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-      DAMAGE."</para>
-    </sect2>
-
-    <sect2 id="licChromium">
-      <title>Chromium Licenses</title>
-
-      <sect3>
-        <title>Main License</title>
-
-        <para>Copyright (c) 2002, Stanford University All rights
-        reserved.</para>
-
-        <para>Some portions of Chromium are copyrighted by individiual
-        organizations. Please see the files COPYRIGHT.LLNL and
-        COPYRIGHT.REDHAT for more information.</para>
-
-        <para>Redistribution and use in source and binary forms, with or
+      <para>
+        This package is an SSL implementation written by Eric Young
+        (eay@cryptsoft.com). The implementation was written so as to
+        conform with Netscape's SSL.
+      </para>
+
+      <para>
+        This library is free for commercial and non-commercial use as
+        long as the following conditions are adhered to. The following
+        conditions apply to all code found in this distribution, be it
+        the RC4, RSA, lhash, DES, etc., code; not just the SSL code. The
+        SSL documentation included with this distribution is covered by
+        the same copyright terms except that the holder is Tim Hudson
+        (tjh@cryptsoft.com).
+      </para>
+
+      <para>
+        Copyright remains Eric Young's, and as such any Copyright
+        notices in the code are not to be removed. If this package is
+        used in a product, Eric Young should be given attribution as the
+        author of the parts of the library used. This can be in the form
+        of a textual message at program startup or in documentation
+        (online or textual) provided with the package.
+      </para>
+
+      <para>
+        Redistribution and use in source and binary forms, with or
         without modification, are permitted provided that the following
-        conditions are met:</para>
-        <itemizedlist>
-            <listitem>
-              <para>Redistributions of source code must retain the above
-              copyright notice, this list of conditions and the following
-              disclaimer.</para>
-            </listitem>
-
-            <listitem>
-              <para>Redistributions in binary form must reproduce the above
-              copyright notice, this list of conditions and the following
-              disclaimer in the documentation and/or other materials provided
-              with the distribution.</para>
-            </listitem>
-
-            <listitem>
-              <para>Neither the name of Stanford University nor the names of
-              its contributors may be used to endorse or promote products
-              derived from this software without specific prior written
-              permission.</para>
-            </listitem>
-          </itemizedlist>
-
-        <para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-        CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-        BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-        FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-        COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-        INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-        BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-        OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-        ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-        TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-        USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-        DAMAGE.</para>
-      </sect3>
-
-      <sect3>
-        <title>COPYRIGHT.LLNL File</title>
-
-        <para>This Chromium distribution contains information and code which
-        is covered under the following notice:</para>
-
-        <para>Copyright (c) 2002, The Regents of the University of California.
-        Produced at the Lawrence Livermore National Laboratory For details,
-        contact: Randall Frank (rjfrank@llnl.gov). UCRL-CODE-2002-058 All
-        rights reserved.</para>
-
-        <para>This file is part of Chromium. For details, see accompanying
-        documentation.</para>
-
-        <para>Redistribution and use in source and binary forms, with or
-        without modification, are permitted provided that the following
-        conditions are met:</para>
-
-        <para>Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the disclaimer below.</para>
-
-        <para>Redistributions in binary form must reproduce the above
-        copyright notice, this list of conditions and the disclaimer (as noted
-        below) in the documentation and/or other materials provided with the
-        distribution.</para>
-
-        <para>Neither the name of the UC/LLNL nor the names of its
-        contributors may be used to endorse or promote products derived from
-        this software without specific prior written permission.</para>
-
-        <para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-        CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-        BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-        FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-        REGENTS OF THE UNIVERSITY OF CALIFORNIA, THE U.S. DEPARTMENT OF ENERGY
+        conditions are met:
+      </para>
+
+      <para>
+        1. Redistributions of source code must retain the copyright
+        notice, this list of conditions and the following disclaimer.
+      </para>
+
+      <para>
+        2. Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      </para>
+
+      <para>
+        3. All advertising materials mentioning features or use of this
+        software must display the following acknowledgement: "This
+        product includes cryptographic software written by Eric Young
+        (eay@cryptsoft.com)" The word 'cryptographic' can be left out if
+        the routines from the library being used are not cryptographic
+        related :-).
+      </para>
+
+      <para>
+        4. If you include any Windows specific code (or a derivative
+        thereof) from the apps directory (application code) you must
+        include an acknowledgement: "This product includes software
+        written by Tim Hudson (tjh@cryptsoft.com)"
+      </para>
+
+      <para>
+        THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ANY
+        EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+        THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+        PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
         OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
         SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-        THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-        DAMAGE.</para>
-
-        <para>Additional BSD Notice</para>
-
-        <para>1. This notice is required to be provided under our contract
-        with the U.S. Department of Energy (DOE). This work was produced at
-        the University of California, Lawrence Livermore National Laboratory
-        under Contract No. W-7405-ENG-48 with the DOE.</para>
-
-        <para>2. Neither the United States Government nor the University of
-        California nor any of their employees, makes any warranty, express or
-        implied, or assumes any liability or responsibility for the accuracy,
-        completeness, or usefulness of any information, apparatus, product, or
-        process disclosed, or represents that its use would not infringe
-        privately-owned rights.</para>
-
-        <para>3. Also, reference herein to any specific commercial products,
-        process, or services by trade name, trademark, manufacturer or
-        otherwise does not necessarily constitute or imply its endorsement,
-        recommendation, or favoring by the United States Government or the
-        University of California. The views and opinions of authors expressed
-        herein do not necessarily state or reflect those of the United States
-        Government or the University of California, and shall not be used for
-        advertising or product endorsement purposes.</para>
+        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+        USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+        AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE.
+      </para>
+
+      <para>
+        The licence and distribution terms for any publicly available
+        version or derivative of this code cannot be changed. i.e. this
+        code cannot simply be copied and put under another distribution
+        licence [including the GNU Public Licence.]
+      </para>
+
+    </sect2>
+
+    <sect2 id="licSlirp">
+
+      <title>Slirp License</title>
+
+      <para>
+        Copyright (c) 1995,1996 Danny Gasparovski. All rights reserved.
+      </para>
+
+      <para>
+        Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the following
+        conditions are met:
+      </para>
+
+      <para>
+        1. Redistributions of source code must retain the above
+        copyright notice, this list of conditions and the following
+        disclaimer.
+      </para>
+
+      <para>
+        2. Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      </para>
+
+      <para>
+        3. All advertising materials mentioning features or use of this
+        software must display the following acknowledgment: This product
+        includes software developed by Danny Gasparovski.
+      </para>
+
+      <para>
+        THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+        WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+        PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DANNY GASPAROVSKI OR
+        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+        SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+        USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+        AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE.
+      </para>
+
+    </sect2>
+
+    <sect2 id="licLZF">
+
+      <title>liblzf License</title>
+
+      <para>
+        Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the following
+        conditions are met:
+      </para>
+
+      <para>
+        1. Redistributions of source code must retain the above
+        copyright notice, this list of conditions and the following
+        disclaimer.
+      </para>
+
+      <para>
+        2. Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      </para>
+
+      <para>
+        3. The name of the author may not be used to endorse or promote
+        products derived from this software without specific prior
+        written permission.
+      </para>
+
+      <para>
+        THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
+        EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+        THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+        PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
+        BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+        EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+        TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+        ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE.
+      </para>
+
+    </sect2>
+
+    <sect2 id="liclibping">
+
+      <title>libpng License</title>
+
+      <para>
+        The PNG Reference Library is supplied "AS IS". The Contributing
+        Authors and Group 42, Inc. disclaim all warranties, expressed or
+        implied, including, without limitation, the warranties of
+        merchantability and of fitness for any purpose. The Contributing
+        Authors and Group 42, Inc. assume no liability for direct,
+        indirect, incidental, special, exemplary, or consequential
+        damages, which may result from the use of the PNG Reference
+        Library, even if advised of the possibility of such damage.
+      </para>
+
+      <para>
+        Permission is hereby granted to use, copy, modify, and
+        distribute this source code, or portions hereof, for any
+        purpose, without fee, subject to the following restrictions:
+      </para>
+
+      <para>
+        1. The origin of this source code must not be misrepresented.
+      </para>
+
+      <para>
+        2. Altered versions must be plainly marked as such and must not
+        be misrepresented as being the original source.
+      </para>
+
+      <para>
+        3. This Copyright notice may not be removed or altered from any
+        source or altered source distribution.
+      </para>
+
+      <para>
+        The Contributing Authors and Group 42, Inc. specifically permit,
+        without fee, and encourage the use of this source code as a
+        component to supporting the PNG file format in commercial
+        products. If you use this source code in a product,
+        acknowledgment is not required but would be appreciated.
+      </para>
+
+    </sect2>
+
+    <sect2 id="licLWIP">
+
+      <title>lwIP License</title>
+
+      <para>
+        Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the following
+        conditions are met:
+      </para>
+
+      <para>
+        1. Redistributions of source code must retain the above
+        copyright notice, this list of conditions and the following
+        disclaimer.
+      </para>
+
+      <para>
+        2. Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      </para>
+
+      <para>
+        3. The name of the author may not be used to endorse or promote
+        products derived from this software without specific prior
+        written permission.
+      </para>
+
+      <para>
+        THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
+        EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+        THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+        PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
+        BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+        EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+        TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+        ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE.
+      </para>
+
+    </sect2>
+
+    <sect2 id="licLibXML">
+
+      <title>libxml License</title>
+
+      <para>
+        Except where otherwise noted in the source code (e.g. the files
+        hash.c, list.c and the trio files, which are covered by a
+        similar licence but with different Copyright notices) all the
+        files are:
+      </para>
+
+      <para>
+        Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved.
+      </para>
+
+      <para>
+        Permission is hereby granted, free of charge, to any person
+        obtaining a copy of this software and associated documentation
+        files (the "Software"), to deal in the Software without
+        restriction, including without limitation the rights to use,
+        copy, modify, merge, publish, distribute, sublicense, and/or
+        sell copies of the Software, and to permit persons to whom the
+        Software is furnished to do so, subject to the following
+        conditions:
+      </para>
+
+      <para>
+        The above copyright notice and this permission notice shall be
+        included in all copies or substantial portions of the Software.
+      </para>
+
+      <para>
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+        OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+        NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE
+        FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+        OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+        CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+      </para>
+
+      <para>
+        Except as contained in this notice, the name of Daniel Veillard
+        shall not be used in advertising or otherwise to promote the
+        sale, use or other dealings in this Software without prior
+        written authorization from him.
+      </para>
+
+    </sect2>
+
+    <sect2 id="licLibXSLT">
+
+      <title>libxslt Licenses</title>
+
+      <para>
+        Licence for libxslt except libexslt:
+      </para>
+
+      <para>
+        Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved.
+      </para>
+
+      <para>
+        Permission is hereby granted, free of charge, to any person
+        obtaining a copy of this software and associated documentation
+        files (the "Software"), to deal in the Software without
+        restriction, including without limitation the rights to use,
+        copy, modify, merge, publish, distribute, sublicense, and/or
+        sell copies of the Software, and to permit persons to whom the
+        Software is furnished to do so, subject to the following
+        conditions:
+      </para>
+
+      <para>
+        The above copyright notice and this permission notice shall be
+        included in all copies or substantial portions of the Software.
+      </para>
+
+      <para>
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+        OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+        NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE
+        FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+        OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+        CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+      </para>
+
+      <para>
+        Except as contained in this notice, the name of Daniel Veillard
+        shall not be used in advertising or otherwise to promote the
+        sale, use or other dealings in this Software without prior
+        written authorization from him.
+      </para>
+
+      <para>
+        Licence for libexslt:
+      </para>
+
+      <para>
+        Copyright (C) 2001-2002 Thomas Broyer, Charlie Bozeman and
+        Daniel Veillard. All Rights Reserved.
+      </para>
+
+      <para>
+        Permission is hereby granted, free of charge, to any person
+        obtaining a copy of this software and associated documentation
+        files (the "Software"), to deal in the Software without
+        restriction, including without limitation the rights to use,
+        copy, modify, merge, publish, distribute, sublicense, and/or
+        sell copies of the Software, and to permit persons to whom the
+        Software is furnished to do so, subject to the following
+        conditions:
+      </para>
+
+      <para>
+        The above copyright notice and this permission notice shall be
+        included in all copies or substantial portions of the Software.
+      </para>
+
+      <para>
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+        OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+        NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+        CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+        CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+        CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+      </para>
+
+      <para>
+        Except as contained in this notice, the name of the authors
+        shall not be used in advertising or otherwise to promote the
+        sale, use or other dealings in this Software without prior
+        written authorization from him.
+      </para>
+
+    </sect2>
+
+    <sect2 id="licgSOAP">
+
+      <title>gSOAP Public License Version 1.3a</title>
+
+      <para>
+        The gSOAP public license is derived from the Mozilla Public
+        License (MPL1.1). The sections that were deleted from the
+        original MPL1.1 text are 1.0.1, 2.1.(c),(d), 2.2.(c),(d),
+        8.2.(b), 10, and 11. Section 3.8 was added. The modified
+        sections are 2.1.(b), 2.2.(b), 3.2 (simplified), 3.5 (deleted
+        the last sentence), and 3.6 (simplified).
+      </para>
+
+      <para>
+        1 DEFINITIONS
+      </para>
+
+      <para>
+        1.1. "Contributor" means each entity that creates or contributes
+        to the creation of Modifications.
+      </para>
+
+      <para>
+        1.2. "Contributor Version" means the combination of the Original
+        Code, prior Modifications used by a Contributor, and the
+        Modifications made by that particular Contributor.
+      </para>
+
+      <para>
+        1.3. "Covered Code" means the Original Code, or Modifications or
+        the combination of the Original Code, and Modifications, in each
+        case including portions thereof.
+      </para>
+
+      <para>
+        1.4. "Electronic Distribution Mechanism" means a mechanism
+        generally accepted in the software development community for the
+        electronic transfer of data.
+      </para>
+
+      <para>
+        1.5. "Executable" means Covered Code in any form other than
+        Source Code.
+      </para>
+
+      <para>
+        1.6. "Initial Developer" means the individual or entity
+        identified as the Initial Developer in the Source Code notice
+        required by Exhibit A.
+      </para>
+
+      <para>
+        1.7. "Larger Work" means a work which combines Covered Code or
+        portions thereof with code not governed by the terms of this
+        License.
+      </para>
+
+      <para>
+        1.8. "License" means this document.
+      </para>
+
+      <para>
+        1.8.1. "Licensable" means having the right to grant, to the
+        maximum extent possible, whether at the time of the initial
+        grant or subsequently acquired, any and all of the rights
+        conveyed herein.
+      </para>
+
+      <para>
+        1.9. "Modifications" means any addition to or deletion from the
+        substance or structure of either the Original Code or any
+        previous Modifications. When Covered Code is released as a
+        series of files, a Modification is:
+      </para>
+
+      <para>
+        A. Any addition to or deletion from the contents of a file
+        containing Original Code or previous Modifications.
+      </para>
+
+      <para>
+        B. Any new file that contains any part of the Original Code, or
+        previous Modifications.
+      </para>
+
+      <para>
+        1.10. "Original Code" means Source Code of computer software
+        code which is described in the Source Code notice required by
+        Exhibit A as Original Code, and which, at the time of its
+        release under this License is not already Covered Code governed
+        by this License.
+      </para>
+
+      <para>
+        1.10.1. "Patent Claims" means any patent claim(s), now owned or
+        hereafter acquired, including without limitation, method,
+        process, and apparatus claims, in any patent Licensable by
+        grantor.
+      </para>
+
+      <para>
+        1.11. "Source Code" means the preferred form of the Covered Code
+        for making modifications to it, including all modules it
+        contains, plus any associated interface definition files,
+        scripts used to control compilation and installation of an
+        Executable, or source code differential comparisons against
+        either the Original Code or another well known, available
+        Covered Code of the Contributor's choice. The Source Code can be
+        in a compressed or archival form, provided the appropriate
+        decompression or de-archiving software is widely available for
+        no charge.
+      </para>
+
+      <para>
+        1.12. "You" (or "Your") means an individual or a legal entity
+        exercising rights under, and complying with all of the terms of,
+        this License or a future version of this License issued under
+        Section 6.1. For legal entities, "You" includes any entity which
+        controls, is controlled by, or is under common control with You.
+        For purposes of this definition, "control" means (a) the power,
+        direct or indirect, to cause the direction or management of such
+        entity, whether by contract or otherwise, or (b) ownership of
+        more than fifty percent (50%) of the outstanding shares or
+        beneficial ownership of such entity.
+      </para>
+
+      <para>
+        2 SOURCE CODE LICENSE.
+      </para>
+
+      <para>
+        2.1. The Initial Developer Grant.
+      </para>
+
+      <para>
+        The Initial Developer hereby grants You a world-wide,
+        royalty-free, non-exclusive license, subject to third party
+        intellectual property claims:
+      </para>
+
+      <para>
+        (a) under intellectual property rights (other than patent or
+        trademark) Licensable by Initial Developer to use, reproduce,
+        modify, display, perform, sublicense and distribute the Original
+        Code (or portions thereof) with or without Modifications, and/or
+        as part of a Larger Work; and
+      </para>
+
+      <para>
+        (b) under patents now or hereafter owned or controlled by
+        Initial Developer, to make, have made, use and sell ("offer to
+        sell and import") the Original Code, Modifications, or portions
+        thereof, but solely to the extent that any such patent is
+        reasonably necessary to enable You to utilize, alone or in
+        combination with other software, the Original Code,
+        Modifications, or any combination or portions thereof.
+      </para>
+
+      <para>
+        (c)
+      </para>
+
+      <para>
+        (d)
+      </para>
+
+      <para>
+        2.2. Contributor Grant.
+      </para>
+
+      <para>
+        Subject to third party intellectual property claims, each
+        Contributor hereby grants You a world-wide, royalty-free,
+        non-exclusive license
+      </para>
+
+      <para>
+        (a) under intellectual property rights (other than patent or
+        trademark) Licensable by Contributor, to use, reproduce, modify,
+        display, perform, sublicense and distribute the Modifications
+        created by such Contributor (or portions thereof) either on an
+        unmodified basis, with other Modifications, as Covered Code
+        and/or as part of a Larger Work; and
+      </para>
+
+      <para>
+        (b) under patents now or hereafter owned or controlled by
+        Contributor, to make, have made, use and sell ("offer to sell
+        and import") the Contributor Version (or portions thereof), but
+        solely to the extent that any such patent is reasonably
+        necessary to enable You to utilize, alone or in combination with
+        other software, the Contributor Version (or portions thereof).
+      </para>
+
+      <para>
+        (c)
+      </para>
+
+      <para>
+        (d)
+      </para>
+
+      <para>
+        3 DISTRIBUTION OBLIGATIONS.
+      </para>
+
+      <para>
+        3.1. Application of License.
+      </para>
+
+      <para>
+        The Modifications which You create or to which You contribute
+        are governed by the terms of this License, including without
+        limitation Section 2.2. The Source Code version of Covered Code
+        may be distributed only under the terms of this License or a
+        future version of this License released under Section 6.1, and
+        You must include a copy of this License with every copy of the
+        Source Code You distribute. You may not offer or impose any
+        terms on any Source Code version that alters or restricts the
+        applicable version of this License or the recipients' rights
+        hereunder. However, You may include an additional document
+        offering the additional rights described in Section 3.5.
+      </para>
+
+      <para>
+        3.2. Availability of Source Code.
+      </para>
+
+      <para>
+        Any Modification created by You will be provided to the Initial
+        Developer in Source Code form and are subject to the terms of
+        the License. 3.3. Description of Modifications.
+      </para>
+
+      <para>
+        You must cause all Covered Code to which You contribute to
+        contain a file documenting the changes You made to create that
+        Covered Code and the date of any change. You must include a
+        prominent statement that the Modification is derived, directly
+        or indirectly, from Original Code provided by the Initial
+        Developer and including the name of the Initial Developer in (a)
+        the Source Code, and (b) in any notice in an Executable version
+        or related documentation in which You describe the origin or
+        ownership of the Covered Code.
+      </para>
+
+      <para>
+        3.4. Intellectual Property Matters.
+      </para>
+
+      <para>
+        (a) Third Party Claims. If Contributor has knowledge that a
+        license under a third party's intellectual property rights is
+        required to exercise the rights granted by such Contributor
+        under Sections 2.1 or 2.2, Contributor must include a text file
+        with the Source Code distribution titled "LEGAL" which describes
+        the claim and the party making the claim in sufficient detail
+        that a recipient will know whom to contact. If Contributor
+        obtains such knowledge after the Modification is made available
+        as described in Section 3.2, Contributor shall promptly modify
+        the LEGAL file in all copies Contributor makes available
+        thereafter and shall take other steps (such as notifying
+        appropriate mailing lists or newsgroups) reasonably calculated
+        to inform those who received the Covered Code that new knowledge
+        has been obtained.
+      </para>
+
+      <para>
+        (b) Contributor APIs. If Contributor's Modifications include an
+        application programming interface and Contributor has knowledge
+        of patent licenses which are reasonably necessary to implement
+        that API, Contributor must also include this information in the
+        LEGAL file.
+      </para>
+
+      <para>
+        (c) Representations. Contributor represents that, except as
+        disclosed pursuant to Section 3.4(a) above, Contributor believes
+        that Contributor's Modifications are Contributor's original
+        creation(s) and/or Contributor has sufficient rights to grant
+        the rights conveyed by this License.
+      </para>
+
+      <para>
+        3.5. Required Notices. You must duplicate the notice in Exhibit
+        A in each file of the Source Code. If it is not possible to put
+        such notice in a particular Source Code file due to its
+        structure, then You must include such notice in a location (such
+        as a relevant directory) where a user would be likely to look
+        for such a notice. If You created one or more Modification(s)
+        You may add your name as a Contributor to the notice described
+        in Exhibit A. You must also duplicate this License in any
+        documentation for the Source Code where You describe recipients'
+        rights or ownership rights relating to Covered Code. You may
+        choose to offer, and to charge a fee for, warranty, support,
+        indemnity or liability obligations to one or more recipients of
+        Covered Code. However, You may do so only on Your own behalf,
+        and not on behalf of the Initial Developer or any Contributor.
+      </para>
+
+      <para>
+        3.6. Distribution of Executable Versions. You may distribute
+        Covered Code in Executable form only if the requirements of
+        Section 3.1-3.5 have been met for that Covered Code. You may
+        distribute the Executable version of Covered Code or ownership
+        rights under a license of Your choice, which may contain terms
+        different from this License, provided that You are in compliance
+        with the terms of this License and that the license for the
+        Executable version does not attempt to limit or alter the
+        recipient's rights in the Source Code version from the rights
+        set forth in this License. If You distribute the Executable
+        version under a different license You must make it absolutely
+        clear that any terms which differ from this License are offered
+        by You alone, not by the Initial Developer or any Contributor.
+        If you distribute executable versions containing Covered Code as
+        part of a product, you must reproduce the notice in Exhibit B in
+        the documentation and/or other materials provided with the
+        product.
+      </para>
+
+      <para>
+        3.7. Larger Works. You may create a Larger Work by combining
+        Covered Code with other code not governed by the terms of this
+        License and distribute the Larger Work as a single product. In
+        such a case, You must make sure the requirements of this License
+        are fulfilled for the Covered Code.
+      </para>
+
+      <para>
+        3.8. Restrictions. You may not remove any product
+        identification, copyright, proprietary notices or labels from
+        gSOAP.
+      </para>
+
+      <para>
+        4 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION.
+      </para>
+
+      <para>
+        If it is impossible for You to comply with any of the terms of
+        this License with respect to some or all of the Covered Code due
+        to statute, judicial order, or regulation then You must: (a)
+        comply with the terms of this License to the maximum extent
+        possible; and (b) describe the limitations and the code they
+        affect. Such description must be included in the LEGAL file
+        described in Section 3.4 and must be included with all
+        distributions of the Source Code. Except to the extent
+        prohibited by statute or regulation, such description must be
+        sufficiently detailed for a recipient of ordinary skill to be
+        able to understand it.
+      </para>
+
+      <para>
+        5 APPLICATION OF THIS LICENSE.
+      </para>
+
+      <para>
+        This License applies to code to which the Initial Developer has
+        attached the notice in Exhibit A and to related Covered Code.
+      </para>
+
+      <para>
+        6 VERSIONS OF THE LICENSE.
+      </para>
+
+      <para>
+        6.1. New Versions.
+      </para>
+
+      <para>
+        Grantor may publish revised and/or new versions of the License
+        from time to time. Each version will be given a distinguishing
+        version number.
+      </para>
+
+      <para>
+        6.2. Effect of New Versions.
+      </para>
+
+      <para>
+        Once Covered Code has been published under a particular version
+        of the License, You may always continue to use it under the
+        terms of that version. You may also choose to use such Covered
+        Code under the terms of any subsequent version of the License.
+      </para>
+
+      <para>
+        6.3. Derivative Works.
+      </para>
+
+      <para>
+        If You create or use a modified version of this License (which
+        you may only do in order to apply it to code which is not
+        already Covered Code governed by this License), You must (a)
+        rename Your license so that the phrase "gSOAP" or any
+        confusingly similar phrase do not appear in your license (except
+        to note that your license differs from this License) and (b)
+        otherwise make it clear that Your version of the license
+        contains terms which differ from the gSOAP Public License.
+        (Filling in the name of the Initial Developer, Original Code or
+        Contributor in the notice described in Exhibit A shall not of
+        themselves be deemed to be modifications of this License.)
+      </para>
+
+      <para>
+        7 DISCLAIMER OF WARRANTY.
+      </para>
+
+      <para>
+        COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+        WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED OR
+        STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
+        OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE,
+        NONINFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, AND
+        ANY WARRANTY THAT MAY ARISE BY REASON OF TRADE USAGE, CUSTOM, OR
+        COURSE OF DEALING. WITHOUT LIMITING THE FOREGOING, YOU
+        ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" AND THAT THE
+        AUTHORS DO NOT WARRANT THE SOFTWARE WILL RUN UNINTERRUPTED OR
+        ERROR FREE. LIMITED LIABILITY THE ENTIRE RISK AS TO RESULTS AND
+        PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. UNDER NO
+        CIRCUMSTANCES WILL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
+        INDIRECT, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES OF ANY
+        KIND OR NATURE WHATSOEVER, WHETHER BASED ON CONTRACT, WARRANTY,
+        TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE,
+        ARISING OUT OF OR IN ANY WAY RELATED TO THE SOFTWARE, EVEN IF
+        THE AUTHORS HAVE BEEN ADVISED ON THE POSSIBILITY OF SUCH DAMAGE
+        OR IF SUCH DAMAGE COULD HAVE BEEN REASONABLY FORESEEN, AND
+        NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY
+        EXCLUSIVE REMEDY PROVIDED. SUCH LIMITATION ON DAMAGES INCLUDES,
+        BUT IS NOT LIMITED TO, DAMAGES FOR LOSS OF GOODWILL, LOST
+        PROFITS, LOSS OF DATA OR SOFTWARE, WORK STOPPAGE, COMPUTER
+        FAILURE OR MALFUNCTION OR IMPAIRMENT OF OTHER GOODS. IN NO EVENT
+        WILL THE AUTHORS BE LIABLE FOR THE COSTS OF PROCUREMENT OF
+        SUBSTITUTE SOFTWARE OR SERVICES. YOU ACKNOWLEDGE THAT THIS
+        SOFTWARE IS NOT DESIGNED FOR USE IN ON-LINE EQUIPMENT IN
+        HAZARDOUS ENVIRONMENTS SUCH AS OPERATION OF NUCLEAR FACILITIES,
+        AIRCRAFT NAVIGATION OR CONTROL, OR LIFE-CRITICAL APPLICATIONS.
+        THE AUTHORS EXPRESSLY DISCLAIM ANY LIABILITY RESULTING FROM USE
+        OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS
+        ENVIRONMENTS AND ACCEPTS NO LIABILITY IN RESPECT OF ANY ACTIONS
+        OR CLAIMS BASED ON THE USE OF THE SOFTWARE IN ANY SUCH ON-LINE
+        EQUIPMENT IN HAZARDOUS ENVIRONMENTS BY YOU. FOR PURPOSES OF THIS
+        PARAGRAPH, THE TERM "LIFE-CRITICAL APPLICATION" MEANS AN
+        APPLICATION IN WHICH THE FUNCTIONING OR MALFUNCTIONING OF THE
+        SOFTWARE MAY RESULT DIRECTLY OR INDIRECTLY IN PHYSICAL INJURY OR
+        LOSS OF HUMAN LIFE. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
+        ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS
+        AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+      </para>
+
+      <para>
+        8 TERMINATION.
+      </para>
+
+      <para>
+        8.1.
+      </para>
+
+      <para>
+        This License and the rights granted hereunder will terminate
+        automatically if You fail to comply with terms herein and fail
+        to cure such breach within 30 days of becoming aware of the
+        breach. All sublicenses to the Covered Code which are properly
+        granted shall survive any termination of this License.
+        Provisions which, by their nature, must remain in effect beyond
+        the termination of this License shall survive.
+      </para>
+
+      <para>
+        8.2.
+      </para>
+
+      <para>
+        8.3.
+      </para>
+
+      <para>
+        If You assert a patent infringement claim against Participant
+        alleging that such Participant's Contributor Version directly or
+        indirectly infringes any patent where such claim is resolved
+        (such as by license or settlement) prior to the initiation of
+        patent infringement litigation, then the reasonable value of the
+        licenses granted by such Participant under Sections 2.1 or 2.2
+        shall be taken into account in determining the amount or value
+        of any payment or license.
+      </para>
+
+      <para>
+        8.4. In the event of termination under Sections 8.1 or 8.2
+        above, all end user license agreements (excluding distributors
+        and resellers) which have been validly granted by You or any
+        distributor hereunder prior to termination shall survive
+        termination.
+      </para>
+
+      <para>
+        9 LIMITATION OF LIABILITY.
+      </para>
+
+      <para>
+        UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+        (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+        INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+        COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE
+        TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+        CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+        LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE,
+        COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+        DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED
+        OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY
+        SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+        RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE
+        LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW
+        THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL
+        DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+      </para>
+
+      <para>
+        10 U.S. GOVERNMENT END USERS.
+      </para>
+
+      <para>
+        11 MISCELLANEOUS.
+      </para>
+
+      <para>
+        12 RESPONSIBILITY FOR CLAIMS.
+      </para>
+
+      <para>
+        As between Initial Developer and the Contributors, each party is
+        responsible for claims and damages arising, directly or
+        indirectly, out of its utilization of rights under this License
+        and You agree to work with Initial Developer and Contributors to
+        distribute such responsibility on an equitable basis. Nothing
+        herein is intended or shall be deemed to constitute any
+        admission of liability.
+      </para>
+
+      <para>
+        EXHIBIT A.
+      </para>
+
+      <para>
+        "The contents of this file are subject to the gSOAP Public
+        License Version 1.3 (the "License"); you may not use this file
+        except in compliance with the License. You may obtain a copy of
+        the License at
+        <ulink
+      url="http://www.cs.fsu.edu/~engelen/soaplicense.html">http://www.cs.fsu.edu/~engelen/soaplicense.html</ulink>.
+        Software distributed under the License is distributed on an "AS
+        IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+        implied. See the License for the specific language governing
+        rights and limitations under the License.
+      </para>
+
+      <para>
+        The Original Code of the gSOAP Software is: stdsoap.h,
+        stdsoap2.h, stdsoap.c, stdsoap2.c, stdsoap.cpp, stdsoap2.cpp,
+        soapcpp2.h, soapcpp2.c, soapcpp2_lex.l, soapcpp2_yacc.y,
+        error2.h, error2.c, symbol2.c, init2.c, soapdoc2.html, and
+        soapdoc2.pdf, httpget.h, httpget.c, stl.h, stldeque.h,
+        stllist.h, stlvector.h, stlset.h.
+      </para>
+
+      <para>
+        The Initial Developer of the Original Code is Robert A. van
+        Engelen. Portions created by Robert A. van Engelen are Copyright
+        (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights
+        Reserved.
+      </para>
+
+      <para>
+        Contributor(s): "________________________." [Note: The text of
+        this Exhibit A may differ slightly form the text of the notices
+        in the Source Code files of the Original code. You should use
+        the text of this Exhibit A rather than the text found in the
+        Original Code Source Code for Your Modifications.]
+      </para>
+
+      <para>
+        EXHIBIT B.
+      </para>
+
+      <para>
+        "Part of the software embedded in this product is gSOAP
+        software. Portions created by gSOAP are Copyright (C) 2001-2004
+        Robert A. van Engelen, Genivia inc. All Rights Reserved. THE
+        SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC AND
+        ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+        TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+        PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
+        BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+        EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+        TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+        ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE."
+      </para>
+
+    </sect2>
+
+    <sect2 id="licChromium">
+
+      <title>Chromium Licenses</title>
+
+      <sect3>
+
+        <title>Main License</title>
+
+        <para>
+          Copyright (c) 2002, Stanford University All rights reserved.
+        </para>
+
+        <para>
+          Some portions of Chromium are copyrighted by individiual
+          organizations. Please see the files COPYRIGHT.LLNL and
+          COPYRIGHT.REDHAT for more information.
+        </para>
+
+        <para>
+          Redistribution and use in source and binary forms, with or
+          without modification, are permitted provided that the
+          following conditions are met:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Redistributions of source code must retain the above
+              copyright notice, this list of conditions and the
+              following disclaimer.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Redistributions in binary form must reproduce the above
+              copyright notice, this list of conditions and the
+              following disclaimer in the documentation and/or other
+              materials provided with the distribution.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Neither the name of Stanford University nor the names of
+              its contributors may be used to endorse or promote
+              products derived from this software without specific prior
+              written permission.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+        <para>
+          THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+          CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+          INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+          MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+          DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+          CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+          SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+          NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+          LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+          HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+          CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+          OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+          EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+        </para>
+
       </sect3>
 
       <sect3>
+
+        <title>COPYRIGHT.LLNL File</title>
+
+        <para>
+          This Chromium distribution contains information and code which
+          is covered under the following notice:
+        </para>
+
+        <para>
+          Copyright (c) 2002, The Regents of the University of
+          California. Produced at the Lawrence Livermore National
+          Laboratory For details, contact: Randall Frank
+          (rjfrank@llnl.gov). UCRL-CODE-2002-058 All rights reserved.
+        </para>
+
+        <para>
+          This file is part of Chromium. For details, see accompanying
+          documentation.
+        </para>
+
+        <para>
+          Redistribution and use in source and binary forms, with or
+          without modification, are permitted provided that the
+          following conditions are met:
+        </para>
+
+        <para>
+          Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the disclaimer below.
+        </para>
+
+        <para>
+          Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the disclaimer
+          (as noted below) in the documentation and/or other materials
+          provided with the distribution.
+        </para>
+
+        <para>
+          Neither the name of the UC/LLNL nor the names of its
+          contributors may be used to endorse or promote products
+          derived from this software without specific prior written
+          permission.
+        </para>
+
+        <para>
+          THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+          CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+          INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+          MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+          DISCLAIMED. IN NO EVENT SHALL THE REGENTS OF THE UNIVERSITY OF
+          CALIFORNIA, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE
+          LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+          EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+          LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+          OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+          CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+          STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+          ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+          ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+        </para>
+
+        <para>
+          Additional BSD Notice
+        </para>
+
+        <para>
+          1. This notice is required to be provided under our contract
+          with the U.S. Department of Energy (DOE). This work was
+          produced at the University of California, Lawrence Livermore
+          National Laboratory under Contract No. W-7405-ENG-48 with the
+          DOE.
+        </para>
+
+        <para>
+          2. Neither the United States Government nor the University of
+          California nor any of their employees, makes any warranty,
+          express or implied, or assumes any liability or responsibility
+          for the accuracy, completeness, or usefulness of any
+          information, apparatus, product, or process disclosed, or
+          represents that its use would not infringe privately-owned
+          rights.
+        </para>
+
+        <para>
+          3. Also, reference herein to any specific commercial products,
+          process, or services by trade name, trademark, manufacturer or
+          otherwise does not necessarily constitute or imply its
+          endorsement, recommendation, or favoring by the United States
+          Government or the University of California. The views and
+          opinions of authors expressed herein do not necessarily state
+          or reflect those of the United States Government or the
+          University of California, and shall not be used for
+          advertising or product endorsement purposes.
+        </para>
+
+      </sect3>
+
+      <sect3>
+
         <title>COPYRIGHT.REDHAT File</title>
 
-        <para>This Chromium distribution contains information and code which
-        is covered under the following notice:</para>
-
-        <para>Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.</para>
-
-        <para>All Rights Reserved.</para>
-
-        <para>Permission is hereby granted, free of charge, to any person
-        obtaining a copy of this software and associated documentation files
-        (the "Software"), to deal in the Software without restriction,
-        including without limitation on the rights to use, copy, modify,
-        merge, publish, distribute, sublicense, and/or sell copies of the
-        Software, and to permit persons to whom the Software is furnished to
-        do so, subject to the following conditions:</para>
-
-        <para>The above copyright notice and this permission notice (including
-        the next paragraph) shall be included in all copies or substantial
-        portions of the Software.</para>
-
-        <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-        NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS BE
-        LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-        OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-        WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</para>
+        <para>
+          This Chromium distribution contains information and code which
+          is covered under the following notice:
+        </para>
+
+        <para>
+          Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
+        </para>
+
+        <para>
+          All Rights Reserved.
+        </para>
+
+        <para>
+          Permission is hereby granted, free of charge, to any person
+          obtaining a copy of this software and associated documentation
+          files (the "Software"), to deal in the Software without
+          restriction, including without limitation on the rights to
+          use, copy, modify, merge, publish, distribute, sublicense,
+          and/or sell copies of the Software, and to permit persons to
+          whom the Software is furnished to do so, subject to the
+          following conditions:
+        </para>
+
+        <para>
+          The above copyright notice and this permission notice
+          (including the next paragraph) shall be included in all copies
+          or substantial portions of the Software.
+        </para>
+
+        <para>
+          THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+          KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+          WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+          PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR
+          THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+          LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+          OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+          SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+        </para>
+
       </sect3>
+
     </sect2>
 
     <sect2 id="licLibCurl">
+
       <title>curl License</title>
 
-      <para>COPYRIGHT AND PERMISSION NOTICE</para>
-
-      <para>Copyright (c) 1996 - 2009, Daniel Stenberg, daniel@haxx.se.</para>
-
-      <para>All rights reserved.</para>
-
-      <para>Permission to use, copy, modify, and distribute this software for
-      any purpose with or without fee is hereby granted, provided that the
-      above copyright notice and this permission notice appear in all
-      copies.</para>
-
-      <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-      THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-      BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-      ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-      CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-      SOFTWARE.</para>
-
-      <para>Except as contained in this notice, the name of a copyright holder
-      shall not be used in advertising or otherwise to promote the sale, use
-      or other dealings in this Software without prior written authorization
-      of the copyright holder.</para>
+      <para>
+        COPYRIGHT AND PERMISSION NOTICE
+      </para>
+
+      <para>
+        Copyright (c) 1996 - 2009, Daniel Stenberg, daniel@haxx.se.
+      </para>
+
+      <para>
+        All rights reserved.
+      </para>
+
+      <para>
+        Permission to use, copy, modify, and distribute this software
+        for any purpose with or without fee is hereby granted, provided
+        that the above copyright notice and this permission notice
+        appear in all copies.
+      </para>
+
+      <para>
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+        OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+        NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+        OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+        OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+        SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+      </para>
+
+      <para>
+        Except as contained in this notice, the name of a copyright
+        holder shall not be used in advertising or otherwise to promote
+        the sale, use or other dealings in this Software without prior
+        written authorization of the copyright holder.
+      </para>
+
     </sect2>
 
     <sect2 id="licLibgd">
+
       <title>libgd License</title>
 
-      <para>Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-      2002 by Cold Spring Harbor Laboratory. Funded under Grant P41-RR02188 by
-      the National Institutes of Health.</para>
-
-      <para>Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 by
-      Boutell.Com, Inc.</para>
-
-      <para>Portions relating to GD2 format copyright 1999, 2000, 2001, 2002
-      Philip Warner.</para>
-
-      <para>Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg
-      Roelofs.</para>
-
-      <para>Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John
-      Ellson (ellson@lucent.com).</para>
-
-      <para>Portions relating to gdft.c copyright 2001, 2002 John Ellson
-      (ellson@lucent.com).</para>
-
-      <para>Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-      Pierre-Alain Joye (pierre@libgd.org).</para>
-
-      <para>Portions relating to JPEG and to color quantization copyright
-      2000, 2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997,
-      1998, 1999, 2000, 2001, 2002, Thomas G. Lane. This software is based in
-      part on the work of the Independent JPEG Group. See the file
-      README-JPEG.TXT for more information.</para>
-
-      <para>Portions relating to WBMP copyright 2000, 2001, 2002 Maurice
-      Szmurlo and Johan Van den Brande.</para>
-
-      <para>Permission has been granted to copy, distribute and modify gd in
-      any context without fee, including a commercial application, provided
-      that this notice is present in user-accessible supporting
-      documentation.</para>
-
-      <para>This does not affect your ownership of the derived work itself,
-      and the intent is to assure proper credit for the authors of gd, not to
-      interfere with your productive use of gd. If you have questions, ask.
-      "Derived works" includes all programs that utilize the library. Credit
-      must be given in user-accessible documentation.</para>
-
-      <para>This software is provided "AS IS." The copyright holders disclaim
-      all warranties, either express or implied, including but not limited to
-      implied warranties of merchantability and fitness for a particular
-      purpose, with respect to this code and accompanying
-      documentation.</para>
-
-      <para>Although their code does not appear in gd, the authors wish to
-      thank David Koblas, David Rowley, and Hutchison Avenue Software
-      Corporation for their prior contributions.</para>
+      <para>
+        Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+        2001, 2002 by Cold Spring Harbor Laboratory. Funded under Grant
+        P41-RR02188 by the National Institutes of Health.
+      </para>
+
+      <para>
+        Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 by
+        Boutell.Com, Inc.
+      </para>
+
+      <para>
+        Portions relating to GD2 format copyright 1999, 2000, 2001, 2002
+        Philip Warner.
+      </para>
+
+      <para>
+        Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg
+        Roelofs.
+      </para>
+
+      <para>
+        Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002
+        John Ellson (ellson@lucent.com).
+      </para>
+
+      <para>
+        Portions relating to gdft.c copyright 2001, 2002 John Ellson
+        (ellson@lucent.com).
+      </para>
+
+      <para>
+        Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+        2007 Pierre-Alain Joye (pierre@libgd.org).
+      </para>
+
+      <para>
+        Portions relating to JPEG and to color quantization copyright
+        2000, 2001, 2002, Doug Becker and copyright (C) 1994, 1995,
+        1996, 1997, 1998, 1999, 2000, 2001, 2002, Thomas G. Lane. This
+        software is based in part on the work of the Independent JPEG
+        Group. See the file README-JPEG.TXT for more information.
+      </para>
+
+      <para>
+        Portions relating to WBMP copyright 2000, 2001, 2002 Maurice
+        Szmurlo and Johan Van den Brande.
+      </para>
+
+      <para>
+        Permission has been granted to copy, distribute and modify gd in
+        any context without fee, including a commercial application,
+        provided that this notice is present in user-accessible
+        supporting documentation.
+      </para>
+
+      <para>
+        This does not affect your ownership of the derived work itself,
+        and the intent is to assure proper credit for the authors of gd,
+        not to interfere with your productive use of gd. If you have
+        questions, ask. "Derived works" includes all programs that
+        utilize the library. Credit must be given in user-accessible
+        documentation.
+      </para>
+
+      <para>
+        This software is provided "AS IS." The copyright holders
+        disclaim all warranties, either express or implied, including
+        but not limited to implied warranties of merchantability and
+        fitness for a particular purpose, with respect to this code and
+        accompanying documentation.
+      </para>
+
+      <para>
+        Although their code does not appear in gd, the authors wish to
+        thank David Koblas, David Rowley, and Hutchison Avenue Software
+        Corporation for their prior contributions.
+      </para>
+
     </sect2>
 
     <sect2 id="licBsdIntel">
+
       <title>BSD License from Intel</title>
 
-      <para>All rights reserved.</para>
-
-      <para>Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:</para>
+      <para>
+        All rights reserved.
+      </para>
+
+      <para>
+        Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the following
+        conditions are met:
+      </para>
+
       <itemizedlist>
+
         <listitem>
-          <para>Redistributions of source code must retain the above copyright
-            notice, this list of conditions and the following disclaimer.</para>
-        </listitem>
-        <listitem>
-          <para>Redistributions in binary form must reproduce the above copyright
-            notice, this list of conditions and the following disclaimer in the
-            documentation and/or other materials provided with the distribution.</para>
-        </listitem>
-        <listitem>
-          <para>Neither the name of the Intel Corporation nor the names of its
-            contributors may be used to endorse or promote products derived from
-            this software without specific prior written permission.</para>
-        </listitem>
-      </itemizedlist>
-      <para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-        "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-        TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-        PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-        BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-        CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-        GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-        HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-        OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-        DAMAGE.</para>
-    </sect2>
-
-    <sect2 id="licJPEG">
-      <title>libjpeg License</title>
-
-      <para>The authors make NO WARRANTY or representation, either express or implied,
-      with respect to this software, its quality, accuracy, merchantability, or
-      fitness for a particular purpose.  This software is provided "AS IS", and you,
-      its user, assume the entire risk as to its quality and accuracy.</para>
-
-      <para>This software is copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
-      All Rights Reserved except as specified below.</para>
-
-      <para>Permission is hereby granted to use, copy, modify, and distribute this
-      software (or portions thereof) for any purpose, without fee, subject to these
-      conditions:</para>
-      <para>(1) If any part of the source code for this software is distributed, then this
-      README file must be included, with this copyright and no-warranty notice
-      unaltered; and any additions, deletions, or changes to the original files
-      must be clearly indicated in accompanying documentation.</para>
-      <para>(2) If only executable code is distributed, then the accompanying
-      documentation must state that "this software is based in part on the work of
-      the Independent JPEG Group".</para>
-      <para>(3) Permission for use of this software is granted only if the user accepts
-      full responsibility for any undesirable consequences; the authors accept
-      NO LIABILITY for damages of any kind.</para>
-
-      <para>These conditions apply to any software derived from or based on the IJG code,
-      not just to the unmodified library.  If you use our work, you ought to
-      acknowledge us.</para>
-
-      <para>Permission is NOT granted for the use of any IJG author's name or company name
-      in advertising or publicity relating to this software or products derived from
-      it.  This software may be referred to only as "the Independent JPEG Group's
-      software".</para>
-
-      <para>We specifically permit and encourage the use of this software as the basis of
-      commercial products, provided that all warranty or liability claims are
-      assumed by the product vendor.</para>
-
-      <para>ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
-      sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
-      ansi2knr.c is NOT covered by the above copyright and conditions, but instead
-      by the usual distribution terms of the Free Software Foundation; principally,
-      that you must include source code if you redistribute it.  (See the file
-      ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
-      of any program generated from the IJG code, this does not limit you more than
-      the foregoing paragraphs do.</para>
-
-      <para>The Unix configuration script "configure" was produced with GNU Autoconf.
-      It is copyright by the Free Software Foundation but is freely distributable.
-      The same holds for its supporting scripts (config.guess, config.sub,
-      ltmain.sh).  Another support script, install-sh, is copyright by X Consortium
-      but is also freely distributable.</para>
-
-      <para>The IJG distribution formerly included code to read and write GIF files.
-      To avoid entanglement with the Unisys LZW patent, GIF reading support has
-      been removed altogether, and the GIF writer has been simplified to produce
-      "uncompressed GIFs".  This technique does not use the LZW algorithm; the
-      resulting GIF files are larger than usual, but are readable by all standard
-      GIF decoders.</para>
-
-      <para>We are required to state that</para>
-      <para>"The Graphics Interchange Format(c) is the Copyright property of
-      CompuServe Incorporated.  GIF(sm) is a Service Mark property of
-      CompuServe Incorporated."</para>
-    </sect2>
-
-    <sect2 id="licJPEGSIMD">
-      <title>x86 SIMD Extension for IJG JPEG Library License</title>
-
-      <para>Copyright 2009 Pierre Ossman &lt;ossman@cendio.se&gt; for Cendio AB</para>
-      <para>Copyright 2010 D. R. Commander</para>
-
-      <para>Based on</para>
-      <para>x86 SIMD extension for IJG JPEG library - version 1.02</para>
-
-      <para>Copyright (C) 1999-2006, MIYASAKA Masaru.</para>
-
-      <para>This software is provided 'as-is', without any express or implied
-      warranty.  In no event will the authors be held liable for any damages
-      arising from the use of this software.</para>
-
-      <para>Permission is granted to anyone to use this software for any purpose,
-      including commercial applications, and to alter it and redistribute it
-      freely, subject to the following restrictions:</para>
-
-      <para>1. The origin of this software must not be misrepresented; you must not
-         claim that you wrote the original software. If you use this software
-         in a product, an acknowledgment in the product documentation would be
-         appreciated but is not required.</para>
-      <para>2. Altered source versions must be plainly marked as such, and must not be
-         misrepresented as being the original software.</para>
-      <para>3. This notice may not be removed or altered from any source distribution.</para>
-    </sect2>
-
-    <sect2 id="licFreeBsd">
-      <title>FreeBSD License</title>
-
-      <para>The compilation of software known as FreeBSD is distributed under the
-        following terms:</para>
-
-      <para>Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved.</para>
-
-      <para>Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions
-        are met:</para>
-
-      <orderedlist>
-        <listitem>
-          <para>Redistributions of source code must retain the above copyright
-            notice, this list of conditions and the following disclaimer.
+          <para>
+            Redistributions of source code must retain the above
+            copyright notice, this list of conditions and the following
+            disclaimer.
           </para>
         </listitem>
+
         <listitem>
           <para>
-            Redistributions in binary form must reproduce the above copyright
-            notice, this list of conditions and the following disclaimer in the
-            documentation and/or other materials provided with the distribution.
+            Redistributions in binary form must reproduce the above
+            copyright notice, this list of conditions and the following
+            disclaimer in the documentation and/or other materials
+            provided with the distribution.
           </para>
         </listitem>
-      </orderedlist>
-
-      <para>THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-        ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-        ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-        OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-        HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-        OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-        SUCH DAMAGE.</para>
-    </sect2>
-
-    <sect2 id="licNetBsd">
-      <title>NetBSD License</title>
-
-      <para>Copyright (c) 1992, 1993 The Regents of the University of California.
-        All rights reserved.</para>
-
-      <para>
-        This software was developed by the Computer Systems Engineering group
-        at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
-        contributed to Berkeley.
-      </para>
-
-      <para>
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions
-        are met:
-      </para>
-
-      <orderedlist>
+
         <listitem>
           <para>
-            Redistributions of source code must retain the above copyright
-            notice, this list of conditions and the following disclaimer.
+            Neither the name of the Intel Corporation nor the names of
+            its contributors may be used to endorse or promote products
+            derived from this software without specific prior written
+            permission.
           </para>
         </listitem>
+
+      </itemizedlist>
+
+      <para>
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+        CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+        MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+        SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+        USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+        AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE.
+      </para>
+
+    </sect2>
+
+    <sect2 id="licJPEG">
+
+      <title>libjpeg License</title>
+
+      <para>
+        The authors make NO WARRANTY or representation, either express
+        or implied, with respect to this software, its quality,
+        accuracy, merchantability, or fitness for a particular purpose.
+        This software is provided "AS IS", and you, its user, assume the
+        entire risk as to its quality and accuracy.
+      </para>
+
+      <para>
+        This software is copyright (C) 1991-2010, Thomas G. Lane, Guido
+        Vollbeding. All Rights Reserved except as specified below.
+      </para>
+
+      <para>
+        Permission is hereby granted to use, copy, modify, and
+        distribute this software (or portions thereof) for any purpose,
+        without fee, subject to these conditions:
+      </para>
+
+      <para>
+        (1) If any part of the source code for this software is
+        distributed, then this README file must be included, with this
+        copyright and no-warranty notice unaltered; and any additions,
+        deletions, or changes to the original files must be clearly
+        indicated in accompanying documentation.
+      </para>
+
+      <para>
+        (2) If only executable code is distributed, then the
+        accompanying documentation must state that "this software is
+        based in part on the work of the Independent JPEG Group".
+      </para>
+
+      <para>
+        (3) Permission for use of this software is granted only if the
+        user accepts full responsibility for any undesirable
+        consequences; the authors accept NO LIABILITY for damages of any
+        kind.
+      </para>
+
+      <para>
+        These conditions apply to any software derived from or based on
+        the IJG code, not just to the unmodified library. If you use our
+        work, you ought to acknowledge us.
+      </para>
+
+      <para>
+        Permission is NOT granted for the use of any IJG author's name
+        or company name in advertising or publicity relating to this
+        software or products derived from it. This software may be
+        referred to only as "the Independent JPEG Group's software".
+      </para>
+
+      <para>
+        We specifically permit and encourage the use of this software as
+        the basis of commercial products, provided that all warranty or
+        liability claims are assumed by the product vendor.
+      </para>
+
+      <para>
+        ansi2knr.c is included in this distribution by permission of L.
+        Peter Deutsch, sole proprietor of its copyright holder, Aladdin
+        Enterprises of Menlo Park, CA. ansi2knr.c is NOT covered by the
+        above copyright and conditions, but instead by the usual
+        distribution terms of the Free Software Foundation; principally,
+        that you must include source code if you redistribute it. (See
+        the file ansi2knr.c for full details.) However, since ansi2knr.c
+        is not needed as part of any program generated from the IJG
+        code, this does not limit you more than the foregoing paragraphs
+        do.
+      </para>
+
+      <para>
+        The Unix configuration script "configure" was produced with GNU
+        Autoconf. It is copyright by the Free Software Foundation but is
+        freely distributable. The same holds for its supporting scripts
+        (config.guess, config.sub, ltmain.sh). Another support script,
+        install-sh, is copyright by X Consortium but is also freely
+        distributable.
+      </para>
+
+      <para>
+        The IJG distribution formerly included code to read and write
+        GIF files. To avoid entanglement with the Unisys LZW patent, GIF
+        reading support has been removed altogether, and the GIF writer
+        has been simplified to produce "uncompressed GIFs". This
+        technique does not use the LZW algorithm; the resulting GIF
+        files are larger than usual, but are readable by all standard
+        GIF decoders.
+      </para>
+
+      <para>
+        We are required to state that
+      </para>
+
+      <para>
+        "The Graphics Interchange Format(c) is the Copyright property of
+        CompuServe Incorporated. GIF(sm) is a Service Mark property of
+        CompuServe Incorporated."
+      </para>
+
+    </sect2>
+
+    <sect2 id="licJPEGSIMD">
+
+      <title>x86 SIMD Extension for IJG JPEG Library License</title>
+
+      <para>
+        Copyright 2009 Pierre Ossman &lt;ossman@cendio.se&gt; for Cendio
+        AB
+      </para>
+
+      <para>
+        Copyright 2010 D. R. Commander
+      </para>
+
+      <para>
+        Based on
+      </para>
+
+      <para>
+        x86 SIMD extension for IJG JPEG library - version 1.02
+      </para>
+
+      <para>
+        Copyright (C) 1999-2006, MIYASAKA Masaru.
+      </para>
+
+      <para>
+        This software is provided 'as-is', without any express or
+        implied warranty. In no event will the authors be held liable
+        for any damages arising from the use of this software.
+      </para>
+
+      <para>
+        Permission is granted to anyone to use this software for any
+        purpose, including commercial applications, and to alter it and
+        redistribute it freely, subject to the following restrictions:
+      </para>
+
+      <para>
+        1. The origin of this software must not be misrepresented; you
+        must not claim that you wrote the original software. If you use
+        this software in a product, an acknowledgment in the product
+        documentation would be appreciated but is not required.
+      </para>
+
+      <para>
+        2. Altered source versions must be plainly marked as such, and
+        must not be misrepresented as being the original software.
+      </para>
+
+      <para>
+        3. This notice may not be removed or altered from any source
+        distribution.
+      </para>
+
+    </sect2>
+
+    <sect2 id="licFreeBsd">
+
+      <title>FreeBSD License</title>
+
+      <para>
+        The compilation of software known as FreeBSD is distributed
+        under the following terms:
+      </para>
+
+      <para>
+        Copyright (c) 1992-2009 The FreeBSD Project. All rights
+        reserved.
+      </para>
+
+      <para>
+        Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the following
+        conditions are met:
+      </para>
+
+      <orderedlist>
+
         <listitem>
           <para>
-            Redistributions in binary form must reproduce the above copyright
-            notice, this list of conditions and the following disclaimer in the
-            documentation and/or other materials provided with the distribution.
+            Redistributions of source code must retain the above
+            copyright notice, this list of conditions and the following
+            disclaimer.
           </para>
         </listitem>
+
         <listitem>
           <para>
-            Neither the name of the University nor the names of its contributors
-            may be used to endorse or promote products derived from this software
-            without specific prior written permission.
+            Redistributions in binary form must reproduce the above
+            copyright notice, this list of conditions and the following
+            disclaimer in the documentation and/or other materials
+            provided with the distribution.
           </para>
         </listitem>
+
       </orderedlist>
 
       <para>
-        THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-        ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-        ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-        OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-        HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-        OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+        THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS
+        IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+        LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+        FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+        SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+        INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+        BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+        LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+        THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
         SUCH DAMAGE.
       </para>
+
     </sect2>
 
-    <sect2 id="licPcre">
-      <title>PCRE License</title>
-
-      <para>
-        PCRE is a library of functions to support regular expressions whose syntax
-        and semantics are as close as possible to those of the Perl 5 language.
-      </para><para>
-        Release 8 of PCRE is distributed under the terms of the "BSD" licence, as
-        specified below. The documentation for PCRE, supplied in the "doc"
-        directory, is distributed under the same terms as the software itself.
-      </para><para>
-        The basic library functions are written in C and are freestanding. Also
-        included in the distribution is a set of C++ wrapper functions, and a
-        just-in-time compiler that can be used to optimize pattern matching. These
-        are both optional features that can be omitted when the library is built.
-      </para><para>
-        THE BASIC LIBRARY FUNCTIONS.
-        Written by: Philip Hazel; Email local part: ph10; Email domain: cam.ac.uk
-        University of Cambridge Computing Service, Cambridge, England.
-        Copyright (c) 1997-2012 University of Cambridge
-        All rights reserved.
-      </para><para>
-        PCRE JUST-IN-TIME COMPILATION SUPPORT.
-        Written by: Zoltan Herczeg; Email local part: hzmester; Emain domain: freemail.hu
-        Copyright(c) 2010-2012 Zoltan Herczeg
-        All rights reserved.
-      </para><para>
-        STACK-LESS JUST-IN-TIME COMPILER.
-        Written by: Zoltan Herczeg; Email local part: hzmester; Emain domain: freemail.hu
-        Copyright(c) 2009-2012 Zoltan Herczeg
-        All rights reserved.
-      </para><para>
-        THE C++ WRAPPER FUNCTIONS.
-        Contributed by:   Google Inc.
-        Copyright (c) 2007-2012, Google Inc.
-        All rights reserved.
-      </para><para>
-        THE "BSD" LICENCE.
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-      </para>
-      <itemizedlist>
+    <sect2 id="licNetBsd">
+
+      <title>NetBSD License</title>
+
+      <para>
+        Copyright (c) 1992, 1993 The Regents of the University of
+        California. All rights reserved.
+      </para>
+
+      <para>
+        This software was developed by the Computer Systems Engineering
+        group at Lawrence Berkeley Laboratory under DARPA contract BG
+        91-66 and contributed to Berkeley.
+      </para>
+
+      <para>
+        Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the following
+        conditions are met:
+      </para>
+
+      <orderedlist>
+
         <listitem>
           <para>
-            Redistributions of source code must retain the above copyright notice,
-            this list of conditions and the following disclaimer.
+            Redistributions of source code must retain the above
+            copyright notice, this list of conditions and the following
+            disclaimer.
           </para>
         </listitem>
+
         <listitem>
           <para>
-            Redistributions in binary form must reproduce the above copyright
-            notice, this list of conditions and the following disclaimer in the
-            documentation and/or other materials provided with the distribution.
+            Redistributions in binary form must reproduce the above
+            copyright notice, this list of conditions and the following
+            disclaimer in the documentation and/or other materials
+            provided with the distribution.
           </para>
         </listitem>
+
         <listitem>
           <para>
-            Neither the name of the University of Cambridge nor the name of Google
-            Inc. nor the names of their contributors may be used to endorse or
-            promote products derived from this software without specific prior
-            written permission.
+            Neither the name of the University nor the names of its
+            contributors may be used to endorse or promote products
+            derived from this software without specific prior written
+            permission.
           </para>
         </listitem>
+
+      </orderedlist>
+
+      <para>
+        THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS
+        IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+        LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+        FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+        SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+        INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+        BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+        LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+        THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+        SUCH DAMAGE.
+      </para>
+
+    </sect2>
+
+    <sect2 id="licPcre">
+
+      <title>PCRE License</title>
+
+      <para>
+        PCRE is a library of functions to support regular expressions
+        whose syntax and semantics are as close as possible to those of
+        the Perl 5 language.
+      </para>
+
+      <para>
+        Release 8 of PCRE is distributed under the terms of the "BSD"
+        licence, as specified below. The documentation for PCRE,
+        supplied in the "doc" directory, is distributed under the same
+        terms as the software itself.
+      </para>
+
+      <para>
+        The basic library functions are written in C and are
+        freestanding. Also included in the distribution is a set of C++
+        wrapper functions, and a just-in-time compiler that can be used
+        to optimize pattern matching. These are both optional features
+        that can be omitted when the library is built.
+      </para>
+
+      <para>
+        THE BASIC LIBRARY FUNCTIONS. Written by: Philip Hazel; Email
+        local part: ph10; Email domain: cam.ac.uk University of
+        Cambridge Computing Service, Cambridge, England. Copyright (c)
+        1997-2012 University of Cambridge All rights reserved.
+      </para>
+
+      <para>
+        PCRE JUST-IN-TIME COMPILATION SUPPORT. Written by: Zoltan
+        Herczeg; Email local part: hzmester; Emain domain: freemail.hu
+        Copyright(c) 2010-2012 Zoltan Herczeg All rights reserved.
+      </para>
+
+      <para>
+        STACK-LESS JUST-IN-TIME COMPILER. Written by: Zoltan Herczeg;
+        Email local part: hzmester; Emain domain: freemail.hu
+        Copyright(c) 2009-2012 Zoltan Herczeg All rights reserved.
+      </para>
+
+      <para>
+        THE C++ WRAPPER FUNCTIONS. Contributed by: Google Inc. Copyright
+        (c) 2007-2012, Google Inc. All rights reserved.
+      </para>
+
+      <para>
+        THE "BSD" LICENCE. Redistribution and use in source and binary
+        forms, with or without modification, are permitted provided that
+        the following conditions are met:
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            Redistributions of source code must retain the above
+            copyright notice, this list of conditions and the following
+            disclaimer.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Redistributions in binary form must reproduce the above
+            copyright notice, this list of conditions and the following
+            disclaimer in the documentation and/or other materials
+            provided with the distribution.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Neither the name of the University of Cambridge nor the name
+            of Google Inc. nor the names of their contributors may be
+            used to endorse or promote products derived from this
+            software without specific prior written permission.
+          </para>
+        </listitem>
+
       </itemizedlist>
-      <para>
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-        ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-        LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-        CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-        INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-        POSSIBILITY OF SUCH DAMAGE.
-      </para>
+
+      <para>
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+        CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+        MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+        SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+        USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+        AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE.
+      </para>
+
     </sect2>
 
     <sect2 id="licLibffi">
+
       <title>libffi License</title>
 
       <para>
-        Copyright (c) 1996-2012  Anthony Green, Red Hat, Inc and others.
+        Copyright (c) 1996-2012 Anthony Green, Red Hat, Inc and others.
         See source files for details.
-      </para><para>
-        Permission is hereby granted, free of charge, to any person obtaining
-        a copy of this software and associated documentation files (the
-        ``Software''), to deal in the Software without restriction, including
-        without limitation the rights to use, copy, modify, merge, publish,
-        distribute, sublicense, and/or sell copies of the Software, and to
-        permit persons to whom the Software is furnished to do so, subject to
-        the following conditions:
-      </para><para>
+      </para>
+
+      <para>
+        Permission is hereby granted, free of charge, to any person
+        obtaining a copy of this software and associated documentation
+        files (the ``Software''), to deal in the Software without
+        restriction, including without limitation the rights to use,
+        copy, modify, merge, publish, distribute, sublicense, and/or
+        sell copies of the Software, and to permit persons to whom the
+        Software is furnished to do so, subject to the following
+        conditions:
+      </para>
+
+      <para>
         The above copyright notice and this permission notice shall be
         included in all copies or substantial portions of the Software.
-      </para><para>
-        THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-        IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-        CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-        TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-        SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-      </para>
+      </para>
+
+      <para>
+        THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY
+        KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+        WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+        AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+        HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+        WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+        OTHER DEALINGS IN THE SOFTWARE.
+      </para>
+
     </sect2>
 
     <sect2 id="licFltk">
+
       <title>FLTK License</title>
 
       <para>
         December 11, 2001
-      </para><para>
-        The FLTK library and included programs are provided under the terms
-        of the GNU Library General Public License (LGPL) with the following
-        exceptions:
-      </para>
+      </para>
+
+      <para>
+        The FLTK library and included programs are provided under the
+        terms of the GNU Library General Public License (LGPL) with the
+        following exceptions:
+      </para>
+
       <orderedlist>
+
         <listitem>
           <para>
-            Modifications to the FLTK configure script, config
-            header file, and makefiles by themselves to support
-            a specific platform do not constitute a modified or
-            derivative work.
+            Modifications to the FLTK configure script, config header
+            file, and makefiles by themselves to support a specific
+            platform do not constitute a modified or derivative work.
           </para>
+
           <para>
             The authors do request that such modifications be
             contributed to the FLTK project - send all contributions
             through the "Software Trouble Report" on the following page:
-           </para><para>
+          </para>
+
+          <para>
             http://www.fltk.org/str.php
           </para>
         </listitem>
+
         <listitem>
           <para>
@@ -2948,422 +4215,525 @@
           </para>
         </listitem>
+
         <listitem>
           <para>
-            Static linking of applications and widgets to the
-            FLTK library does not constitute a derivative work
-            and does not require the author to provide source
-            code for the application or widget, use the shared
-            FLTK libraries, or link their applications or
-            widgets against a user-supplied version of FLTK.
+            Static linking of applications and widgets to the FLTK
+            library does not constitute a derivative work and does not
+            require the author to provide source code for the
+            application or widget, use the shared FLTK libraries, or
+            link their applications or widgets against a user-supplied
+            version of FLTK.
           </para>
+
           <para>
-            If you link the application or widget to a modified
-            version of FLTK, then the changes to FLTK must be
-            provided under the terms of the LGPL in sections
-            1, 2, and 4.
+            If you link the application or widget to a modified version
+            of FLTK, then the changes to FLTK must be provided under the
+            terms of the LGPL in sections 1, 2, and 4.
           </para>
         </listitem>
+
         <listitem>
           <para>
-            You do not have to provide a copy of the FLTK license
-            with programs that are linked to the FLTK library, nor
-            do you have to identify the FLTK license in your
-            program or documentation as required by section 6
-            of the LGPL.
+            You do not have to provide a copy of the FLTK license with
+            programs that are linked to the FLTK library, nor do you
+            have to identify the FLTK license in your program or
+            documentation as required by section 6 of the LGPL.
           </para>
+
           <para>
-            However, programs must still identify their use of FLTK.
-            The following example statement can be included in user
+            However, programs must still identify their use of FLTK. The
+            following example statement can be included in user
             documentation to satisfy this requirement:
           </para>
+
           <para>
-            [program/widget] is based in part on the work of
-            the FLTK project (http://www.fltk.org).
+            [program/widget] is based in part on the work of the FLTK
+            project (http://www.fltk.org).
           </para>
         </listitem>
+
       </orderedlist>
+
     </sect2>
 
     <sect2 id="licExpat">
+
       <title>Expat License</title>
-      <para>
-        Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-        and Clark Cooper
-      </para>
-      <para>
-        Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
-      </para>
-      <para>
-        Permission is hereby granted, free of charge, to any person obtaining
-        a copy of this software and associated documentation files (the
-        "Software"), to deal in the Software without restriction, including
-        without limitation the rights to use, copy, modify, merge, publish,
-        distribute, sublicense, and/or sell copies of the Software, and to
-        permit persons to whom the Software is furnished to do so, subject to
-        the following conditions:
-      </para>
-      <para>
-        The above copyright notice and this permission notice shall be included
-        in all copies or substantial portions of the Software.
-      </para>
+
+      <para>
+        Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center
+        Ltd and Clark Cooper
+      </para>
+
+      <para>
+        Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat
+        maintainers.
+      </para>
+
+      <para>
+        Permission is hereby granted, free of charge, to any person
+        obtaining a copy of this software and associated documentation
+        files (the "Software"), to deal in the Software without
+        restriction, including without limitation the rights to use,
+        copy, modify, merge, publish, distribute, sublicense, and/or
+        sell copies of the Software, and to permit persons to whom the
+        Software is furnished to do so, subject to the following
+        conditions:
+      </para>
+
+      <para>
+        The above copyright notice and this permission notice shall be
+        included in all copies or substantial portions of the Software.
+      </para>
+
       <para>
         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-        IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-        CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-        TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-        SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-      </para>
+        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+        OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+        NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+        HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+        WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+        OTHER DEALINGS IN THE SOFTWARE.
+      </para>
+
     </sect2>
 
     <sect2 id="licFontconfig">
+
       <title>Fontconfig License</title>
+
       <para>
         Copyright (C) 2001, 2003 Keith Packard
       </para>
-      <para>
-        Permission to use, copy, modify, distribute, and sell this software and its
-        documentation for any purpose is hereby granted without fee, provided that
-        the above copyright notice appear in all copies and that both that
-        copyright notice and this permission notice appear in supporting
-        documentation, and that the name of the author(s) not be used in
-        advertising or publicity pertaining to distribution of the software without
-        specific, written prior permission.  The authors make no
-        representations about the suitability of this software for any purpose.  It
-        is provided "as is" without express or implied warranty.
-      </para>
-      <para>
-        THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-        INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-        EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-        CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-        DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-        TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-        PERFORMANCE OF THIS SOFTWARE.
-      </para>
+
+      <para>
+        Permission to use, copy, modify, distribute, and sell this
+        software and its documentation for any purpose is hereby granted
+        without fee, provided that the above copyright notice appear in
+        all copies and that both that copyright notice and this
+        permission notice appear in supporting documentation, and that
+        the name of the author(s) not be used in advertising or
+        publicity pertaining to distribution of the software without
+        specific, written prior permission. The authors make no
+        representations about the suitability of this software for any
+        purpose. It is provided "as is" without express or implied
+        warranty.
+      </para>
+
+      <para>
+        THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+        SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+        AND FITNESS, IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY
+        SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+        WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+        IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+        ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+        THIS SOFTWARE.
+      </para>
+
     </sect2>
 
     <sect2 id="licFreetype">
+
       <title>Freetype License</title>
+
       <para>
         2006-Jan-27
       </para>
-      <para>
-        Copyright 1996-2002, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg
-      </para>
+
+      <para>
+        Copyright 1996-2002, 2006 by David Turner, Robert Wilhelm, and
+        Werner Lemberg
+      </para>
+
       <sect3>
+
         <title>Introduction</title>
-        <para>
-          The FreeType  Project is distributed in  several archive packages;
-          some of them may contain, in addition to the FreeType font engine,
-          various tools and  contributions which rely on, or  relate to, the
-          FreeType Project.
-        </para>
-        <para>
-          This  license applies  to all  files found  in such  packages, and
-          which do not  fall under their own explicit  license.  The license
-          affects  thus  the  FreeType   font  engine,  the  test  programs,
-          documentation and makefiles, at the very least.
-        </para>
-        <para>
-          This  license   was  inspired  by  the  BSD,   Artistic,  and  IJG
-          (Independent JPEG  Group) licenses, which  all encourage inclusion
-          and  use of  free  software in  commercial  and freeware  products
-          alike.  As a consequence, its main points are that:
-        </para>
+
+        <para>
+          The FreeType Project is distributed in several archive
+          packages; some of them may contain, in addition to the
+          FreeType font engine, various tools and contributions which
+          rely on, or relate to, the FreeType Project.
+        </para>
+
+        <para>
+          This license applies to all files found in such packages, and
+          which do not fall under their own explicit license. The
+          license affects thus the FreeType font engine, the test
+          programs, documentation and makefiles, at the very least.
+        </para>
+
+        <para>
+          This license was inspired by the BSD, Artistic, and IJG
+          (Independent JPEG Group) licenses, which all encourage
+          inclusion and use of free software in commercial and freeware
+          products alike. As a consequence, its main points are that:
+        </para>
+
         <itemizedlist>
+
           <listitem>
             <para>
-              We don't promise that this software works. However, we will be
-              interested in any kind of bug reports. (`as is' distribution)
+              We don't promise that this software works. However, we
+              will be interested in any kind of bug reports. (`as is'
+              distribution)
             </para>
           </listitem>
+
           <listitem>
             <para>
-              You can  use this software for whatever you  want, in parts or
-              full form, without having to pay us. (`royalty-free' usage)
+              You can use this software for whatever you want, in parts
+              or full form, without having to pay us. (`royalty-free'
+              usage)
             </para>
           </listitem>
+
           <listitem>
             <para>
-              You may not pretend that  you wrote this software.  If you use
-              it, or  only parts of it,  in a program,  you must acknowledge
-              somewhere  in  your  documentation  that  you  have  used  the
-              FreeType code. (`credits')
+              You may not pretend that you wrote this software. If you
+              use it, or only parts of it, in a program, you must
+              acknowledge somewhere in your documentation that you have
+              used the FreeType code. (`credits')
             </para>
           </listitem>
+
         </itemizedlist>
-        <para>
-          We  specifically  permit  and  encourage  the  inclusion  of  this
-          software, with  or without modifications,  in commercial products.
-          We  disclaim  all warranties  covering  The  FreeType Project  and
-          assume no liability related to The FreeType Project.
-        </para>
-        <para>
-          Finally,  many  people  asked  us  for  a  preferred  form  for  a
-          credit/disclaimer to use in compliance with this license.  We thus
-          encourage you to use the following text:
-        </para>
-        <para>
-          Portions of this software are copyright (C) &lt;year&gt; The FreeType
-          Project (www.freetype.org).  All rights reserved.
-        </para>
-        <para>
-          Please replace &lt;year&gt; with the value from the FreeType version you
-          actually use.
-        </para>
+
+        <para>
+          We specifically permit and encourage the inclusion of this
+          software, with or without modifications, in commercial
+          products. We disclaim all warranties covering The FreeType
+          Project and assume no liability related to The FreeType
+          Project.
+        </para>
+
+        <para>
+          Finally, many people asked us for a preferred form for a
+          credit/disclaimer to use in compliance with this license. We
+          thus encourage you to use the following text:
+        </para>
+
+        <para>
+          Portions of this software are copyright (C) &lt;year&gt; The
+          FreeType Project (www.freetype.org). All rights reserved.
+        </para>
+
+        <para>
+          Please replace &lt;year&gt; with the value from the FreeType
+          version you actually use.
+        </para>
+
       </sect3>
+
       <sect3>
+
         <title>Legal Terms</title>
 
-          <para>0. Definitions</para>
-          <para>
-            Throughout this license,  the terms `package', `FreeType Project',
-            and  `FreeType  archive' refer  to  the  set  of files  originally
-            distributed  by the  authors  (David Turner,  Robert Wilhelm,  and
-            Werner Lemberg) as the `FreeType Project', be they named as alpha,
-            beta or final release.
-          </para>
-          <para>
-            `You' refers to  the licensee, or person using  the project, where
-            `using' is a generic term including compiling the project's source
-            code as  well as linking it  to form a  `program' or `executable'.
-            This  program is  referred to  as  `a program  using the  FreeType
-            engine'.
-          </para>
-          <para>
-            This  license applies  to all  files distributed  in  the original
-            FreeType  Project,   including  all  source   code,  binaries  and
-            documentation,  unless  otherwise  stated   in  the  file  in  its
-            original, unmodified form as  distributed in the original archive.
-            If you are  unsure whether or not a particular  file is covered by
-            this license, you must contact us to verify this.
-          </para>
-          <para>
-            The FreeType  Project is copyright (C) 1996-2000  by David Turner,
-            Robert Wilhelm, and Werner Lemberg.  All rights reserved except as
-            specified below.
-          </para>
-
-
-          <para>1. No Warranty</para>
-          <para>
-            THE FREETYPE PROJECT  IS PROVIDED `AS IS' WITHOUT  WARRANTY OF ANY
-            KIND, EITHER  EXPRESS OR IMPLIED,  INCLUDING, BUT NOT  LIMITED TO,
-            WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR
-            PURPOSE.  IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
-            BE LIABLE  FOR ANY DAMAGES CAUSED  BY THE USE OR  THE INABILITY TO
-            USE, OF THE FREETYPE PROJECT.
-          </para>
-
-
-          <para>2. Redistribution</para>
-          <para>
-            This  license  grants  a  worldwide, royalty-free,  perpetual  and
-            irrevocable right  and license to use,  execute, perform, compile,
-            display,  copy,   create  derivative  works   of,  distribute  and
-            sublicense the  FreeType Project (in  both source and  object code
-            forms)  and  derivative works  thereof  for  any  purpose; and  to
-            authorize others  to exercise  some or all  of the  rights granted
-            herein, subject to the following conditions:
-          </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-              Redistribution of  source code  must retain this  license file
-              (`FTL.TXT') unaltered; any  additions, deletions or changes to
-              the original  files must be clearly  indicated in accompanying
-              documentation.   The  copyright   notices  of  the  unaltered,
-              original  files must  be  preserved in  all  copies of  source
-              files.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-              Redistribution in binary form must provide a  disclaimer  that
-              states  that  the software is based in part of the work of the
-              FreeType Team,  in  the  distribution  documentation.  We also
-              encourage you to put an URL to the FreeType web page  in  your
-              documentation, though this isn't mandatory.
-              </para>
-            </listitem>
-          </itemizedlist>
-          <para>
-            These conditions  apply to any  software derived from or  based on
-            the FreeType Project,  not just the unmodified files.   If you use
-            our work, you  must acknowledge us.  However, no  fee need be paid
-            to us.
-          </para>
-
-
-           <para>3. Advertising</para>
-           <para>
-            Neither the  FreeType authors and  contributors nor you  shall use
-            the name of the  other for commercial, advertising, or promotional
-            purposes without specific prior written permission.
+        <para>
+          0. Definitions
+        </para>
+
+        <para>
+          Throughout this license, the terms `package', `FreeType
+          Project', and `FreeType archive' refer to the set of files
+          originally distributed by the authors (David Turner, Robert
+          Wilhelm, and Werner Lemberg) as the `FreeType Project', be
+          they named as alpha, beta or final release.
+        </para>
+
+        <para>
+          `You' refers to the licensee, or person using the project,
+          where `using' is a generic term including compiling the
+          project's source code as well as linking it to form a
+          `program' or `executable'. This program is referred to as `a
+          program using the FreeType engine'.
+        </para>
+
+        <para>
+          This license applies to all files distributed in the original
+          FreeType Project, including all source code, binaries and
+          documentation, unless otherwise stated in the file in its
+          original, unmodified form as distributed in the original
+          archive. If you are unsure whether or not a particular file is
+          covered by this license, you must contact us to verify this.
+        </para>
+
+        <para>
+          The FreeType Project is copyright (C) 1996-2000 by David
+          Turner, Robert Wilhelm, and Werner Lemberg. All rights
+          reserved except as specified below.
+        </para>
+
+        <para>
+          1. No Warranty
+        </para>
+
+        <para>
+          THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF
+          ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT
+          LIMITED TO, WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+          PARTICULAR PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR
+          COPYRIGHT HOLDERS BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE
+          OR THE INABILITY TO USE, OF THE FREETYPE PROJECT.
+        </para>
+
+        <para>
+          2. Redistribution
+        </para>
+
+        <para>
+          This license grants a worldwide, royalty-free, perpetual and
+          irrevocable right and license to use, execute, perform,
+          compile, display, copy, create derivative works of, distribute
+          and sublicense the FreeType Project (in both source and object
+          code forms) and derivative works thereof for any purpose; and
+          to authorize others to exercise some or all of the rights
+          granted herein, subject to the following conditions:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Redistribution of source code must retain this license
+              file (`FTL.TXT') unaltered; any additions, deletions or
+              changes to the original files must be clearly indicated in
+              accompanying documentation. The copyright notices of the
+              unaltered, original files must be preserved in all copies
+              of source files.
             </para>
-          <para>
-            We suggest,  but do not require, that  you use one or  more of the
-            following phrases to refer  to this software in your documentation
-            or advertising  materials: `FreeType Project',  `FreeType Engine',
-            `FreeType library', or `FreeType Distribution'.
-          </para>
-          <para>
-            As  you have  not signed  this license,  you are  not  required to
-            accept  it.   However,  as  the FreeType  Project  is  copyrighted
-            material, only  this license, or  another one contracted  with the
-            authors, grants you  the right to use, distribute,  and modify it.
-            Therefore,  by  using,  distributing,  or modifying  the  FreeType
-            Project, you indicate that you understand and accept all the terms
-            of this license.
-          </para>
-
-
-          <para>4. Contacts</para>
-          <para>
-            There are two mailing lists related to FreeType:
-          </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                freetype@nongnu.org
-              </para>
-              <para>
-                Discusses general use and applications of FreeType, as well as
-                future and  wanted additions to the  library and distribution.
-                If  you are looking  for support,  start in  this list  if you
-                haven't found anything to help you in the documentation.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                freetype-devel@nongnu.org
-              </para>
-              <para>
-                Discusses bugs,  as well  as engine internals,  design issues,
-                specific licenses, porting, etc.
-              </para>
-            </listitem>
-          </itemizedlist>
-          <para>
-            Our home page can be found at
-          </para>
-          <para>
-            http://www.freetype.org
-          </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Redistribution in binary form must provide a disclaimer
+              that states that the software is based in part of the work
+              of the FreeType Team, in the distribution documentation.
+              We also encourage you to put an URL to the FreeType web
+              page in your documentation, though this isn't mandatory.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+        <para>
+          These conditions apply to any software derived from or based
+          on the FreeType Project, not just the unmodified files. If you
+          use our work, you must acknowledge us. However, no fee need be
+          paid to us.
+        </para>
+
+        <para>
+          3. Advertising
+        </para>
+
+        <para>
+          Neither the FreeType authors and contributors nor you shall
+          use the name of the other for commercial, advertising, or
+          promotional purposes without specific prior written
+          permission.
+        </para>
+
+        <para>
+          We suggest, but do not require, that you use one or more of
+          the following phrases to refer to this software in your
+          documentation or advertising materials: `FreeType Project',
+          `FreeType Engine', `FreeType library', or `FreeType
+          Distribution'.
+        </para>
+
+        <para>
+          As you have not signed this license, you are not required to
+          accept it. However, as the FreeType Project is copyrighted
+          material, only this license, or another one contracted with
+          the authors, grants you the right to use, distribute, and
+          modify it. Therefore, by using, distributing, or modifying the
+          FreeType Project, you indicate that you understand and accept
+          all the terms of this license.
+        </para>
+
+        <para>
+          4. Contacts
+        </para>
+
+        <para>
+          There are two mailing lists related to FreeType:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              freetype@nongnu.org
+            </para>
+
+            <para>
+              Discusses general use and applications of FreeType, as
+              well as future and wanted additions to the library and
+              distribution. If you are looking for support, start in
+              this list if you haven't found anything to help you in the
+              documentation.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              freetype-devel@nongnu.org
+            </para>
+
+            <para>
+              Discusses bugs, as well as engine internals, design
+              issues, specific licenses, porting, etc.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+        <para>
+          Our home page can be found at
+        </para>
+
+        <para>
+          http://www.freetype.org
+        </para>
 
       </sect3>
+
     </sect2>
+
     <sect2 id="licVPX">
+
       <title>VPX License</title>
-      <para>
-        Copyright (c) 2010, The WebM Project authors. All rights reserved.
-      </para>
-      <para>
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are
-        met:
-      </para>
+
+      <para>
+        Copyright (c) 2010, The WebM Project authors. All rights
+        reserved.
+      </para>
+
+      <para>
+        Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the following
+        conditions are met:
+      </para>
+
       <itemizedlist>
+
         <listitem>
           <para>
-            Redistributions of source code must retain the above copyright
-            notice, this list of conditions and the following disclaimer.
+            Redistributions of source code must retain the above
+            copyright notice, this list of conditions and the following
+            disclaimer.
           </para>
         </listitem>
+
         <listitem>
           <para>
-            Redistributions in binary form must reproduce the above copyright
-            notice, this list of conditions and the following disclaimer in
-            the documentation and/or other materials provided with the
-            distribution.
+            Redistributions in binary form must reproduce the above
+            copyright notice, this list of conditions and the following
+            disclaimer in the documentation and/or other materials
+            provided with the distribution.
           </para>
         </listitem>
+
         <listitem>
           <para>
-            Neither the name of Google, nor the WebM Project, nor the names
-            of its contributors may be used to endorse or promote products
-            derived from this software without specific prior written
-            permission.
+            Neither the name of Google, nor the WebM Project, nor the
+            names of its contributors may be used to endorse or promote
+            products derived from this software without specific prior
+            written permission.
           </para>
         </listitem>
+
       </itemizedlist>
-      <para>
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-        "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-        LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-        A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-        HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+
+      <para>
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+        CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+        MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
         SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-        THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-      </para>
+        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+        USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+        AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE.
+      </para>
+
     </sect2>
+
     <sect2 id="licOpus">
+
       <title>Opus License</title>
-      <para>
-        Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic,
-                            Jean-Marc Valin, Timothy B. Terriberry,
-                            CSIRO, Gregory Maxwell, Mark Borgerding,
-                            Erik de Castro Lopo
-      </para>
-      <para>
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are
-        met:
-      </para>
+
+      <para>
+        Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic, Jean-Marc
+        Valin, Timothy B. Terriberry, CSIRO, Gregory Maxwell, Mark
+        Borgerding, Erik de Castro Lopo
+      </para>
+
+      <para>
+        Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the following
+        conditions are met:
+      </para>
+
       <itemizedlist>
+
         <listitem>
           <para>
-            Redistributions of source code must retain the above copyright
-            notice, this list of conditions and the following disclaimer.
+            Redistributions of source code must retain the above
+            copyright notice, this list of conditions and the following
+            disclaimer.
           </para>
         </listitem>
+
         <listitem>
           <para>
-            Redistributions in binary form must reproduce the above copyright
-            notice, this list of conditions and the following disclaimer in the
-            documentation and/or other materials provided with the distribution.
+            Redistributions in binary form must reproduce the above
+            copyright notice, this list of conditions and the following
+            disclaimer in the documentation and/or other materials
+            provided with the distribution.
           </para>
         </listitem>
+
         <listitem>
           <para>
-            Neither the name of Internet Society, IETF or IETF Trust, nor the
-            names of specific contributors, may be used to endorse or promote
-            products derived from this software without specific prior written
-            permission.
+            Neither the name of Internet Society, IETF or IETF Trust,
+            nor the names of specific contributors, may be used to
+            endorse or promote products derived from this software
+            without specific prior written permission.
           </para>
         </listitem>
+
       </itemizedlist>
-      <para>
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-        ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-        LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-        A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-        OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-        EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-        PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-        PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-        LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-        NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-        SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-        Opus is subject to the royalty-free patent licenses which are
-        specified at:
-
-        Xiph.Org Foundation:
-        https://datatracker.ietf.org/ipr/1524/
-
-        Microsoft Corporation:
-        https://datatracker.ietf.org/ipr/1914/
-
-        Broadcom Corporation:
-        https://datatracker.ietf.org/ipr/1526/
-      </para>
+
+      <para>
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+        CONTRIBUTORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+        MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+        SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+        USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+        AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE. Opus is subject to the
+        royalty-free patent licenses which are specified at: Xiph.Org
+        Foundation: https://datatracker.ietf.org/ipr/1524/ Microsoft
+        Corporation: https://datatracker.ietf.org/ipr/1914/ Broadcom
+        Corporation: https://datatracker.ietf.org/ipr/1526/
+      </para>
+
     </sect2>
+
   </sect1>
+
 </appendix>
Index: trunk/doc/manual/en_US/user_Troubleshooting.xml
===================================================================
--- trunk/doc/manual/en_US/user_Troubleshooting.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_Troubleshooting.xml	(revision 76078)
@@ -11,7 +11,7 @@
   <para>
     This chapter provides answers to commonly asked questions. In order
-    to improve your user experience with VirtualBox, it is recommended
-    to read this section to learn more about common pitfalls and get
-    recommendations on how to use the product.
+    to improve your user experience with &product-name;, it is
+    recommended to read this section to learn more about common pitfalls
+    and get recommendations on how to use the product.
   </para>
 
@@ -33,5 +33,5 @@
 
       <para>
-        If a true VirtualBox problem is encountered, it helps to
+        If a true &product-name; problem is encountered, it helps to
         categorize and isolate the problem first. Here are some of the
         questions that should be answered before reporting a problem:
@@ -52,9 +52,9 @@
           <para>
             Is the problem specific to a certain host OS? Problems are
-            usually not host OS specific, because most of the VirtualBox
-            code base is shared across all supported platforms, but
-            especially in the areas of networking and USB support, there
-            are significant differences between host platforms. Some GUI
-            related issues are also host specific.
+            usually not host OS specific, because most of the
+            &product-name; code base is shared across all supported
+            platforms, but especially in the areas of networking and USB
+            support, there are significant differences between host
+            platforms. Some GUI related issues are also host specific.
           </para>
         </listitem>
@@ -104,5 +104,5 @@
             Is the problem specific to a certain environment? Some
             problems are related to a particular environment external to
-            the VM; this usually involves network setup. Certain
+            the VM. This usually involves network setup. Certain
             configurations of external servers such as DHCP or PXE may
             expose problems which do not occur with other, similar
@@ -130,5 +130,5 @@
       <para>
         For problem determination, it is often important to collect
-        debugging information which can be analyzed by VirtualBox
+        debugging information which can be analyzed by &product-name;
         support. This section contains information about what kind of
         information can be obtained.
@@ -136,14 +136,13 @@
 
       <para>
-        Every time VirtualBox starts up a VM, a so-called
+        Every time &product-name; starts up a VM, a so-called
         <emphasis>release log file</emphasis> is created, containing
         lots of information about the VM configuration and runtime
         events. The log file is called
-        <computeroutput><literal>VBox.log</literal></computeroutput> and
-        resides in the VM log file folder. Typically this will be a
-        directory as follows:
+        <computeroutput>VBox.log</computeroutput> and resides in the VM
+        log file folder. Typically this will be a directory as follows:
+      </para>
 
 <screen>$HOME/VirtualBox VMs/{machinename}/Logs</screen>
-      </para>
 
       <para>
@@ -152,27 +151,27 @@
         <computeroutput>.3</computeroutput>. Sometimes when there is a
         problem, it is useful to have a look at the logs. Also when
-        requesting support for VirtualBox, supplying the corresponding
-        log file is mandatory.
-      </para>
-
-      <para>
-        For convenience, for each virtual machine, the VirtualBox main
-        window can show these logs in a window. To access it, select a
-        virtual machine from the list on the left and select
-        <emphasis role="bold">Show logs...</emphasis> from the Machine
-        menu.
-      </para>
-
-      <para>
-        The release log file (VBox.log) contains a wealth of diagnostic
-        information, such as Host OS type and version, VirtualBox
-        version and build (32-bit or 64-bit), a complete dump of the
-        guest's configuration (CFGM), detailed information about the
-        host CPU type and supported features, whether hardware
-        virtualization is enabled, information about VT-x/AMD-V setup,
-        state transitions (such as creating, running, paused, stopping),
-        guest BIOS messages, Guest Additions messages, device-specific
-        log entries and, at the end of execution, final guest state and
-        condensed statistics.
+        requesting support for &product-name;, supplying the
+        corresponding log file is mandatory.
+      </para>
+
+      <para>
+        For convenience, for each virtual machine, the VirtualBox
+        Manager window can show these logs in a window. To access it,
+        select a virtual machine from the list on the left and select
+        <emphasis role="bold">Show logs...</emphasis> from the
+        <emphasis role="bold">Machine</emphasis> menu.
+      </para>
+
+      <para>
+        The release log file, VBox.log, contains a wealth of diagnostic
+        information, such as Host OS type and version, &product-name;
+        version and build (32-bit or 64-bit). It also includes a
+        complete dump of the guest's configuration (CFGM), detailed
+        information about the host CPU type and supported features,
+        whether hardware virtualization is enabled, information about
+        VT-x/AMD-V setup, state transitions (such as creating, running,
+        paused, stopping), guest BIOS messages, Guest Additions
+        messages, device-specific log entries and, at the end of
+        execution, final guest state and condensed statistics.
       </para>
 
@@ -181,6 +180,6 @@
         <emphasis>crash dumps</emphasis>. This is true for both host and
         guest crashes. For information about enabling core dumps on
-        Linux, Solaris, and OS X systems, refer to the following core
-        dump article on the VirtualBox website:
+        Linux, Oracle Solaris, and OS X systems, refer to the following
+        core dump article on the &product-name; website:
       </para>
 
@@ -191,7 +190,7 @@
 
       <para>
-        You can also use <computeroutput>VBoxManage
-        debugvm</computeroutput> to create a dump of a complete virtual
-        machine. See <xref linkend="vboxmanage-debugvm" />.
+        You can also use <command>VBoxManage debugvm</command> to create
+        a dump of a complete virtual machine. See
+        <xref linkend="vboxmanage-debugvm" />.
       </para>
 
@@ -205,7 +204,7 @@
 
       <para>
-        VirtualBox provides an ability to capture network traffic only
-        on a specific VM's network adapter. Refer to the following
-        network tracing article on the VirtualBox website for
+        &product-name; provides an ability to capture network traffic
+        only on a specific VM's network adapter. Refer to the following
+        network tracing article on the &product-name; website for
         information on enabling this capture:
       </para>
@@ -217,5 +216,5 @@
 
       <para>
-        The trace files created by VirtualBox are in
+        The trace files created by &product-name; are in
         <computeroutput>.pcap</computeroutput> format and can be easily
         analyzed with Wireshark.
@@ -229,7 +228,7 @@
 
       <para>
-        VirtualBox includes a built-in VM debugger, which advanced users
-        may find useful. This debugger allows for examining and, to some
-        extent, controlling the VM state.
+        &product-name; includes a built-in VM debugger, which advanced
+        users may find useful. This debugger enables you to examine and,
+        to some extent, control the VM state.
       </para>
 
@@ -248,7 +247,7 @@
       <para>
         The VM debugger is available in all regular production versions
-        of VirtualBox, but it is disabled by default because the average
-        user will have little use for it. There are two ways to access
-        the debugger:
+        of &product-name;, but it is disabled by default because the
+        average user will have little use for it. There are two ways to
+        access the debugger:
       </para>
 
@@ -278,10 +277,11 @@
         <listitem>
           <para>
-            Start the VM directly using <computeroutput>VirtualBox
-            --startvm</computeroutput>, with an additional
+            Start the VM directly using <command>VirtualBox
+            --startvm</command>, with an additional
             <computeroutput>--dbg</computeroutput>,
             <computeroutput>--debug</computeroutput>, or
             <computeroutput>--debug-command-line</computeroutput>
-            argument. See the VirtualBox usage help for details.
+            argument. See the <command>VirtualBox</command> command
+            usage help for details.
           </para>
         </listitem>
@@ -294,7 +294,7 @@
             environment variable to
             <computeroutput>true</computeroutput> before launching the
-            VirtualBox process. Setting these variables, only their
+            &product-name; process. Setting these variables, only their
             presence is checked, is effective even when the first
-            VirtualBox process is the VM selector window. VMs
+            &product-name; process is the VM selector window. VMs
             subsequently launched from the selector will have the
             debugger enabled.
@@ -314,6 +314,7 @@
 
       <para>
-        A new Debug menu entry is added to the VirtualBox application.
-        This menu allows the user to open the debugger console.
+        A new <emphasis role="bold">Debug</emphasis> menu entry is added
+        to the &product-name; application. This menu enables the user to
+        open the debugger console.
       </para>
 
@@ -322,14 +323,12 @@
         and IBM debuggers used on DOS, OS/2, and Windows. Users familiar
         with symdeb, CodeView, or the OS/2 kernel debugger will find the
-        VirtualBox VM debugger familiar.
-      </para>
-
-      <para>
-        The most important command is
-        <computeroutput>help</computeroutput>. This will print brief
-        usage help for all debugger commands. The set of commands
-        supported by the VM debugger changes frequently and the
-        <computeroutput>help</computeroutput> command is always
-        up-to-date.
+        &product-name; VM debugger familiar.
+      </para>
+
+      <para>
+        The most important command is <command>help</command>. This will
+        print brief usage help for all debugger commands. The set of
+        commands supported by the VM debugger changes frequently and the
+        <command>help</command> command is always up-to-date.
       </para>
 
@@ -453,17 +452,16 @@
       <para>
         The VM debugger supports symbolic debugging, although symbols
-        for guest code are often not available. For Solaris guests, the
-        <computeroutput>detect</computeroutput> command automatically
+        for guest code are often not available. For Oracle Solaris
+        guests, the <command>detect</command> command automatically
         determines the guest OS version and locates kernel symbols in
         guest's memory. Symbolic debugging is then available. For Linux
-        guests, the <computeroutput>detect</computeroutput> commands
-        also determines the guest OS version, but there are no symbols
-        in the guest's memory. Kernel symbols are available in the file
+        guests, the <command>detect</command> commands also determines
+        the guest OS version, but there are no symbols in the guest's
+        memory. Kernel symbols are available in the file
         <computeroutput>/proc/kallsyms</computeroutput> on Linux guests.
         This file must be copied to the host, for example using
-        <computeroutput>scp</computeroutput>. The
-        <computeroutput>loadmap</computeroutput> debugger command can be
-        used to make the symbol information available to the VM
-        debugger. Note that the
+        <command>scp</command>. The <command>loadmap</command> debugger
+        command can be used to make the symbol information available to
+        the VM debugger. Note that the
         <computeroutput>kallsyms</computeroutput> file contains the
         symbols for the currently loaded modules. If the guest's
@@ -474,21 +472,20 @@
       <para>
         For all guests, a simple way to verify that the correct symbols
-        are loaded is the <computeroutput>k</computeroutput> command.
-        The guest is normally idling and it should be clear from the
-        symbolic information that the guest operating system's idle loop
-        is being executed.
+        are loaded is the <command>k</command> command. The guest is
+        normally idling and it should be clear from the symbolic
+        information that the guest operating system's idle loop is being
+        executed.
       </para>
 
       <para>
         Another group of debugger commands is the set of
-        <computeroutput>info</computeroutput> commands. Running
-        <computeroutput>info help</computeroutput> provides complete
-        usage information. The information commands provide ad-hoc data
-        pertinent to various emulated devices and aspects of the VMM.
-        There is no general guideline for using the
-        <computeroutput>info</computeroutput> commands, the right
-        command to use depends entirely on the problem being
-        investigated. Some of the <computeroutput>info</computeroutput>
-        commands are as follows:
+        <command>info</command> commands. Running <command>info
+        help</command> provides complete usage information. The
+        information commands provide ad-hoc data pertinent to various
+        emulated devices and aspects of the VMM. There is no general
+        guideline for using the <command>info</command> commands, the
+        right command to use depends entirely on the problem being
+        investigated. Some of the <command>info</command> commands are
+        as follows:
       </para>
 
@@ -574,8 +571,8 @@
 
       <para>
-        The output of the <computeroutput>info</computeroutput> commands
-        generally requires in-depth knowledge of the emulated device
-        and/or VirtualBox VMM internals. However, when used properly,
-        the information provided can be invaluable.
+        The output of the <command>info</command> commands generally
+        requires in-depth knowledge of the emulated device or
+        &product-name; VMM internals. However, when used properly, the
+        information provided can be invaluable.
       </para>
 
@@ -587,8 +584,8 @@
 
       <para>
-        VirtualBox uses the 64-bit ELF format for its VM core files
-        created by <computeroutput>VBoxManage debugvm</computeroutput>,
-        see <xref linkend="vboxmanage-debugvm" />. The VM core file
-        contain the memory and CPU dumps of the VM and can be useful for
+        &product-name; uses the 64-bit ELF format for its VM core files
+        created by <command>VBoxManage debugvm</command>, see
+        <xref linkend="vboxmanage-debugvm" />. The VM core file contain
+        the memory and CPU dumps of the VM and can be useful for
         debugging your guest OS. The 64-bit ELF object format
         specification can be obtained at:
@@ -604,5 +601,4 @@
       </para>
 
-      <para>
 <screen>[ ELF 64 Header]
 [ Program Header, type PT_NOTE ]
@@ -622,5 +618,4 @@
 [ Additional Notes + Data ] - currently unused
 [ Memory dump ]</screen>
-      </para>
 
       <para>
@@ -632,5 +627,5 @@
       <para>
         The relevant data structures and definitions can be found in the
-        VirtualBox sources under the following header files:
+        &product-name; sources under the following header files:
         <computeroutput>include/VBox/dbgfcorefmt.h</computeroutput>,
         <computeroutput>include/iprt/x86.h</computeroutput> and
@@ -828,5 +823,5 @@
       <para>
         Depending on the specific hardware and host OS, this effect can
-        very significantly skew the CPU usage reported by the OS; the
+        very significantly skew the CPU usage reported by the OS. The
         reported CPU usage can be several times higher than what it
         would have been had the CPU been running at full speed. The
@@ -891,8 +886,8 @@
 
       <para>
-        To use 2D Video Acceleration within VirtualBox, your host's
+        To use 2D Video Acceleration within &product-name;, your host's
         video card should support certain OpenGL extensions. On startup,
-        VirtualBox checks for those extensions, and, if the test fails,
-        this option is silently grayed out.
+        &product-name; checks for those extensions, and, if the test
+        fails, this option is silently grayed out.
       </para>
 
@@ -929,6 +924,6 @@
         support at all. This happens because Windows 7 predates USB 3.0
         and therefore does not ship with any xHCI drivers. Microsoft
-        also does not offer any vendor-provided xHCI drivers via Windows
-        Update.
+        also does not offer any vendor-provided xHCI drivers through
+        Windows Update.
       </para>
 
@@ -984,9 +979,9 @@
             Changing the storage controller hardware will cause bootup
             failures as well. This might also apply to you if you copy a
-            disk image from an older version of VirtualBox to a virtual
-            machine created with a newer VirtualBox version; the default
-            subtype of IDE controller hardware was changed from PIIX3 to
-            PIIX4 with VirtualBox 2.2. Make sure these settings are
-            identical.
+            disk image from an older version of &product-name; to a
+            virtual machine created with a newer &product-name; version.
+            The default subtype of IDE controller hardware was changed
+            from PIIX3 to PIIX4 with &product-name; 2.2. Make sure these
+            settings are identical.
           </para>
         </listitem>
@@ -1004,5 +999,5 @@
         (symmetrical multiprocessing, SMP), some configurations of
         Windows guests crash with an 0x101 error message, indicating a
-        timeout for inter-processor interrupts (IPIs). These interrupts
+        timeout for interprocessor interrupts (IPIs). These interrupts
         synchronize memory management between processors.
       </para>
@@ -1048,5 +1043,5 @@
           <para>
             Installation complains about a failure installing
-            <literal>msgina.dll</literal>.
+            <computeroutput>msgina.dll</computeroutput>.
           </para>
         </listitem>
@@ -1098,12 +1093,10 @@
 
       <para>
-        VirtualBox provides a method of halting a guest when it wants to
-        perform a reset. In order to enable this feature, issue the
-        following command:
-      </para>
-
-      <para>
+        &product-name; provides a method of halting a guest when it
+        wants to perform a reset. In order to enable this feature, use
+        the following command:
+      </para>
+
 <screen>VBoxManage setextradata "VM name" "VBoxInternal/PDM/HaltOnReset" 1</screen>
-      </para>
 
     </sect2>
@@ -1138,7 +1131,7 @@
       <para>
         With Windows Vista, Microsoft dropped support for the AMD PCNet
-        card that VirtualBox used to provide as the default virtual
+        card that &product-name; used to provide as the default virtual
         network card before version 1.6.0. For Windows Vista guests,
-        VirtualBox now uses an Intel E1000 card by default.
+        &product-name; now uses an Intel E1000 card by default.
       </para>
 
@@ -1173,6 +1166,6 @@
         The performance for accesses to shared folders from a Windows
         guest might be decreased due to delays during the resolution of
-        the VirtualBox shared folders name service. To fix these delays,
-        add the following entries to the file
+        the &product-name; shared folders name service. To fix these
+        delays, add the following entries to the file
         <computeroutput>\windows\system32\drivers\etc\lmhosts</computeroutput>
         of the Windows guest:
@@ -1201,13 +1194,11 @@
       <para>
         The USB HID (Human Interface Device) drivers in Windows 98 are
-        very old and do not handle tablets the same way all more recent
-        operating systems do (Windows 2000 and later, Mac OS X,
-        Solaris). To work around the problem, issue the following
-        command:
-      </para>
-
-      <para>
+        very old and do not handle tablets the same way as more recent
+        operating systems do. For example, Windows 2000 and later, Mac
+        OS X, and Oracle Solaris. To work around the problem, use the
+        following command:
+      </para>
+
 <screen>VBoxManage setextradata "VM name" "VBoxInternal/USB/HidMouse/0/Config/CoordShift" 0</screen>
-      </para>
 
       <para>
@@ -1225,6 +1216,6 @@
       <para>
         If a Windows guest is a member of an Active Directory domain and
-        the snapshot feature of VirtualBox is used, it could happen it
-        loses this status after you restore an older snapshot.
+        the snapshot feature of &product-name; is used, it could happen
+        it loses this status after you restore an older snapshot.
       </para>
 
@@ -1245,21 +1236,21 @@
 
       <para>
-        VirtualBox Guest Additions for Windows prior to 4.1.8 did not
-        properly back up the original d3d8.dll and d3d9.dll system files
-        when selecting and installing the experimental Direct3D support.
-        This process replaces both system files with files from the
-        VirtualBox Guest Additions so that Direct3D calls can be handled
-        correctly. Although this issue was fixed with VirtualBox 4.1.8,
-        there is no way the Windows Guest Additions installer can repair
-        these files.
-      </para>
-
-      <para>
-        Corruption of these files has no implications in case 3D
-        acceleration is enabled and basic Direct3D support is installed,
-        that is, without WDDM (on Windows Vista or higher) or on older
-        Windows systems like Windows XP. With the basic Direct3D support
-        all Direct3D 8.0 and Direct3D 9.0 applications will utilize
-        VirtualBox Direct3D files directly and thus will run as
+        &product-name; Guest Additions for Windows prior to 4.1.8 did
+        not properly back up the original d3d8.dll and d3d9.dll system
+        files when selecting and installing the experimental Direct3D
+        support. This process replaces both system files with files from
+        the Guest Additions so that Direct3D calls can be handled
+        correctly. Although this issue was fixed with &product-name;
+        4.1.8, there is no way the Windows Guest Additions installer can
+        repair these files.
+      </para>
+
+      <para>
+        Corruption of these files has no implications if 3D acceleration
+        is enabled and basic Direct3D support is installed. That is,
+        without WDDM on Windows Vista or later, or on older Windows
+        systems like Windows XP. With the basic Direct3D support all
+        Direct3D 8.0 and Direct3D 9.0 applications will utilize
+        &product-name; Direct3D files directly and thus will run as
         expected.
       </para>
@@ -1272,6 +1263,6 @@
         not work anymore. See below for a step-by-step guide for
         restoring the original d3d8.dll and d3d9.dll system files in
-        case the VirtualBox Guest Additions installer warned about those
-        incorrect files or when having trouble running Direct3D
+        case the &product-name; Guest Additions installer warned about
+        those incorrect files or when having trouble running Direct3D
         applications.
       </para>
@@ -1534,5 +1525,5 @@
       <para>
         The following bugs in Linux kernels prevent them from executing
-        correctly in VirtualBox, causing VM boot crashes:
+        correctly in &product-name;, causing VM boot crashes:
       </para>
 
@@ -1543,5 +1534,5 @@
             The Linux kernel version 2.6.18, and some 2.6.17 versions,
             introduced a race condition that can cause boot crashes in
-            VirtualBox. Please use a kernel version 2.6.19 or later.
+            &product-name;. Please use a kernel version 2.6.19 or later.
           </para>
         </listitem>
@@ -1563,15 +1554,11 @@
             linkend="settings-system" />, or upgrade
             the guest to a newer kernel.
-
-            <footnote>
-
-              <para>
-                See
-                <ulink
+          </para>
+
+          <para>
+            See
+            <ulink
                 url="http://www.mail-archive.com/git-commits-head@vger.kernel.org/msg30813.html">http://www.mail-archive.com/git-commits-head@vger.kernel.org/msg30813.html</ulink>
-                for details about the kernel fix.
-              </para>
-
-            </footnote>
+            for details about the kernel fix.
           </para>
         </listitem>
@@ -1587,10 +1574,10 @@
       <para>
         Guest desktop services in guests running the X11 window system
-        such as Solaris and Linux, are provided by a guest service
-        called <computeroutput>VBoxClient</computeroutput>, which runs
-        under the ID of the user who started the desktop session and is
-        automatically started using the following command lines when
-        your X11 user session is started if you are using a common
-        desktop environment (Gnome, KDE and others).
+        such as Oracle Solaris and Linux, are provided by a guest
+        service called <computeroutput>VBoxClient</computeroutput>,
+        which runs under the ID of the user who started the desktop
+        session and is automatically started using the following command
+        lines when your X11 user session is started if you are using a
+        common desktop environment such as Gnome or KDE.
       </para>
 
@@ -1623,14 +1610,14 @@
   <sect1 id="ts_sol-guests">
 
-    <title>Solaris Guests</title>
+    <title>Oracle Solaris Guests</title>
 
     <sect2 id="ts_solaris-10-guest-crash">
 
-      <title>Older Solaris 10 Releases Crash in 64-bit Mode</title>
-
-      <para>
-        Solaris 10 releases up to and including Solaris 10 8/07
-        ("S10U4") incorrectly detect newer Intel processors produced
-        since 2007. This problem leads to the 64-bit Solaris kernel
+      <title>Older Oracle Solaris 10 Releases Crash in 64-bit Mode</title>
+
+      <para>
+        Oracle Solaris 10 releases up to and including Oracle Solaris 10
+        8/07 incorrectly detect newer Intel processors produced since
+        2007. This problem leads to the 64-bit Oracle Solaris kernel
         crashing, and usually causing a triple fault, almost immediately
         during startup, in both virtualized and physical environments.
@@ -1638,8 +1625,8 @@
 
       <para>
-        The recommended solution is upgrading to at least Solaris 10
-        5/08 ("S10U5"). Alternative solutions include forcing Solaris to
+        The recommended solution is upgrading to at least Oracle Solaris
+        10 5/08. Alternative solutions include forcing Oracle Solaris to
         always boot the 32-bit kernel or applying a patch for bug
-        6574102 while Solaris is using the 32-bit kernel.
+        6574102 while Oracle Solaris is using the 32-bit kernel.
       </para>
 
@@ -1648,23 +1635,24 @@
     <sect2 id="ts_solaris-10-guest-slow-boot-smp">
 
-      <title>Certain Solaris 10 Releases May Take a Long Time to Boot with SMP</title>
-
-      <para>
-        When using more than one CPU, Solaris 10 releases 5/08
-        ("S10U5"), 10/08 ("S10U6"), and 5/09 ("S10U7") may take a long
+      <title>Certain Oracle Solaris 10 Releases May Take a Long Time to Boot with SMP</title>
+
+      <para>
+        When using more than one CPU, Oracle Solaris 10 5/08, Oracle
+        Solaris 10 10/08, and Oracle Solaris 10 5/09 may take a long
         time to boot and may print warnings on the system console
-        regarding failures to read from disk. This is a bug in Solaris
-        10 which affects specific physical and virtual configurations.
-        It is caused by trying to read microcode updates from the boot
-        disk when the disk interrupt is reassigned to a not yet fully
-        initialized secondary CPU. Disk reads will time out and fail,
-        triggering delays of about 45 seconds and warnings.
-      </para>
-
-      <para>
-        The recommended solution is upgrading to at least Solaris 10
-        10/09 ("S10U8") which includes a fix for this problem.
-        Alternative solutions include restricting the number of virtual
-        CPUs to one or possibly using a different storage controller.
+        regarding failures to read from disk. This is a bug in Oracle
+        Solaris 10 which affects specific physical and virtual
+        configurations. It is caused by trying to read microcode updates
+        from the boot disk when the disk interrupt is reassigned to a
+        not yet fully initialized secondary CPU. Disk reads will time
+        out and fail, triggering delays of about 45 seconds and
+        warnings.
+      </para>
+
+      <para>
+        The recommended solution is upgrading to at least Oracle Solaris
+        10 10/09 which includes a fix for this problem. Alternative
+        solutions include restricting the number of virtual CPUs to one
+        or possibly using a different storage controller.
       </para>
 
@@ -1729,13 +1717,13 @@
 
       <para>
-        VirtualBox makes use of the Microsoft Component Object Model
-        (COM) for inter-process and intra-process communication. This
-        allows VirtualBox to share a common configuration among
+        &product-name; makes use of the Microsoft Component Object Model
+        (COM) for interprocess and intraprocess communication. This
+        enables &product-name; to share a common configuration among
         different virtual machine processes and provide several user
         interface options based on a common architecture. All global
         status information and configuration is maintained by the
         process <computeroutput>VBoxSVC.exe</computeroutput>, which is
-        an out-of-process COM server. Whenever a VirtualBox process is
-        started, it requests access to the COM server and Windows
+        an out-of-process COM server. Whenever an &product-name; process
+        is started, it requests access to the COM server and Windows
         automatically starts the process. Note that it should never be
         started by the end user.
@@ -1744,5 +1732,5 @@
       <para>
         When the last process disconnects from the COM server, it will
-        terminate itself after some seconds. The VirtualBox
+        terminate itself after some seconds. The &product-name;
         configuration (XML files) is maintained and owned by the COM
         server and the files are locked whenever the server runs.
@@ -1772,10 +1760,12 @@
         turned off. This is represented by the following key in the
         Windows registry:
-
-<screen><literal>HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Cdrom\Autorun</literal></screen>
-
+      </para>
+
+<screen>HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Cdrom\Autorun</screen>
+
+      <para>
         Certain applications may disable this key against Microsoft's
         advice. If it is set to 0, change it to 1 and reboot your
-        system. VirtualBox relies on Windows notifying it of media
+        system. &product-name; relies on Windows notifying it of media
         changes.
       </para>
@@ -1788,9 +1778,9 @@
 
       <para>
-        If connecting to a Virtual Machine via the Microsoft RDP client,
-        called a Remote Desktop Connection, there can be large delays
-        between input such as moving the mouse over a menu and output.
-        This is because this RDP client collects input for a certain
-        time before sending it to the RDP server.
+        If connecting to a Virtual Machine using the Microsoft RDP
+        client, called a Remote Desktop Connection, there can be large
+        delays between input such as moving the mouse over a menu and
+        output. This is because this RDP client collects input for a
+        certain time before sending it to the RDP server.
       </para>
 
@@ -1839,5 +1829,5 @@
         1 will enable a workaround for this problem until Microsoft
         addresses the issue. For example, open a command prompt window
-        and start VirtualBox like this:
+        and start &product-name; like this:
       </para>
 
@@ -1858,6 +1848,7 @@
 
       <para>
-        If no bridged adapters show up in the Networking section of the
-        VM settings, this typically means that the bridged networking
+        If no bridged adapters show up in the
+        <emphasis role="bold">Networking</emphasis> section of the VM
+        settings, this typically means that the bridged networking
         driver was not installed properly on your host. This could be
         due to the following reasons:
@@ -1871,17 +1862,19 @@
             this case, the MSI log would mention the
             <computeroutput>0x8004a029</computeroutput> error code
-            returned on NetFlt network component install:
+            returned on NetFlt network component install, as follows:
+          </para>
 
 <screen>VBoxNetCfgWinInstallComponent: Install failed, hr (0x8004a029)</screen>
-          </para>
 
           <para>
             You can try to increase the maximum filter count in the
-            Windows registry at the following key:
+            Windows registry using the following key:
+          </para>
 
 <screen>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Network\MaxNumFilters</screen>
 
+          <para>
             The maximum number allowed is 14. After a reboot, try to
-            reinstall VirtualBox.
+            reinstall &product-name;.
           </para>
         </listitem>
@@ -1897,8 +1890,8 @@
             <computeroutput>sun_VBoxNetFlt</computeroutput> or
             <computeroutput>sun_VBoxNetFltmp</computeroutput>
-            components. The solution then is to uninstall VirtualBox,
-            remove the INF cache
+            components. The solution then is to uninstall
+            &product-name;, remove the INF cache
             (<computeroutput>%windir%\inf\INFCACHE.1</computeroutput>),
-            reboot and try to reinstall VirtualBox
+            reboot and try to reinstall &product-name;.
           </para>
         </listitem>
@@ -1910,20 +1903,22 @@
     <sect2 id="ts_win-host-host-only-network-adapters">
 
-      <title>Host-only Networking Adapters Cannot be Created</title>
-
-      <para>
-        If host-only adapter cannot be created, either via the Manager
-        or VBoxManage, then the INF cache is probably corrupt. In this
-        case, the install log
+      <title>Host-Only Networking Adapters Cannot be Created</title>
+
+      <para>
+        If a host-only adapter cannot be created, either with the
+        VirtualBox Manager or the <command>VBoxManage</command>
+        command, then the INF cache is probably corrupt. In this case,
+        the install log
         (<computeroutput>%windir%\inf\setupapi.log</computeroutput> on
-        XP or
+        Windows XP or
         <computeroutput>%windir%\inf\setupapi.dev.log</computeroutput>
-        on Vista or later) would typically mention the failure to find a
-        suitable driver package for the
+        on Windows Vista or later) would typically mention the failure
+        to find a suitable driver package for the
         <computeroutput>sun_VBoxNetAdp</computeroutput> component.
         Again, as with the bridged networking problem described above,
-        the solution is to uninstall VirtualBox, remove the INF cache
+        the solution is to uninstall &product-name;, remove the INF
+        cache
         (<computeroutput>%windir%\inf\INFCACHE.1</computeroutput>),
-        reboot and try to reinstall VirtualBox.
+        reboot and try to reinstall &product-name;.
       </para>
 
@@ -1941,13 +1936,12 @@
 
       <para>
-        If the VirtualBox kernel module,
+        If the &product-name; kernel module,
         <computeroutput>vboxdrv</computeroutput>, refuses to load you
         may see an "Error inserting vboxdrv: Invalid argument" message.
-        As root, check the output of the
-        <computeroutput>dmesg</computeroutput> command to find out why
-        the load failed. Most probably the kernel disagrees with the
-        version of <computeroutput>gcc</computeroutput> used to compile
-        the module. Make sure that you use the same compiler as used to
-        build the kernel.
+        As root, check the output of the <command>dmesg</command>
+        command to find out why the load failed. Most probably the
+        kernel disagrees with the version of <command>gcc</command> used
+        to compile the module. Make sure that you use the same compiler
+        as used to build the kernel.
       </para>
 
@@ -1979,7 +1973,7 @@
       <para>
         On older Linux distributions, if your CD/DVD device has a
-        different name, VirtualBox may be unable to find it. On older
-        Linux hosts, VirtualBox performs the following steps to locate
-        your CD/DVD drives:
+        different name, &product-name; may be unable to find it. On
+        older Linux hosts, &product-name; performs the following steps
+        to locate your CD/DVD drives:
       </para>
 
@@ -1988,13 +1982,13 @@
         <listitem>
           <para>
-            VirtualBox checks if the environment variable
+            &product-name; checks if the environment variable
             <computeroutput>VBOX_CDROM</computeroutput> is defined. If
-            so, VirtualBox omits all the following checks.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            VirtualBox tests if
+            so, &product-name; omits all the following checks.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            &product-name; tests if
             <computeroutput>/dev/cdrom</computeroutput> works.
           </para>
@@ -2003,12 +1997,13 @@
         <listitem>
           <para>
-            VirtualBox checks if any CD/DVD drives are currently mounted
-            by checking <computeroutput>/etc/mtab</computeroutput>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            VirtualBox checks if any of the entries in
+            &product-name; checks if any CD/DVD drives are currently
+            mounted by checking
+            <computeroutput>/etc/mtab</computeroutput>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            &product-name; checks if any of the entries in
             <computeroutput>/etc/fstab</computeroutput> point to CD/DVD
             devices.
@@ -2026,5 +2021,5 @@
 
       <para>
-        On modern Linux distributions, VirtualBox uses the hardware
+        On modern Linux distributions, &product-name; uses the hardware
         abstraction layer (HAL) to locate CD and DVD hardware.
       </para>
@@ -2039,6 +2034,7 @@
         <xref linkend="ts_linux-host-cd-dvd-not-found-legacy"/> appplies
         also to floppy disks, except that on older distributions
-        VirtualBox tests for <computeroutput>/dev/fd*</computeroutput>
-        devices by default. This can be overridden with the
+        &product-name; tests for
+        <computeroutput>/dev/fd*</computeroutput> devices by default.
+        This can be overridden with the
         <computeroutput>VBOX_FLOPPY</computeroutput> environment
         variable.
@@ -2053,15 +2049,15 @@
       <para>
         If the experimental CD/DVD writer support is enabled with an
-        incorrect VirtualBox, host or guest configuration, it is
+        incorrect &product-name;, host or guest configuration, it is
         possible that any attempt to access the CD/DVD writer fails and
         simply results in guest kernel error messages for Linux guests
-        or application error messages for Windows guests. VirtualBox
+        or application error messages for Windows guests. &product-name;
         performs the usual consistency checks when a VM is powered up.
         In particular, it aborts with an error message if the device for
         the CD/DVD writer is not writable by the user starting the VM.
-        But VirtualBox cannot detect all misconfigurations. The
+        But &product-name; cannot detect all misconfigurations. The
         necessary host and guest OS configuration is not specific for
-        VirtualBox, but a few frequent problems are listed here which
-        occurred in connection with VirtualBox.
+        &product-name;, but a few frequent problems are listed here
+        which occurred in connection with &product-name;.
       </para>
 
@@ -2069,20 +2065,22 @@
         Special care must be taken to use the correct device. The
         configured host CD/DVD device file name, in most cases
-        <literal>/dev/cdrom</literal>, must point to the device that
-        allows writing to the CD/DVD unit. For CD/DVD writer units
-        connected to a SCSI controller or to a IDE controller that
-        interfaces to the Linux SCSI subsystem (common for some SATA
-        controllers), this must refer to the SCSI device node, such as
-        <literal>/dev/scd0</literal>. Even for IDE CD/DVD writer units
-        this must refer to the appropriate SCSI CD-ROM device node, such
-        as <literal>/dev/scd0</literal>, if the
-        <literal>ide-scsi</literal> kernel module is loaded. This module
-        is required for CD/DVD writer support with all Linux 2.4 kernels
-        and some early 2.6 kernels. Many Linux distributions load this
-        module whenever a CD/DVD writer is detected in the system, even
-        if the kernel would support CD/DVD writers without the module.
-        VirtualBox supports the use of IDE device files, such as
-        <literal>/dev/hdc</literal>, provided the kernel supports this
-        and the <literal>ide-scsi</literal> module is not loaded.
+        <computeroutput>/dev/cdrom</computeroutput>, must point to the
+        device that allows writing to the CD/DVD unit. For CD/DVD writer
+        units connected to a SCSI controller or to a IDE controller that
+        interfaces to the Linux SCSI subsystem, common for some SATA
+        controllers, this must refer to the SCSI device node, such as
+        <computeroutput>/dev/scd0</computeroutput>. Even for IDE CD/DVD
+        writer units this must refer to the appropriate SCSI CD-ROM
+        device node, such as <computeroutput>/dev/scd0</computeroutput>,
+        if the <computeroutput>ide-scsi</computeroutput> kernel module
+        is loaded. This module is required for CD/DVD writer support
+        with all Linux 2.4 kernels and some early 2.6 kernels. Many
+        Linux distributions load this module whenever a CD/DVD writer is
+        detected in the system, even if the kernel would support CD/DVD
+        writers without the module. &product-name; supports the use of
+        IDE device files, such as
+        <computeroutput>/dev/hdc</computeroutput>, provided the kernel
+        supports this and the <computeroutput>ide-scsi</computeroutput>
+        module is not loaded.
       </para>
 
@@ -2101,26 +2099,26 @@
 
       <para>
-        On Linux, VirtualBox makes use of a custom version of Mozilla
-        XPCOM (cross platform component object model) for inter-process
-        and intra-process communication (IPC). The process
+        On Linux, &product-name; makes use of a custom version of
+        Mozilla XPCOM (cross platform component object model) for
+        interprocess and intraprocess communication (IPC). The process
         <computeroutput>VBoxSVC</computeroutput> serves as a
-        communication hub between different VirtualBox processes and
+        communication hub between different &product-name; processes and
         maintains the global configuration, such as the XML database.
-        When starting a VirtualBox component, the processes
+        When starting an &product-name; component, the processes
         <computeroutput>VBoxSVC</computeroutput> and
         <computeroutput>VBoxXPCOMIPCD</computeroutput> are started
         automatically. They are only accessible from the user account
         they are running under. <computeroutput>VBoxSVC</computeroutput>
-        owns the VirtualBox configuration database which normally
+        owns the &product-name; configuration database which normally
         resides in
         <computeroutput>~/.config/VirtualBox</computeroutput>, or the
         appropriate configuration directory for your operating system.
         While it is running, the configuration files are locked.
-        Communication between the various VirtualBox components and
+        Communication between the various &product-name; components and
         <computeroutput>VBoxSVC</computeroutput> is performed through a
         local domain socket residing in
         <computeroutput>/tmp/.vbox-&lt;username&gt;-ipc</computeroutput>.
-        In case there are communication problems, such as a VirtualBox
-        application cannot communicate with
+        In case there are communication problems, such as an
+        &product-name; application cannot communicate with
         <computeroutput>VBoxSVC</computeroutput>, terminate the daemons
         and remove the local domain socket directory.
@@ -2139,6 +2137,6 @@
         mind that group membership does not take effect immediately but
         rather at the next login. If available, the
-        <computeroutput>newgrp</computeroutput> command may avoid the
-        need for logout/login.
+        <command>newgrp</command> command may avoid the need for a
+        logout and login.
       </para>
 
@@ -2187,5 +2185,5 @@
   <sect1 id="ts_sol-hosts">
 
-    <title>Solaris Hosts</title>
+    <title>Oracle Solaris Hosts</title>
 
     <sect2 id="ts_sol-host-zfs">
@@ -2197,6 +2195,6 @@
         cache if the default system settings are not changed. This may
         lead to a heavy fragmentation of the host memory preventing
-        VirtualBox VMs from being started. We recommend to limit the ZFS
-        cache by adding the following line to /etc/system, where
+        &product-name; VMs from being started. We recommend to limit the
+        ZFS cache by adding the following line to /etc/system, where
         <computeroutput>xxxx</computeroutput> bytes is the amount of
         memory usable for the ZFS cache.
@@ -2209,26 +2207,26 @@
     <sect2 id="ts_sol-host-swap-space">
 
-      <title>VM Aborts With Out of Memory Errors on Solaris 10 Hosts</title>
-
-      <para>
-        32-bit Solaris 10 hosts (bug 1225025) require swap space equal
-        to, or greater than the host's physical memory size. For
+      <title>VM Aborts With Out of Memory Errors on Oracle Solaris 10 Hosts</title>
+
+      <para>
+        32-bit Oracle Solaris 10 hosts (bug 1225025) require swap space
+        equal to, or greater than the host's physical memory size. For
         example, 8 GB physical memory would require at least 8 GB swap.
-        This can be configured during a Solaris 10 install by choosing a
-        Custom Install and changing the default partitions.
+        This can be configured during an Oracle Solaris 10 install by
+        choosing a Custom Install and changing the default partitions.
       </para>
 
       <note>
         <para>
-          This restriction applies only to 32-bit Solaris hosts, 64-bit
-          hosts are not affected.
+          This restriction applies only to 32-bit Oracle Solaris hosts,
+          64-bit hosts are not affected.
         </para>
       </note>
 
       <para>
-        For existing Solaris 10 installs, an additional swap image needs
-        to be mounted and used as swap. Hence if you have 1 GB swap and
-        8 GB of physical memory, you require to add 7 GB more swap. This
-        can be done as follows:
+        For existing Oracle Solaris 10 installs, an additional swap
+        image needs to be mounted and used as swap. Hence if you have 1
+        GB swap and 8 GB of physical memory, you require to add 7 GB
+        more swap. This can be done as follows:
       </para>
 
Index: trunk/doc/manual/en_US/user_VBoxManage.xml
===================================================================
--- trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 76078)
@@ -31,12 +31,13 @@
 
     <para>
-      As briefly mentioned in <xref linkend="frontends" />, VBoxManage
-      is the command-line interface to VirtualBox. With it, you can
-      completely control VirtualBox from the command line of your host
-      operating system. VBoxManage supports all the features that the
+      As briefly mentioned in <xref linkend="frontends" />,
+      <command>VBoxManage</command> is the command-line interface to
+      &product-name;. With it, you can completely control &product-name;
+      from the command line of your host operating system.
+      <command>VBoxManage</command> supports all the features that the
       graphical user interface gives you access to, but it supports a
-      lot more than that. It exposes really all the features of the
-      virtualization engine, even those that cannot (yet) be accessed
-      from the GUI.
+      lot more than that. It exposes all the features of the
+      virtualization engine, even those that cannot be accessed from the
+      GUI.
     </para>
 
@@ -50,6 +51,6 @@
       <listitem>
         <para>
-          Use a different user interface than the main GUI. For example,
-          VBoxSDL or the VBoxHeadless server.
+          Use a different user interface than the main GUI such as the
+          VBoxHeadless server.
         </para>
       </listitem>
@@ -66,10 +67,10 @@
     <para>
       There are two main things to keep in mind when using
-      <computeroutput>VBoxManage</computeroutput>: First,
-      <computeroutput>VBoxManage</computeroutput> must always be used
-      with a specific "subcommand", such as "list" or "createvm" or
-      "startvm". All the subcommands that
-      <computeroutput>VBoxManage</computeroutput> supports are described
-      in detail in <xref linkend="vboxmanage" />.
+      <command>VBoxManage</command>. First,
+      <command>VBoxManage</command> must always be used with a specific
+      subcommand, such as <command>list</command> or
+      <command>createvm</command> or <command>startvm</command>. All the
+      subcommands that <command>VBoxManage</command> supports are
+      described in detail in <xref linkend="vboxmanage" />.
     </para>
 
@@ -84,15 +85,12 @@
       <listitem>
         <para>
-          You can specify the VM name, as it is shown in the VirtualBox
-          GUI. Note that if that name contains spaces, then you must
-          enclose the entire name in double quotes (as it is always
-          required with command line arguments that contain spaces).
-        </para>
-
-        <para>
-          For example:
+          You can specify the VM name, as it is shown in the
+          &product-name; GUI. Note that if that name contains spaces,
+          then you must enclose the entire name in double quotes. This
+          is always required with command line arguments that contain
+          spaces. For example:
+        </para>
 
 <screen>VBoxManage startvm "Windows XP"</screen>
-        </para>
       </listitem>
 
@@ -100,11 +98,11 @@
         <para>
           You can specify the UUID, which is the internal unique
-          identifier that VirtualBox uses to refer to the virtual
-          machine. Assuming that the aforementioned VM called "Windows
-          XP" has the UUID shown below, the following command has the
-          same effect as the previous:
+          identifier that &product-name; uses to refer to the virtual
+          machine. Assuming that the VM called "Windows XP" has the UUID
+          shown below, the following command has the same effect as the
+          previous example:
+        </para>
 
 <screen>VBoxManage startvm 670e746d-abea-4ba6-ad02-2a3b043810a5</screen>
-        </para>
       </listitem>
 
@@ -112,11 +110,11 @@
 
     <para>
-      You can type <computeroutput>VBoxManage list vms</computeroutput>
-      to have all currently registered VMs listed with all their
-      settings, including their respective names and UUIDs.
-    </para>
-
-    <para>
-      Some typical examples of how to control VirtualBox from the
+      You can enter <command>VBoxManage list vms</command> to have all
+      currently registered VMs listed with all their settings, including
+      their respective names and UUIDs.
+    </para>
+
+    <para>
+      Some typical examples of how to control &product-name; from the
       command line are listed below:
     </para>
@@ -127,19 +125,7 @@
         <para>
           To create a new virtual machine from the command line and
-          immediately register it with VirtualBox, use
-          <computeroutput>VBoxManage createvm</computeroutput> with the
-          <computeroutput>--register</computeroutput> option,
-
-          <footnote>
-
-            <para>
-              For details, see
-              <xref
-            linkend="vboxmanage-createvm" />.
-            </para>
-
-          </footnote>
-
-          like this:
+          immediately register it with &product-name;, use
+          <command>VBoxManage createvm</command> with the
+          <option>--register</option> option, as follows:
         </para>
 
@@ -157,4 +143,10 @@
           has been created with a new UUID and a new XML settings file.
         </para>
+
+        <para>
+          For more details, see
+          <xref
+            linkend="vboxmanage-createvm" />.
+        </para>
       </listitem>
 
@@ -162,5 +154,5 @@
         <para>
           To show the configuration of a particular VM, use
-          <computeroutput>VBoxManage showvminfo</computeroutput>. See
+          <command>VBoxManage showvminfo</command>. See
           <xref
         linkend="vboxmanage-showvminfo" /> for details
@@ -172,21 +164,20 @@
         <para>
           To change settings while a VM is powered off, use
-          <computeroutput>VBoxManage modifyvm</computeroutput>. For
-          example:
+          <command>VBoxManage modifyvm</command>. For example:
+        </para>
 
 <screen>VBoxManage modifyvm "Windows XP" --memory 512</screen>
-        </para>
-
-        <para>
-          For details, see <xref linkend="vboxmanage-modifyvm" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          To change the storage configuration (e.g. to add a storage
-          controller and then a virtual disk), use
-          <computeroutput>VBoxManage storagectl</computeroutput> and
-          <computeroutput>VBoxManage storageattach</computeroutput>. See
+
+        <para>
+          See also <xref linkend="vboxmanage-modifyvm" />.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          To change the storage configuration, such as to add a storage
+          controller and then a virtual disk, use <command>VBoxManage
+          storagectl</command> and <command>VBoxManage
+          storageattach</command>. See
           <xref
         linkend="vboxmanage-storagectl" /> and
@@ -206,5 +197,5 @@
             <para>
               To start a VM that is currently powered off, use
-              <computeroutput>VBoxManage startvm</computeroutput>. See
+              <command>VBoxManage startvm</command>. See
               <xref
               linkend="vboxmanage-startvm" />.
@@ -215,6 +206,6 @@
             <para>
               To pause or save a VM that is currently running or change
-              some of its settings, use <computeroutput>VBoxManage
-              controlvm</computeroutput>. See
+              some of its settings, use <command>VBoxManage
+              controlvm</command>. See
               <xref
               linkend="vboxmanage-controlvm" />.
@@ -234,10 +225,10 @@
 
     <para>
-      When running VBoxManage without parameters or when supplying an
-      invalid command line, the below syntax diagram will be shown. Note
-      that the output will be slightly different depending on the host
-      platform; when in doubt, check the output of
-      <computeroutput>VBoxManage</computeroutput> for the commands
-      available on your particular host.
+      When running <command>VBoxManage</command> without parameters or
+      when supplying an invalid command line, the following command
+      syntax list is shown. Note that the output will be slightly
+      different depending on the host platform. If in doubt, check the
+      output of <command>VBoxManage</command> for the commands available
+      on your particular host.
     </para>
 
@@ -246,8 +237,9 @@
 
     <para>
-      Each time VBoxManage is invoked, only one command can be executed.
-      However, a command might support several subcommands which then
-      can be invoked in one single call. The following sections provide
-      detailed reference information on the different commands.
+      Each time <command>VBoxManage</command> is invoked, only one
+      command can be executed. However, a command might support several
+      subcommands which then can be invoked in one single call. The
+      following sections provide detailed reference information on the
+      different commands.
     </para>
 
@@ -262,5 +254,5 @@
       <listitem>
         <para>
-          <computeroutput>-v|--version</computeroutput>: show the
+          <computeroutput>-v|--version</computeroutput>: Show the
           version of this tool and exit.
         </para>
@@ -269,19 +261,19 @@
       <listitem>
         <para>
-          <computeroutput>--nologo</computeroutput>: suppress the output
-          of the logo information (useful for scripts)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--settingspw</computeroutput>: specifiy a
-          settings password
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--settingspwfile</computeroutput>: specify a
+          <computeroutput>--nologo</computeroutput>: Suppress the output
+          of the logo information. This option is useful for scripts.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--settingspw</computeroutput>: Specifiy a
+          settings password.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--settingspwfile</computeroutput>: Specify a
           file containing the settings password.
         </para>
@@ -292,11 +284,11 @@
     <para>
       The settings password is used for certain settings which need to
-      be stored encrypted for security reasons. At the moment, the only
-      encrypted setting is the iSCSI initiator secret (see
-      <xref linkend="vboxmanage-storageattach" /> for details). As long
-      as no settings password is specified, this information is stored
-      in <emphasis role="bold">plain text</emphasis>. After using the
+      be stored in encrypted form for security reasons. At the moment,
+      the only encrypted setting is the iSCSI initiator secret, see
+      <xref linkend="vboxmanage-storageattach" />. As long as no
+      settings password is specified, this information is stored in
+      <emphasis>plain text</emphasis>. After using the
       <computeroutput>--settingspw|--settingspwfile</computeroutput>
-      option once, it must be always used, otherwise the encrypted
+      option once, it must be always used. Otherwise, the encrypted
       setting cannot be unencrypted.
     </para>
@@ -309,12 +301,12 @@
 
     <para>
-      The <computeroutput>list</computeroutput> command gives relevant
-      information about your system and information about VirtualBox's
-      current settings.
-    </para>
-
-    <para>
-      The following subcommands are available with
-      <computeroutput>VBoxManage list</computeroutput>:
+      The <command>list</command> command gives relevant information
+      about your system and information about &product-name;'s current
+      settings.
+    </para>
+
+    <para>
+      The following subcommands are available with <command>VBoxManage
+      list</command>:
     </para>
 
@@ -323,85 +315,79 @@
       <listitem>
         <para>
-          <computeroutput>vms</computeroutput> lists all virtual
-          machines currently registered with VirtualBox. By default this
-          displays a compact list with each VM's name and UUID; if you
-          also specify <computeroutput>--long</computeroutput> or
+          <command>vms</command>: Lists all virtual machines currently
+          registered with &product-name;. By default this displays a
+          compact list with each VM's name and UUID. If you also specify
+          <computeroutput>--long</computeroutput> or
           <computeroutput>-l</computeroutput>, this will be a detailed
-          list as with the <computeroutput>showvminfo</computeroutput>
-          command (see below).
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>runningvms</computeroutput> lists all
-          currently running virtual machines by their unique identifiers
-          (UUIDs) in the same format as with
-          <computeroutput>vms</computeroutput>.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>ostypes</computeroutput> lists all guest
-          operating systems presently known to VirtualBox, along with
-          the identifiers used to refer to them with the
-          <computeroutput>modifyvm</computeroutput> command.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>hostdvds</computeroutput>,
-          <computeroutput>hostfloppies</computeroutput>, respectively,
-          list DVD, floppy, bridged networking and host-only networking
-          interfaces on the host, along with the name used to access
-          them from within VirtualBox.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>intnets</computeroutput> displays information
-          about the internal networks.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>bridgedifs</computeroutput>,
-          <computeroutput>hostonlyifs</computeroutput>,
-          <computeroutput>natnets</computeroutput> and
-          <computeroutput>dhcpservers</computeroutput>, respectively,
-          list bridged network interfaces, host-only network interfaces,
-          NAT network interfaces and DHCP servers currently available on
-          the host. Please see
-          <xref
-          linkend="networkingdetails" /> for details on
-          these.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>hostinfo</computeroutput> displays information
-          about the host system, such as CPUs, memory size and operating
-          system version.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>hostcpuids</computeroutput> dumps the CPUID
-          parameters for the host CPUs. This can be used for a more fine
-          grained analyis of the host's virtualization capabilities.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>hddbackends</computeroutput> lists all known
-          virtual disk back-ends of VirtualBox. For each such format
-          (such as VDI, VMDK or RAW), this lists the back-end's
+          list as with the <command>showvminfo</command> command, see
+          <xref linkend="vboxmanage-showvminfo"/>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>runningvms</command>: Lists all currently running
+          virtual machines by their unique identifiers (UUIDs) in the
+          same format as with <command>vms</command>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>ostypes</command>: Lists all guest operating systems
+          presently known to &product-name;, along with the identifiers
+          used to refer to them with the <command>modifyvm</command>
+          command.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>hostdvds</command>, <command>hostfloppies</command>:
+          Lists the DVD, floppy, bridged networking, and host-only
+          networking interfaces on the host, along with the name used to
+          access them from within &product-name;.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>intnets</command>: Displays information about the
+          internal networks.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>bridgedifs</command>, <command>hostonlyifs</command>,
+          <command>natnets</command>, <command>dhcpservers</command>:
+          Lists the bridged network interfaces, host-only network
+          interfaces, NAT network interfaces, and DHCP servers currently
+          available on the host. See
+          <xref linkend="networkingdetails" />.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>hostinfo</command>: Displays information about the
+          host system, such as CPUs, memory size, and operating system
+          version.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>hostcpuids</command>: Lists the CPUID parameters for
+          the host CPUs. This can be used for a more fine grained
+          analyis of the host's virtualization capabilities.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>hddbackends</command>: Lists all known virtual disk
+          back-ends of &product-name;. For each such format, such as
+          VDI, VMDK, or RAW, this subcommand lists the back-end's
           capabilities and configuration.
         </para>
@@ -410,75 +396,90 @@
       <listitem>
         <para>
-          <computeroutput>hdds</computeroutput>,
-          <computeroutput>dvds</computeroutput> and
-          <computeroutput>floppies</computeroutput> all give you
-          information about virtual disk images currently in use by
-          VirtualBox, including all their settings, the unique
-          identifiers (UUIDs) associated with them by VirtualBox and all
-          files associated with them. This is the command-line
-          equivalent of the Virtual Media Manager. See
-          <xref
-          linkend="vdis" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>usbhost</computeroutput> supplies information
-          about USB devices attached to the host, notably information
-          useful for constructing USB filters and whether they are
-          currently in use by the host.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>usbfilters</computeroutput> lists all global
-          USB filters registered with VirtualBox -- that is, filters for
-          devices which are accessible to all virtual machines -- and
-          displays the filter parameters.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>systemproperties</computeroutput> displays
-          some global VirtualBox settings, such as minimum and maximum
-          guest RAM and virtual hard disk size, folder settings and the
-          current authentication library in use.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>extpacks</computeroutput> displays all
-          VirtualBox extension packs currently installed. See
-          <xref
-          linkend="intro-installing" /> and
-          <xref
-          linkend="vboxmanage-extpack" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>groups</computeroutput> displays details of
-          the VM Groups. See <xref linkend="gui-vmgroups" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>webcams</computeroutput> displays a list of
-          webcams attached to the running VM. The output format is a
-          list of absolute paths or aliases that were used for attaching
-          the webcams to the VM using the webcam attach command.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>screenshotformats</computeroutput> displays a
-          list of available screenshot formats.
+          <command>hdds</command>, <command>dvds</command>,
+          <command>floppies</command>: Shows information about virtual
+          disk images currently in use by &product-name;, including all
+          their settings, the unique identifiers (UUIDs) associated with
+          them by &product-name; and all files associated with them.
+          This is the command-line equivalent of the Virtual Media
+          Manager. See <xref linkend="vdis" />.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>usbhost</command>: Shows information about USB
+          devices attached to the host, including information useful for
+          constructing USB filters and whether they are currently in use
+          by the host.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>usbfilters</command>: Lists all global USB filters
+          registered with &product-name; and displays the filter
+          parameters. Global USB filters are for devices which are
+          accessible to all virtual machines.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>systemproperties</command>: Displays some global
+          &product-name; settings, such as minimum and maximum guest RAM
+          and virtual hard disk size, folder settings and the current
+          authentication library in use.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>extpacks</command>: Displays all &product-name;
+          extension packs that are currently installed. See
+          <xref linkend="intro-installing" /> and
+          <xref linkend="vboxmanage-extpack" />.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>groups</command>: Displays details of the VM Groups.
+          See <xref linkend="gui-vmgroups" />.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>webcams</command>: Displays a list of webcams
+          attached to the running VM. The output format is a list of
+          absolute paths or aliases that were used for attaching the
+          webcams to the VM using the webcam attach command.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>screenshotformats</command>: Displays a list of
+          available screenshot formats.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>cloudproviders</command>: Displays a list of cloud
+          providers that are supported by &product-name;. &oci; is an
+          example of a cloud provider.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>cloudprofiles</command>: Displays a list of cloud
+          profiles that have been configured.
+        </para>
+
+        <para>
+          Cloud profiles are used when exporting VMs to a cloud service.
+          See <xref linkend="ovf-export-oci"/>.
         </para>
       </listitem>
@@ -493,15 +494,14 @@
 
     <para>
-      The <computeroutput>showvminfo</computeroutput> command shows
-      information about a particular virtual machine. This is the same
-      information as <computeroutput>VBoxManage list vms
-      --long</computeroutput> would show for all virtual machines.
-    </para>
-
-    <para>
-      You will get information that resembles the following example.
-    </para>
-
-    <para>
+      The <command>showvminfo</command> command shows information about
+      a particular virtual machine. This is the same information as
+      <command>VBoxManage list vms --long</command> would show for all
+      virtual machines.
+    </para>
+
+    <para>
+      You will see information as shown in the following example.
+    </para>
+
 <screen>$ VBoxManage showvminfo "Windows XP"
 VirtualBox Command Line Management Interface Version <replaceable>version-number</replaceable>
@@ -525,21 +525,18 @@
 ...
     </screen>
-    </para>
 
     <para>
       Use the <computeroutput>--machinereadable</computeroutput> option
-      to produce the same output, but in machine readable format:
-      property="value" on a line by line basis, e.g.:
-    </para>
-
-    <para>
+      to produce the same output, but in machine readable format with a
+      property=value string on each line. For example:
+    </para>
+
 <screen>
-name="VBoxSDL --startvm OL7.2"
+...
 groups="/"
 ostype="Oracle (64-bit)"
 UUID="457af700-bc0a-4258-aa3c-13b03da171f2"
 ...
-    </screen>
-    </para>
+ </screen>
 
   </sect1>
@@ -550,30 +547,29 @@
 
     <para>
-      The <computeroutput>registervm</computeroutput> command allows you
-      to import a virtual machine definition in an XML file into
-      VirtualBox. The machine must not conflict with one already
-      registered in VirtualBox and it may not have any hard or removable
-      disks attached. It is advisable to place the definition file in
-      the machines folder before registering it.
-
-      <note>
-        <para>
-          When creating a new virtual machine with
-          <computeroutput>VBoxManage createvm</computeroutput> (see
-          below), you can directly specify the
-          <computeroutput>--register</computeroutput> option to avoid
-          having to register it separately.
-        </para>
-      </note>
-    </para>
-
-    <para>
-      The <computeroutput>unregistervm</computeroutput> command
-      unregisters a virtual machine. If
-      <computeroutput>--delete</computeroutput> is also specified, the
-      following files will automatically be deleted as well:
-    </para>
-
-    <orderedlist>
+      The <computeroutput>registervm</computeroutput> command enables
+      you to import a virtual machine definition in an XML file into
+      &product-name;. The machine must not conflict with one already
+      registered in &product-name; and it may not have any hard or
+      removable disks attached. It is advisable to place the definition
+      file in the machines folder before registering it.
+    </para>
+
+    <note>
+      <para>
+        When creating a new virtual machine with <command>VBoxManage
+        createvm</command>, as shown in
+        <xref linkend="vboxmanage-createvm"/>, you can directly specify
+        the <option>--register</option> option to avoid having to
+        register it separately.
+      </para>
+    </note>
+
+    <para>
+      The <command>unregistervm</command> command unregisters a virtual
+      machine. If <option>--delete</option> is also specified, the
+      following files will also be deleted automatically:
+    </para>
+
+    <itemizedlist>
 
       <listitem>
@@ -587,11 +583,11 @@
         <para>
           Saved state files that the machine created. One if the machine
-          was in "saved" state and one for each online snapshot.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The machine XML file and its backups,
+          was in Saved state and one for each online snapshot.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          The machine XML file and its backups.
         </para>
       </listitem>
@@ -610,5 +606,5 @@
       </listitem>
 
-    </orderedlist>
+    </itemizedlist>
 
   </sect1>
@@ -619,67 +615,68 @@
 
     <para>
-      This command creates a new XML virtual machine definition file.
-    </para>
-
-    <para>
-      The <computeroutput>--name &lt;name&gt;</computeroutput> parameter
-      is required and must specify the name of the machine. Since this
-      name is used by default as the file name of the settings file
-      (with the extension <computeroutput>.xml</computeroutput>) and the
-      machine folder (a subfolder of the
+      The <command>VBoxManage createvm</command> command creates a new
+      XML virtual machine definition file.
+    </para>
+
+    <para>
+      You must specify the name of the VM by using <option>--name
+      <replaceable>name</replaceable></option>. This name is used by
+      default as the file name of the settings file that has the
+      <computeroutput>.xml</computeroutput> extension and the machine
+      folder, which is a subfolder of the
       <computeroutput>.config/VirtualBox/Machines</computeroutput>
-      folder - this folder name may vary depending on the operating
-      system and the version of VirtualBox which you are using), it must
-      conform to your host operating system's requirements for file name
-      specifications. If the VM is later renamed, the file and folder
-      names will change automatically.
-    </para>
-
-    <para>
-      However, if the <computeroutput>--basefolder
-      &lt;path&gt;</computeroutput> option is used, the machine folder
-      will be named <computeroutput>&lt;path&gt;</computeroutput>. In
-      this case, the names of the file and the folder will not change if
-      the virtual machine is renamed.
-    </para>
-
-    <para>
-      If the <computeroutput>--group &lt;group&gt;, ...</computeroutput>
-      option is used, the machine will be assigned membership of the
-      specified VM groups in the list. Note that group ids always start
-      with a <computeroutput>/</computeroutput> and can be nested. By
-      default, VMs are always assigned membership of the group
-      <computeroutput>/</computeroutput>.
-    </para>
-
-    <para>
-      If the <computeroutput>--ostype &lt;ostype&gt;</computeroutput>:
-      option is used, &lt;ostype&gt; specifies the guest operating
-      system to run in the VM. To learn about the available OS options,
-      run <computeroutput>VBoxManage list ostypes</computeroutput> .
-    </para>
-
-    <para>
-      If the <computeroutput>--uuid &lt;uuid&gt;</computeroutput>:
-      option is used, &lt;uuid&gt; specifies the VM uuid. This must be
-      unique within the namespace of the host, or that of the VM Group
-      if it is assigned to a VM group membership. By default, a unique
-      uuid within the appropriate namespace is automatically generated.
-    </para>
-
-    <para>
-      If the <computeroutput>--default</computeroutput> option is used,
-      default hardware configuration for specified guest operation
-      system will be applied. By default, VM is created with minimal
-      hardware.
-    </para>
-
-    <para>
-      By default, this command only creates the XML file without
-      automatically registering the VM with your VirtualBox
-      installation. To register the VM instantly, use the optional
-      <computeroutput>--register</computeroutput> option, or run
-      <computeroutput>VBoxManage registervm</computeroutput> separately
-      afterwards.
+      folder. Note that the machine folder path name varies based on the
+      OS type and the &product-name; version.
+    </para>
+
+    <para>
+      Ensure that the VM name conforms to the host OS's file name
+      requirements. If you later rename the VM, the file and folder
+      names will be updated to match the new name automatically.
+    </para>
+
+    <para>
+      The <option>--basefolder <replaceable>path</replaceable></option>
+      option specifies the machine folder path name. Note that the names
+      of the file and the folder do not change if you rename the VM.
+    </para>
+
+    <para>
+      The <option>--group <replaceable>group-ID</replaceable>,
+      ...</option> option assigns the VM to the specified groups. Note
+      that group IDs always start with
+      <computeroutput>/</computeroutput> so that they can be nested. By
+      default, each VM is assigned membership to the
+      <computeroutput>/</computeroutput> group.
+    </para>
+
+    <para>
+      The <option>--ostype <replaceable>ostype</replaceable></option>
+      option specifies the guest OS to run in the VM. Run the
+      <command>VBoxManage list ostypes</command> command to see the
+      available OS types.
+    </para>
+
+    <para>
+      The <option>--uuid <replaceable>uuid</replaceable></option> option
+      specifies the universal unique identifier (UUID) of the VM. The
+      UUID must be unique within the namespace of the host or of its VM
+      group memberships. By default, the <command>VBoxManage</command>
+      command automatically generates the UUID.
+    </para>
+
+    <para>
+      The <computeroutput>--default</computeroutput> option applies a
+      default hardware configuration for the specified guest OS. By
+      default, the VM is created with minimal hardware.
+    </para>
+
+    <para>
+      The <option>--register</option> option registers the VM with your
+      &product-name; installation. By default, the <command>VBoxManage
+      createvm</command> command creates only the XML configuration for
+      the VM but does not registered the VM. If you do not register the
+      VM at creation, you can run the <command>VBoxManage
+      registervm</command> command after you create the VM.
     </para>
 
@@ -694,17 +691,17 @@
       machine which is not running. Most of the properties that this
       command makes available correspond to the VM settings that
-      VirtualBox graphical user interface displays in each VM's
-      "Settings" dialog. These were described in
-      <xref linkend="BasicConcepts" />. Some of the more advanced
-      settings, however, are only available through the
-      <computeroutput>VBoxManage</computeroutput> interface.
-    </para>
-
-    <para>
-      These commands require that the machine is powered off (neither
-      running nor in "saved" state). Some machine settings can also be
-      changed while a machine is running; those settings will then have
-      a corresponding subcommand with the <computeroutput>VBoxManage
-      controlvm</computeroutput> subcommand. See
+      &product-name; graphical user interface displays in each VM's
+      <emphasis role="bold">Settings</emphasis> dialog. These are
+      described in <xref linkend="BasicConcepts" />. However, some of
+      the more advanced settings are only available through the
+      <command>VBoxManage</command> interface.
+    </para>
+
+    <para>
+      These commands require that the machine is powered off, neither
+      running nor in a Saved state. Some machine settings can also be
+      changed while a machine is running. Those settings will then have
+      a corresponding subcommand with the <command>VBoxManage
+      controlvm</command> subcommand. See
       <xref linkend="vboxmanage-controlvm" />.
     </para>
@@ -716,5 +713,5 @@
       <para>
         The following general settings are available through
-        <computeroutput>VBoxManage modifyvm</computeroutput>:
+        <command>VBoxManage modifyvm</command>:
       </para>
 
@@ -723,6 +720,6 @@
         <listitem>
           <para>
-            <computeroutput>--name &lt;name&gt;</computeroutput>: This
-            changes the VM's name and can be used to rename the internal
+            <computeroutput>--name &lt;name&gt;</computeroutput>:
+            Changes the VM's name and can be used to rename the internal
             virtual machine files, as described in
             <xref linkend="vboxmanage-createvm"/>.
@@ -733,6 +730,6 @@
           <para>
             <computeroutput>--groups &lt;group&gt;,
-            ...</computeroutput>: This changes the group membership of a
-            VM. Groups always start with a
+            ...</computeroutput>: Changes the group membership of a VM.
+            Groups always start with a
             <computeroutput>/</computeroutput> and can be nested. By
             default VMs are in group <computeroutput>/</computeroutput>.
@@ -743,5 +740,5 @@
           <para>
             <computeroutput>--description &lt;desc&gt;</computeroutput>:
-            This changes the VM's description, which is a way to record
+            Changes the VM's description, which is a way to record
             details about the VM in a way which is meaningful for the
             user. The GUI interprets HTML formatting, the command line
@@ -754,8 +751,7 @@
           <para>
             <computeroutput>--ostype &lt;ostype&gt;</computeroutput>:
-            This specifies what guest operating system is supposed to
-            run in the VM. To learn about the various identifiers that
-            can be used here, use <computeroutput>VBoxManage list
-            ostypes</computeroutput>.
+            Specifies what guest operating system is supposed to run in
+            the VM. To learn about the various identifiers that can be
+            used here, use <command>VBoxManage list ostypes</command>.
           </para>
         </listitem>
@@ -764,7 +760,7 @@
           <para>
             <computeroutput>--iconfile
-            &lt;filename&gt;</computeroutput>: This specifies the
-            absolute path on the host file system for the VirtualBox
-            icon to be displayed in the VM.
+            &lt;filename&gt;</computeroutput>: Specifies the absolute
+            path on the host file system for the &product-name; icon to
+            be displayed in the VM.
           </para>
         </listitem>
@@ -773,7 +769,7 @@
           <para>
             <computeroutput>--memory
-            &lt;memorysize&gt;</computeroutput>: This sets the amount of
-            RAM, in MB, that the virtual machine should allocate for
-            itself from the host. See <xref linkend="gui-createvm" />.
+            &lt;memorysize&gt;</computeroutput>: Sets the amount of RAM,
+            in MB, that the virtual machine should allocate for itself
+            from the host. See <xref linkend="gui-createvm" />.
           </para>
         </listitem>
@@ -782,7 +778,8 @@
           <para>
             <computeroutput>--pagefusion on|off</computeroutput>:
-            Enables/disables (default) the Page Fusion feature. The Page
-            Fusion feature minimises memory duplication between VMs with
-            similar configurations running on the same host. See
+            Enables and disables the Page Fusion feature. Page Fusion is
+            disabled by default. The Page Fusion feature minimises
+            memory duplication between VMs with similar configurations
+            running on the same host. See
             <xref linkend="guestadd-pagefusion" />.
           </para>
@@ -792,6 +789,6 @@
           <para>
             <computeroutput>--vram &lt;vramsize&gt;</computeroutput>:
-            This sets the amount of RAM that the virtual graphics card
-            should have. See <xref linkend="settings-display" />.
+            Sets the amount of RAM that the virtual graphics card should
+            have. See <xref linkend="settings-display" />.
           </para>
         </listitem>
@@ -800,7 +797,6 @@
           <para>
             <computeroutput>--acpi on|off</computeroutput> and
-            <computeroutput>--ioapic on|off</computeroutput>: These
-            settings determine whether the VM should have ACPI and I/O
-            APIC support, respectively. See
+            <computeroutput>--ioapic on|off</computeroutput>: Determines
+            whether the VM has ACPI and I/O APIC support. See
             <xref linkend="settings-motherboard" />.
           </para>
@@ -829,8 +825,8 @@
             <computeroutput>--hardwareuuid
             &lt;uuid&gt;</computeroutput>: The UUID presented to the
-            guest via memory tables (DMI/SMBIOS), hardware and guest
-            properties. By default this is the same as the VM uuid.
-            Useful when cloning a VM. Teleporting takes care of this
-            automatically.
+            guest through memory tables (DMI/SMBIOS), hardware, and
+            guest properties. By default this is the same as the VM
+            UUID. This setting is useful when cloning a VM. Teleporting
+            takes care of this automatically.
           </para>
         </listitem>
@@ -839,16 +835,16 @@
           <para>
             <computeroutput>--cpus &lt;cpucount&gt;</computeroutput>:
-            This sets the number of virtual CPUs for the virtual
-            machine, see <xref linkend="settings-processor" />. If CPU
-            hot-plugging is enabled, this then sets the
-            <emphasis>maximum</emphasis> number of virtual CPUs that can
-            be plugged into the virtual machines.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cpuhotplug on|off</computeroutput>: This
-            enables CPU hot-plugging. When enabled, virtual CPUs can be
+            Sets the number of virtual CPUs for the virtual machine, see
+            <xref linkend="settings-processor" />. If CPU hot-plugging
+            is enabled, this then sets the <emphasis>maximum</emphasis>
+            number of virtual CPUs that can be plugged into the virtual
+            machines.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cpuhotplug on|off</computeroutput>:
+            Enables CPU hot-plugging. When enabled, virtual CPUs can be
             added to and removed from a virtual machine while it is
             running. See <xref linkend="cpuhotplug" />.
@@ -860,10 +856,11 @@
             <computeroutput>--plugcpu|unplugcpu
             &lt;id&gt;</computeroutput>: If CPU hot-plugging is enabled,
-            this adds or removes a virtual CPU on the virtual machine.
-            <computeroutput>&lt;id&gt;</computeroutput> specifies the
-            index of the virtual CPU to be added or removed and must be
-            a number from 0 to the maximum no. of CPUs configured with
-            the <computeroutput>--cpus</computeroutput> option. CPU 0
-            can never be removed.
+            this setting adds or removes a virtual CPU on the virtual
+            machine. <computeroutput>&lt;id&gt;</computeroutput>
+            specifies the index of the virtual CPU to be added or
+            removed and must be a number from 0 to the maximum number of
+            CPUs configured with the
+            <computeroutput>--cpus</computeroutput> option. CPU 0 can
+            never be removed.
           </para>
         </listitem>
@@ -872,14 +869,21 @@
           <para>
             <computeroutput>--cpuexecutioncap
-            &lt;1-100&gt;</computeroutput>: This setting controls how
-            much CPUtime a virtual CPU can use. A value of 50 implies a
-            single virtual CPU can use up to 50% of a single host CPU.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--pae on|off</computeroutput>: This
-            enables/disables PAE. See
+            &lt;1-100&gt;</computeroutput>: Controls how much CPU time a
+            virtual CPU can use. A value of 50 implies a single virtual
+            CPU can use up to 50% of a single host CPU.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--pae on|off</computeroutput>: Enables and
+            disables PAE. See <xref linkend="settings-processor" />.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--longmode on|off</computeroutput>: Enables
+            and disables long mode. See
             <xref linkend="settings-processor" />.
           </para>
@@ -888,17 +892,9 @@
         <listitem>
           <para>
-            <computeroutput>--longmode on|off</computeroutput>: This
-            enables/disables long mode. See
-            <xref linkend="settings-processor" />.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--spec-ctrl on|off</computeroutput>: This
-            setting enables/disables exposing speculation control
-            interfaces to the guest, provided they are available on the
-            host. Depending on the host CPU and workload, enabling
-            speculation control may significantly reduce performance.
+            <computeroutput>--spec-ctrl on|off</computeroutput>: Enables
+            and disables the exposure of speculation control interfaces
+            to the guest, provided they are available on the host.
+            Depending on the host CPU and workload, enabling speculation
+            control may significantly reduce performance.
           </para>
         </listitem>
@@ -907,17 +903,16 @@
           <para>
             <computeroutput>--cpu-profile &lt;host|intel
-            80[86|286|386]&gt;</computeroutput>: This enables
-            specification of a profile for guest CPU emulation. Specify
-            either one based on the host system CPU (host), or one from
-            a number of older Intel Micro-architectures - 8086, 80286,
-            80386.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--hpet on|off</computeroutput>: This
-            enables/disables a High Precision Event Timer (HPET) which
-            can replace the legacy system timers. This is turned off by
+            80[86|286|386]&gt;</computeroutput>: Enables specification
+            of a profile for guest CPU emulation. Specify either one
+            based on the host system CPU (host), or one from a number of
+            older Intel Micro-architectures: 8086, 80286, 80386.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--hpet on|off</computeroutput>: Enables and
+            disables a High Precision Event Timer (HPET) which can
+            replace the legacy system timers. This is turned off by
             default. Note that Windows supports a HPET only from Vista
             onwards.
@@ -927,8 +922,8 @@
         <listitem>
           <para>
-            <computeroutput>--hwvirtex on|off</computeroutput>: This
-            enables or disables the use of hardware virtualization
-            extensions (Intel VT-x or AMD-V) in the processor of your
-            host system. See <xref linkend="hwvirt" />.
+            <computeroutput>--hwvirtex on|off</computeroutput>: Enables
+            and disables the use of hardware virtualization extensions,
+            such as Intel VT-x or AMD-V, in the processor of your host
+            system. See <xref linkend="hwvirt" />.
           </para>
         </listitem>
@@ -937,30 +932,30 @@
           <para>
             <computeroutput>--triplefaultreset on|off</computeroutput>:
-            This setting enables resetting of the guest instead of
-            triggering a Guru Meditation. Some guests raise a triple
-            fault to reset the CPU so sometimes this is desired
-            behavior. Works only for non-SMP guests.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--apic on|off</computeroutput>: This setting
-            enables(default)/disables IO APIC. With I/O APIC, operating
-            systems can use more than 16 interrupt requests (IRQs) thus
-            avoiding IRQ sharing for improved reliability. See
-            <xref linkend="settings-motherboard" />.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--x2apic on|off</computeroutput>: This
-            setting enables(default)/disables CPU x2APIC support. CPU
-            x2APIC support helps operating systems run more efficiently
-            on high core count configurations, and optimizes interrupt
-            distribution in virtualized environments. Disable when using
-            host/guest operating systems incompatible with x2APIC
-            support.
+            Enables resetting of the guest instead of triggering a Guru
+            Meditation. Some guests raise a triple fault to reset the
+            CPU so sometimes this is desired behavior. Works only for
+            non-SMP guests.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--apic on|off</computeroutput>: Enables and
+            disables I/O APIC. With I/O APIC, operating systems can use
+            more than 16 interrupt requests (IRQs) thus avoiding IRQ
+            sharing for improved reliability. This setting is enabled by
+            default. See <xref linkend="settings-motherboard" />.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--x2apic on|off</computeroutput>: Enables
+            and disables CPU x2APIC support. CPU x2APIC support helps
+            operating systems run more efficiently on high core count
+            configurations, and optimizes interrupt distribution in
+            virtualized environments. This setting is enabled by
+            default. Disable this setting when using host or guest
+            operating systems that are incompatible with x2APIC support.
           </para>
         </listitem>
@@ -970,18 +965,18 @@
             <computeroutput>--paravirtprovider
             none|default|legacy|minimal|hyperv|kvm</computeroutput>:
-            This setting specifies which paravirtualization interface to
-            provide to the guest operating system. Specifying
+            Specifies which paravirtualization interface to provide to
+            the guest operating system. Specifying
             <computeroutput>none</computeroutput> explicitly turns off
             exposing any paravirtualization interface. The option
-            <computeroutput>default</computeroutput>, will pick an
-            appropriate interface depending on the guest OS type while
-            starting the VM. This is the default option chosen while
+            <computeroutput>default</computeroutput> selects an
+            appropriate interface when starting the VM, depending on the
+            guest OS type. This is the default option chosen when
             creating new VMs. The
-            <computeroutput>legacy</computeroutput> option is chosen for
-            VMs which were created with older VirtualBox versions and
-            will pick a paravirtualization interface while starting the
-            VM with VirtualBox 5.0 and newer. The
+            <computeroutput>legacy</computeroutput> option is used for
+            VMs which were created with older &product-name; versions
+            and will pick a paravirtualization interface when starting
+            the VM with &product-name; 5.0 and newer. The
             <computeroutput>minimal</computeroutput> provider is
-            mandatory for Mac OS X guests, while
+            mandatory for Mac OS X guests.
             <computeroutput>kvm</computeroutput> and
             <computeroutput>hyperv</computeroutput> are recommended for
@@ -993,10 +988,10 @@
         <listitem>
           <para>
-            <computeroutput>--paravirtdebug &lt;key=value&gt;
-            [,&lt;key=value&gt; ...]</computeroutput>: This setting
-            specifies debugging options specific to the
-            paravirtualization provider configured for this VM. See the
-            provider specific options in <xref linkend="gimdebug" /> for
-            a list of supported key-value pairs for each provider.
+            <computeroutput>--paravirtdebug &lt;keyword=value&gt;
+            [,&lt;keyword=value&gt; ...]</computeroutput>: Specifies
+            debugging options specific to the paravirtualization
+            provider configured for this VM. See the provider specific
+            options in <xref linkend="gimdebug" /> for a list of
+            supported keyword-value pairs for each provider.
           </para>
         </listitem>
@@ -1030,6 +1025,5 @@
             this additional setting enables or disables the use of the
             tagged TLB (VPID) feature in the processor of your host
-            system. See <xref
-            linkend="hwvirt" />.
+            system. See <xref linkend="hwvirt" />.
           </para>
         </listitem>
@@ -1049,6 +1043,5 @@
             the Guest Additions are installed, this setting enables or
             disables hardware 3D acceleration. See
-            <xref
-            linkend="guestadd-3d" />.
+            <xref linkend="guestadd-3d" />.
           </para>
         </listitem>
@@ -1059,6 +1052,5 @@
             If the Guest Additions are installed, this setting enables
             or disables 2D video acceleration. See
-            <xref
-            linkend="guestadd-2d" />.
+            <xref linkend="guestadd-2d" />.
           </para>
         </listitem>
@@ -1067,9 +1059,8 @@
           <para>
             <computeroutput>--chipset piix3|ich9</computeroutput>: By
-            default VirtualBox emulates an Intel PIIX3 chipset. Usually
-            there is no reason to change the default setting unless this
-            is required to relax some of its constraints. See
-            <xref
-            linkend="settings-motherboard" />.
+            default, &product-name; emulates an Intel PIIX3 chipset.
+            Usually there is no reason to change the default setting
+            unless this is required to relax some of its constraints.
+            See <xref linkend="settings-motherboard" />.
           </para>
         </listitem>
@@ -1079,5 +1070,5 @@
             You can influence the BIOS logo that is displayed when a
             virtual machine starts up with a number of settings. By
-            default, a VirtualBox logo is displayed.
+            default, an &product-name; logo is displayed.
           </para>
 
@@ -1098,9 +1089,9 @@
           <para>
             With <computeroutput>--bioslogoimagepath
-            &lt;imagepath&gt;</computeroutput> you can, if you are so
-            inclined, replace the image that is shown, with your own
-            logo. The image must be an uncompressed 256 color BMP file
-            without color space information (Windows 3.0 format). The
-            image must not be bigger than 640 x 480.
+            &lt;imagepath&gt;</computeroutput> you can replace the image
+            that is shown with your own logo. The image must be an
+            uncompressed 256 color BMP file without color space
+            information (Windows 3.0 format). The image must not be
+            bigger than 640 x 480.
           </para>
         </listitem>
@@ -1109,10 +1100,9 @@
           <para>
             <computeroutput>--biosbootmenu
-            disabled|menuonly|messageandmenu</computeroutput>: This
-            specifies whether the BIOS allows the user to select a
-            temporary boot device.
-            <computeroutput>menuonly</computeroutput> suppresses the
-            message, but the user can still press F12 to select a
-            temporary boot device.
+            disabled|menuonly|messageandmenu</computeroutput>: Specifies
+            whether the BIOS enables the user to select a temporary boot
+            device. The <computeroutput>menuonly</computeroutput> option
+            suppresses the message, but the user can still press F12 to
+            select a temporary boot device.
           </para>
         </listitem>
@@ -1121,5 +1111,5 @@
           <para>
             <computeroutput>--biosapic
-            x2apic|apic|disabled</computeroutput>: This specifies the
+            x2apic|apic|disabled</computeroutput>: Specifies the
             firmware APIC level to be used. Options are: x2apic, apic or
             disabled (no apic or x2apic) respectively.
@@ -1127,9 +1117,9 @@
 
           <para>
-            Note that if x2apic is specified and x2apic is unsupported
-            by the VCPU, biosapic downgrades to apic, if supported -
-            otherwise down to 'disabled'. Similarly, if apic is
-            specified, and apic is unsupported a downgrade to 'disabled'
-            results.
+            Note that if x2apic is specified and x2APIC is unsupported
+            by the VCPU, biosapic downgrades to apic, if supported.
+            Otherwise biosapic downgrades to disabled. Similarly, if
+            apic is specified, and APIC is unsupported, a downgrade to
+            disabled results.
           </para>
         </listitem>
@@ -1138,17 +1128,17 @@
           <para>
             <computeroutput>--biossystemtimeoffset
-            &lt;ms&gt;</computeroutput>: This specifies a fixed time
-            offset (milliseconds) of the guest relative to the host
-            time. If the offset is positive, the guest time runs ahead
-            of the host time.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--biospxedebug on|off</computeroutput>: This
-            option enables additional debugging output when using the
-            Intel PXE boot ROM. The output will be written to the
-            release log file (<xref linkend="collect-debug-info" />.
+            &lt;ms&gt;</computeroutput>: Specifies a fixed time offset,
+            in milliseconds, of the guest relative to the host time. If
+            the offset is positive, the guest time runs ahead of the
+            host time.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--biospxedebug on|off</computeroutput>:
+            Enables additional debugging output when using the Intel PXE
+            boot ROM. The output is written to the release log file. See
+            <xref linkend="collect-debug-info" />.
           </para>
         </listitem>
@@ -1157,17 +1147,17 @@
           <para>
             <computeroutput>--boot&lt;1-4&gt;
-            none|floppy|dvd|disk|net</computeroutput>: This specifies
-            the boot order for the virtual machine. There are four
-            "slots", which the VM will try to access from 1 to 4, and
-            for each of which you can set a device that the VM should
-            attempt to boot from.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--rtcuseutc on|off</computeroutput>: This
-            option lets the real-time clock (RTC) operate in UTC time.
-            See <xref linkend="settings-motherboard" />.
+            none|floppy|dvd|disk|net</computeroutput>: Specifies the
+            boot order for the virtual machine. There are four
+            <emphasis>slots</emphasis>, which the VM will try to access
+            from 1 to 4, and for each of which you can set a device that
+            the VM should attempt to boot from.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--rtcuseutc on|off</computeroutput>: Sets
+            the real-time clock (RTC) to operate in UTC time. See
+            <xref linkend="settings-motherboard" />.
           </para>
         </listitem>
@@ -1176,7 +1166,7 @@
           <para>
             <computeroutput>--graphicscontroller
-            none|vboxvga|vmsvga</computeroutput>: This option specifies
-            use of a graphics controller, and type chosen from vboxvga
-            or vmsvga. <xref linkend="settings-motherboard" />).
+            none|vboxvga|vmsvga|vboxsvga</computeroutput>: Specifies the
+            use of a graphics controller, with an option to choose a
+            specific type. See <xref linkend="settings-screen" />.
           </para>
         </listitem>
@@ -1185,7 +1175,6 @@
           <para>
             <computeroutput>--snapshotfolder
-            default|&lt;path&gt;</computeroutput>: This option specifies
-            the folder in which snapshots will be kept for a virtual
-            machine.
+            default|&lt;path&gt;</computeroutput>: Specifies the folder
+            where snapshots are kept for a virtual machine.
           </para>
         </listitem>
@@ -1194,8 +1183,8 @@
           <para>
             <computeroutput>--firmware
-            bios|efi|efi32|efi64</computeroutput>: This option specifies
-            which firmware to be used to boot the VM: Available options
-            are: BIOS, or one of the EFI options: efi, efi32 or efi64.
-            Use EFI options with care.
+            bios|efi|efi32|efi64</computeroutput>: Specifies the
+            firmware to be used to boot the VM: Available options are:
+            BIOS, or one of the EFI options: efi, efi32, or efi64. Use
+            EFI options with care.
           </para>
         </listitem>
@@ -1204,8 +1193,8 @@
           <para>
             <computeroutput>--guestmemoryballoon
-            &lt;size&gt;</computeroutput> This option sets the default
-            size of the guest memory balloon, that is, memory allocated
-            by the VirtualBox Guest Additions from the guest operating
-            system and returned to the hypervisor for re-use by other
+            &lt;size&gt;</computeroutput> Sets the default size of the
+            guest memory balloon. This is the memory allocated by the
+            &product-name; Guest Additions from the guest operating
+            system and returned to the hypervisor for reuse by other
             virtual machines.
             <computeroutput>&lt;size&gt;</computeroutput> must be
@@ -1218,6 +1207,6 @@
           <para>
             <computeroutput>--defaultfrontend
-            default|&lt;name&gt;</computeroutput>: This option specifies
-            the default frontend to be used when starting this VM. See
+            default|&lt;name&gt;</computeroutput>: Specifies the default
+            frontend to be used when starting this VM. See
             <xref linkend="vboxmanage-startvm" />.
           </para>
@@ -1234,8 +1223,8 @@
       <para>
         The following networking settings are available through
-        <computeroutput>VBoxManage modifyvm</computeroutput>. With all
-        these settings, the decimal number directly following the option
-        name ("1-N" in the list below) specifies the virtual network
-        adapter whose settings should be changed.
+        <command>VBoxManage modifyvm</command>. With all these settings,
+        the decimal number directly following the option name, 1-N in
+        the list below, specifies the virtual network adapter whose
+        settings should be changed.
       </para>
 
@@ -1246,11 +1235,11 @@
             <computeroutput>--nic&lt;1-N&gt;
             none|null|nat|natnetwork|bridged|intnet|hostonly|generic</computeroutput>:
-            You can configure for each of the VM's virtual network
-            cards, what type of networking should be available. Options
-            are: not present (<computeroutput>none</computeroutput>),
-            not connected to the host
-            (<computeroutput>null</computeroutput>), use network address
-            translation (<computeroutput>nat</computeroutput>), use the
-            new network address translation engine
+            Configures the type of networking for each of the VM's
+            virtual network cards. Options are: not present
+            (<computeroutput>none</computeroutput>), not connected to
+            the host (<computeroutput>null</computeroutput>), use
+            network address translation
+            (<computeroutput>nat</computeroutput>), use the new network
+            address translation engine
             (<computeroutput>natnetwork</computeroutput>), bridged
             networking (<computeroutput>bridged</computeroutput>), or
@@ -1270,7 +1259,7 @@
             <computeroutput>--nictype&lt;1-N&gt;
             Am79C970A|Am79C973|82540EM|82543GC|82545EM|virtio</computeroutput>:
-            This enables you to specify which networking hardware
-            VirtualBox presents to the guest for a specified VM virtual
-            network card. See <xref linkend="nichardware" />.
+            Enables you to specify the networking hardware that
+            &product-name; presents to the guest for a specified VM
+            virtual network card. See <xref linkend="nichardware" />.
           </para>
         </listitem>
@@ -1279,17 +1268,17 @@
           <para>
             <computeroutput>--cableconnected&lt;1-N&gt;
-            on|off</computeroutput>: This enables you to temporarily
+            on|off</computeroutput>: Enables you to temporarily
             disconnect a virtual network interface, as if a network
             cable had been pulled from a real network card. This might
-            be useful e.g. for resetting certain software components in
-            the VM.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            With the "nictrace" options, you can optionally trace
-            network traffic by dumping it to a file, for debugging
-            purposes.
+            be useful, for example for resetting certain software
+            components in the VM.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            With the <computeroutput>nictrace</computeroutput> options,
+            you can optionally trace network traffic by dumping it to a
+            file, for debugging purposes.
           </para>
 
@@ -1312,6 +1301,7 @@
             <computeroutput>--nicproperty&lt;1-N&gt;
             &lt;paramname&gt;="paramvalue"</computeroutput>: This
-            option, in combination with "nicgenericdrv" allows you to
-            pass parameters to rarely-used network backends.
+            option, in combination with
+            <computeroutput>nicgenericdrv</computeroutput> enables you
+            to pass parameters to rarely-used network backends.
           </para>
 
@@ -1319,6 +1309,5 @@
             These parameters are backend engine-specific, and are
             different between UDP Tunnel and the VDE backend drivers.
-            For examples, please see
-            <xref linkend="network_udp_tunnel" />.
+            For examples, see <xref linkend="network_udp_tunnel" />.
           </para>
         </listitem>
@@ -1327,11 +1316,10 @@
           <para>
             <computeroutput>--nicspeed&lt;1-N&gt;
-            &lt;kbps&gt;</computeroutput>: If generic networking has
-            been enabled for a particular virtual network card (see the
-            <computeroutput>--nic</computeroutput> option above -
-            otherwise this setting has no effect), this mode enables
-            access to rarely used networking sub-modes, such as VDE
-            network or UDP Tunnel. This option specifies the throughput
-            rate in KBytes/sec.
+            &lt;kbps&gt;</computeroutput>: Only has an effect if generic
+            networking has been enabled for a particular virtual network
+            card. See the <computeroutput>--nic</computeroutput> option.
+            This mode enables access to rarely used networking
+            sub-modes, such as VDE network or UDP Tunnel. This option
+            specifies the throughput rate in KBps.
           </para>
         </listitem>
@@ -1340,7 +1328,7 @@
           <para>
             <computeroutput>--nicbootprio&lt;1-N&gt;
-            &lt;priority&gt;</computeroutput>: This specifies the order
-            in which NICs are tried for booting over the network (using
-            PXE). The priority is an integer in the 0 to 4 range.
+            &lt;priority&gt;</computeroutput>: Specifies the order in
+            which NICs are tried for booting over the network, using
+            PXE. The priority is an integer in the 0 to 4 range.
             Priority 1 is the highest, priority 4 is low. Priority 0,
             which is the default unless otherwise specified, is the
@@ -1349,5 +1337,5 @@
 
           <para>
-            Note that this option only has effect when the Intel PXE
+            Note that this option only has an effect when the Intel PXE
             boot ROM is used.
           </para>
@@ -1357,13 +1345,12 @@
           <para>
             <computeroutput>--nicpromisc&lt;1-N&gt;
-            deny|allow-vms|allow-all</computeroutput>: This ernables you
-            to specify how the promiscuous mode is handled for the
-            specified VM virtual network card. This setting is only
-            relevant for bridged networking.
-            <computeroutput>deny</computeroutput> (default setting)
-            hides any traffic not intended for this VM.
-            <computeroutput>allow-vms</computeroutput> hides all host
-            traffic from this VM but allows the VM to see traffic
-            from/to other VMs.
+            deny|allow-vms|allow-all</computeroutput>: Enables you to
+            specify how promiscuous mode is handled for the specified VM
+            virtual network card. This setting is only relevant for
+            bridged networking. <computeroutput>deny</computeroutput>,
+            the default setting, hides any traffic not intended for the
+            VM. <computeroutput>allow-vms</computeroutput> hides all
+            host traffic from the VM, but allows the VM to see traffic
+            to and from other VMs.
             <computeroutput>allow-all</computeroutput> removes this
             restriction completely.
@@ -1374,7 +1361,7 @@
           <para>
             <computeroutput>--nicbandwidthgroup&lt;1-N&gt;
-            none|&lt;name&gt;</computeroutput>: This removes/adds an
-            assignment of a bandwidth group from/to the specified
-            virtual network interface. Specifying
+            none|&lt;name&gt;</computeroutput>: Adds and removes an
+            assignment of a bandwidth group for the specified virtual
+            network interface. Specifying
             <computeroutput>none</computeroutput> removes any current
             bandwidth group assignment from the specified virtual
@@ -1386,6 +1373,5 @@
 
           <para>
-            For details, please see
-            <xref linkend="network_bandwidth_limit" />.
+            See <xref linkend="network_bandwidth_limit" />.
           </para>
         </listitem>
@@ -1394,10 +1380,9 @@
           <para>
             <computeroutput>--bridgeadapter&lt;1-N&gt;
-            none|&lt;devicename&gt;</computeroutput>: If bridged
-            networking has been enabled for a virtual network card (see
-            the <computeroutput>--nic</computeroutput> option above),
-            otherwise this setting has no effect. Use this option to
-            specify which host interface the given virtual network
-            interface will use. For details, please see
+            none|&lt;devicename&gt;</computeroutput>: Only has an effect
+            if bridged networking has been enabled for a virtual network
+            card. See the <computeroutput>--nic</computeroutput> option.
+            Use this option to specify which host interface the given
+            virtual network interface will use. See
             <xref linkend="network_bridged" />.
           </para>
@@ -1407,10 +1392,10 @@
           <para>
             <computeroutput>--hostonlyadapter&lt;1-N&gt;
-            none|&lt;devicename&gt;</computeroutput>: If host-only
-            networking has been enabled for a virtual network card (see
-            the <computeroutput>--nic</computeroutput> option above),
-            otherwise this setting has no effect. Use this option to
-            specify which host-only networking interface the given
-            virtual network interface will use. For details, please see
+            none|&lt;devicename&gt;</computeroutput>: Only has an effect
+            if host-only networking has been enabled for a virtual
+            network card. See the <computeroutput>--nic</computeroutput>
+            option. Use this option to specify which host-only
+            networking interface the given virtual network interface
+            will use. See
             <xref
             linkend="network_hostonly" />.
@@ -1421,11 +1406,10 @@
           <para>
             <computeroutput>--intnet&lt;1-N&gt;
-            network</computeroutput>: If internal networking has been
-            enabled for a virtual network card (see the
-            <computeroutput>--nic</computeroutput> option above),
-            otherwise this setting has no effect. Ue this option to
-            specify the name of the internal network (see
+            network</computeroutput>: Only has an effect if internal
+            networking has been enabled for a virtual network card. See
+            the <computeroutput>--nic</computeroutput> option. Use this
+            option to specify the name of the internal network. See
             <xref
-            linkend="network_internal" />).
+            linkend="network_internal" />.
           </para>
         </listitem>
@@ -1435,6 +1419,6 @@
             <computeroutput>--nat-network&lt;1-N&gt; &lt;network
             name&gt;</computeroutput>: If the networking type is set to
-            <computeroutput>natnetwork</computeroutput> (not
-            <computeroutput>nat</computeroutput>) then this setting
+            <computeroutput>natnetwork</computeroutput>, not
+            <computeroutput>nat</computeroutput>, then this setting
             specifies the name of the NAT network this adapter is
             connected to. Optional.
@@ -1445,10 +1429,9 @@
           <para>
             <computeroutput>--nicgenericdrv&lt;1-N&gt; &lt;backend
-            driver&gt;</computeroutput>: If generic networking has been
-            enabled for a virtual network card (see the
-            <computeroutput>--nic</computeroutput> option above),
-            otherwise this setting has no effect. This mode allows you
-            to access rarely used networking sub-modes, such as VDE
-            network or UDP Tunnel.
+            driver&gt;</computeroutput>: Only has an effect if generic
+            networking has been enabled for a virtual network card. See
+            the <computeroutput>--nic</computeroutput> option. This mode
+            enables you to access rarely used networking sub-modes, such
+            as VDE network or UDP Tunnel.
           </para>
         </listitem>
@@ -1460,5 +1443,5 @@
             set the MAC address of a particular network adapter on the
             VM. Normally, each network adapter is assigned a random
-            address by VirtualBox at VM creation.
+            address by &product-name; at VM creation.
           </para>
         </listitem>
@@ -1472,8 +1455,8 @@
         <para>
           The following NAT networking settings are available through
-          <computeroutput>VBoxManage modifyvm</computeroutput>. With all
-          these settings, the decimal number directly following the
-          option name ("1-N" in the list below) specifies the virtual
-          network adapter whose settings should be changed.
+          <command>VBoxManage modifyvm</command>. With all these
+          settings, the decimal number directly following the option
+          name, 1-N in the list below, specifies the virtual network
+          adapter whose settings should be changed.
         </para>
 
@@ -1485,8 +1468,8 @@
               &lt;network&gt;|default</computeroutput>: If the
               networking type is set to
-              <computeroutput>nat</computeroutput> (not
-              <computeroutput>natnetwork</computeroutput>) then this
+              <computeroutput>nat</computeroutput>, not
+              <computeroutput>natnetwork</computeroutput>, then this
               setting specifies the IP address range to be used for this
-              network. See <xref linkend="changenat" /> for an example.
+              network. See <xref linkend="changenat" />.
             </para>
           </listitem>
@@ -1496,7 +1479,6 @@
               <computeroutput>--natpf&lt;1-N&gt;
               [&lt;name&gt;],tcp|udp,[&lt;hostip&gt;],&lt;hostport&gt;,[&lt;guestip&gt;],
-              &lt;guestport&gt;</computeroutput>: This setting defines a
-              NAT port-forwarding rule. See
-              <xref linkend="natforward" />.
+              &lt;guestport&gt;</computeroutput>: Defines a NAT
+              port-forwarding rule. See <xref linkend="natforward" />.
             </para>
           </listitem>
@@ -1505,5 +1487,5 @@
             <para>
               <computeroutput>--natpf&lt;1-N&gt; delete
-              &lt;name&gt;</computeroutput>: This setting deletes a NAT
+              &lt;name&gt;</computeroutput>: Deletes a NAT
               port-forwarding rule. See <xref linkend="natforward" />.
             </para>
@@ -1513,9 +1495,8 @@
             <para>
               <computeroutput>--nattftpprefix&lt;1-N&gt;
-              &lt;prefix&gt;</computeroutput>: This setting defines a
-              prefix for the built-in TFTP server, i.e. where the boot
-              file is located. See <xref linkend="nat-tftp" /> and
-              <xref
-              linkend="nat-adv-tftp" />.
+              &lt;prefix&gt;</computeroutput>: Defines a prefix for the
+              built-in TFTP server. For example, where the boot file is
+              located. See <xref linkend="nat-tftp" /> and
+              <xref linkend="nat-adv-tftp" />.
             </para>
           </listitem>
@@ -1524,6 +1505,6 @@
             <para>
               <computeroutput>--nattftpfile&lt;1-N&gt;
-              &lt;bootfile&gt;</computeroutput>: This setting defines
-              the TFT boot file. See <xref linkend="nat-adv-tftp" />.
+              &lt;bootfile&gt;</computeroutput>: Defines the TFT boot
+              file. See <xref linkend="nat-adv-tftp" />.
             </para>
           </listitem>
@@ -1532,8 +1513,7 @@
             <para>
               <computeroutput>--nattftpserver&lt;1-N&gt;
-              &lt;tftpserver&gt;</computeroutput>: This setting defines
-              the TFTP server address to boot from. See
-              <xref
-              linkend="nat-adv-tftp" />.
+              &lt;tftpserver&gt;</computeroutput>: Defines the TFTP
+              server address to boot from. See
+              <xref linkend="nat-adv-tftp" />.
             </para>
           </listitem>
@@ -1542,11 +1522,10 @@
             <para>
               <computeroutput>--nattbindip&lt;1-N&gt;
-              &lt;ip;&gt;</computeroutput>: VirtualBox's NAT engine
+              &lt;ip;&gt;</computeroutput>: &product-name;'s NAT engine
               normally routes TCP/IP packets through the default
               interface assigned by the host's TCP/IP stack. Use this
               setting to instruct the NAT engine to bind to a specified
               IP address instead. See
-              <xref
-              linkend="nat-adv-settings" />.
+              <xref linkend="nat-adv-settings" />.
             </para>
           </listitem>
@@ -1555,7 +1534,7 @@
             <para>
               <computeroutput>--natdnspassdomain&lt;1-N&gt;
-              on|off</computeroutput>: This setting specifies whether
-              the built-in DHCP server passes the domain name for
-              network name resolution.
+              on|off</computeroutput>: Specifies whether the built-in
+              DHCP server passes the domain name for network name
+              resolution.
             </para>
           </listitem>
@@ -1564,7 +1543,7 @@
             <para>
               <computeroutput>--natdnsproxy&lt;1-N&gt;
-              on|off</computeroutput>: This setting makes the NAT engine
-              proxy all guest DNS requests to the host's DNS servers.
-              See <xref linkend="nat-adv-dns" />.
+              on|off</computeroutput>: Makes the NAT engine proxy all
+              guest DNS requests to the host's DNS servers. See
+              <xref linkend="nat-adv-dns" />.
             </para>
           </listitem>
@@ -1573,7 +1552,7 @@
             <para>
               <computeroutput>--natdnshostresolver&lt;1-N&gt;
-              on|off</computeroutput>: This setting makes the NAT engine
-              use the host's resolver mechanisms to handle DNS requests.
-              See <xref linkend="nat-adv-dns" />.
+              on|off</computeroutput>: Makes the NAT engine use the
+              host's resolver mechanisms to handle DNS requests. See
+              <xref linkend="nat-adv-dns" />.
             </para>
           </listitem>
@@ -1583,7 +1562,6 @@
               <computeroutput>--natsettings&lt;1-N&gt;
               [&lt;mtu&gt;],[&lt;socksnd&gt;],[&lt;sockrcv&gt;],[&lt;tcpsnd&gt;],
-              [&lt;tcprcv&gt;]</computeroutput>: This setting controls
-              several NAT settings. See
-              <xref linkend="nat-adv-settings" />.
+              [&lt;tcprcv&gt;]</computeroutput>: Controls several NAT
+              settings. See <xref linkend="nat-adv-settings" />.
             </para>
           </listitem>
@@ -1593,11 +1571,10 @@
               <computeroutput>--nataliasmode&lt;1-N&gt;
               default|[log],[proxyonly],[sameports]</computeroutput>:
-              This setting defines behaviour of NAT engine core: log -
-              enables logging, proxyonly - switches of aliasing mode
-              makes NAT transparent, sameports enforces NAT engine to
-              send packets via the same port as they originated on,
-              default - disable all mentioned modes above. See
-              <xref
-              linkend="nat-adv-alias" />.
+              Defines behaviour of the NAT engine core: log - enables
+              logging, proxyonly - switches off aliasing mode and makes
+              NAT transparent, sameports - enforces the NAT engine to
+              send packets through the same port as they originated on,
+              default - disable all aliasing modes. See
+              <xref linkend="nat-adv-alias" />.
             </para>
           </listitem>
@@ -1615,6 +1592,6 @@
       <para>
         The following hardware settings, such as serial port, audio,
-        clipboard, drag and drop, monitor and USB settings are available
-        through <computeroutput>VBoxManage modifyvm</computeroutput>:
+        clipboard, drag and drop, monitor, and USB settings are
+        available through <command>VBoxManage modifyvm</command>:
       </para>
 
@@ -1641,8 +1618,6 @@
           <para>
             <computeroutput>--uart&lt;1-N&gt; off|&lt;I/O base&gt;
-            &lt;IRQ&gt;</computeroutput>: With this setting you can
-            configure virtual serial ports for the VM. See
-            <xref
-          linkend="serialports" />.
+            &lt;IRQ&gt;</computeroutput>: Configures virtual serial
+            ports for the VM. See <xref linkend="serialports" />.
           </para>
         </listitem>
@@ -1651,12 +1626,11 @@
           <para>
             <computeroutput>--uartmode&lt;1-N&gt;
-            &lt;arg&gt;</computeroutput>: This setting controls how
-            VirtualBox connects a given virtual serial port (previously
-            configured with the <computeroutput>--uartX</computeroutput>
-            setting, see above) to the host on which the virtual machine
-            is running. As described in <xref linkend="serialports" />,
-            for each such port, you can specify
-            <computeroutput>&lt;arg&gt;</computeroutput> as one of the
-            following options:
+            &lt;arg&gt;</computeroutput>: Controls how &product-name;
+            connects a given virtual serial port, configured with the
+            <computeroutput>--uartX</computeroutput> setting, to the
+            host on which the virtual machine is running. As described
+            in <xref linkend="serialports" />, for each such port, you
+            can specify <computeroutput>&lt;arg&gt;</computeroutput> as
+            one of the following options:
           </para>
 
@@ -1676,8 +1650,9 @@
                 <computeroutput>server
                 &lt;pipename&gt;</computeroutput>: On a Windows host,
-                this tells VirtualBox to create a named pipe on the host
-                named <computeroutput>&lt;pipename&gt;</computeroutput>
-                and connect the virtual serial device to it. Note that
-                Windows requires that the name of a named pipe begin
+                this tells &product-name; to create a named pipe on the
+                host named
+                <computeroutput>&lt;pipename&gt;</computeroutput> and
+                connect the virtual serial device to it. Note that
+                Windows requires that the name of a named pipe begins
                 with <computeroutput>\\.\pipe\</computeroutput>.
               </para>
@@ -1692,8 +1667,8 @@
               <para>
                 <computeroutput>client
-                &lt;pipename&gt;</computeroutput>: This operates just
-                like <computeroutput>server ...</computeroutput>, except
-                that the pipe, or local domain socket, is not created by
-                VirtualBox, but assumed to exist already.
+                &lt;pipename&gt;</computeroutput>: Operates as for
+                <computeroutput>server</computeroutput>, except that the
+                pipe, or local domain socket, is not created by
+                &product-name; but is assumed to exist already.
               </para>
             </listitem>
@@ -1702,7 +1677,8 @@
               <para>
                 <computeroutput>tcpserver &lt;port&gt;</computeroutput>:
-                This tells VirtualBox to create a TCP socket on the host
-                with TCP <computeroutput>&lt;port&gt;</computeroutput>
-                and connect the virtual serial device to it. Note that
+                Configures &product-name; to create a TCP socket on the
+                host with TCP
+                <computeroutput>&lt;port&gt;</computeroutput> and
+                connect the virtual serial device to it. Note that
                 UNIX-like systems require ports over 1024 for normal
                 users.
@@ -1713,15 +1689,24 @@
               <para>
                 <computeroutput>tcpclient
-                &lt;hostname:port&gt;</computeroutput>: This operates
-                just like <computeroutput>tcpserver
-                ...</computeroutput>, except that the TCP socket is not
-                created by VirtualBox, but assumed to exist already.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <computeroutput>file &lt;file&gt;</computeroutput>: This
-                redirects the serial port output to a raw file
+                &lt;hostname:port&gt;</computeroutput>: Operates as for
+                <computeroutput>tcpserver</computeroutput>, except that
+                the TCP socket is not created by &product-name;, but is
+                assumed to exist already.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <computeroutput>uarttype &lt;1-N&gt;
+                16450|16550A|16750</computeroutput>: Confgures the UART
+                type for a virtual serial port. The default UART type is
+                16550A.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <computeroutput>file &lt;file&gt;</computeroutput>:
+                Redirects the serial port output to a raw file
                 &lt;file&gt; specified by its absolute path on the host
                 file system.
@@ -1732,12 +1717,13 @@
               <para>
                 <computeroutput>&lt;devicename&gt;</computeroutput>: If,
-                instead of the above, the device name of a physical
-                hardware serial port of the host is specified, the
-                virtual serial port is connected to that hardware port.
-                On a Windows host, the device name will be a COM port
-                such as <computeroutput>COM1</computeroutput>; on a
-                Linux host, the device name will look like
-                <computeroutput>/dev/ttyS0</computeroutput>. This allows
-                you to "wire" a real serial port to a virtual machine.
+                instead of the above options, the device name of a
+                physical hardware serial port of the host is specified,
+                the virtual serial port is connected to that hardware
+                port. On a Windows host, the device name will be a COM
+                port such as <computeroutput>COM1</computeroutput>. On a
+                Linux host, the device name will be
+                <computeroutput>/dev/ttyS0</computeroutput> or similar.
+                This enables you to wire up a real serial port to a
+                virtual machine.
               </para>
             </listitem>
@@ -1752,8 +1738,8 @@
             of the parallel port that the Parallel Port feature will be
             using. Use this <emphasis>before</emphasis>
-            <computeroutput>--lpt</computeroutput>. This feature is host
-            operating system specific. For Windows hosts, use a device
-            name like <emphasis>lpt1</emphasis> while on Linux hosts you
-            have to use a device name like <emphasis>/dev/lp0</emphasis>
+            <computeroutput>--lpt</computeroutput>. This feature depends
+            on the host operating system. For Windows hosts, use a
+            device name such as lpt1. On Linux hosts, use a device name
+            such as /dev/lp0.
           </para>
         </listitem>
@@ -1776,9 +1762,8 @@
             <computeroutput>--audio
             none|null|dsound|oss|alsa|pulse|coreaudio</computeroutput>:
-            With this setting, you can specify whether the VM should
-            have audio support, and &ndash; if so &ndash; which type.
-            The list of supported audio types depends on the host and
-            can be determined with <computeroutput>VBoxManage
-            modifyvm</computeroutput>.
+            Specifies whether the VM should have audio support, and if
+            so, which type. The list of supported audio types depends on
+            the host and can be determined with <command>VBoxManage
+            modifyvm</command>.
           </para>
         </listitem>
@@ -1787,6 +1772,6 @@
           <para>
             <computeroutput>--audiocontroller
-            ac97|hda|sb16</computeroutput>: With this setting, you can
-            specify the audio controller to be used with this VM.
+            ac97|hda|sb16</computeroutput>: Specifies the audio
+            controller to be used with the VM.
           </para>
         </listitem>
@@ -1795,23 +1780,22 @@
           <para>
             <computeroutput>--audiocodec
-            stac9700|ad1980|stac9221|sb16</computeroutput>: With this
-            setting, you can specify the audio codec to be used with
-            this VM.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--audioin on</computeroutput>: With this
-            setting, you can specify whether capturing audio from the
-            host is enabled or disabled.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--audioout on</computeroutput>: With this
-            setting, you can specify whether audio playback from the
-            guest is enabled or disabled.
+            stac9700|ad1980|stac9221|sb16</computeroutput>: Specifies
+            the audio codec to be used with the VM.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--audioin on</computeroutput>: Specifies
+            whether capturing audio from the host is enabled or
+            disabled.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--audioout on</computeroutput>: Specifies
+            whether audio playback from the guest is enabled or
+            disabled.
           </para>
         </listitem>
@@ -1821,9 +1805,9 @@
             <computeroutput>--clipboard
             disabled|hosttoguest|guesttohost|bidirectional</computeroutput>:
-            With this setting, you can select if and how the guest or
-            host operating system's clipboard should be shared with the
-            host or guest. See <xref linkend="generalsettings" />. This
-            requires that the Guest Additions be installed in the
-            virtual machine.
+            Configues how the guest or host operating system's clipboard
+            should be shared with the host or guest. See
+            <xref linkend="generalsettings" />. This setting requires
+            that the Guest Additions be installed in the virtual
+            machine.
           </para>
         </listitem>
@@ -1833,8 +1817,8 @@
             <computeroutput>--draganddrop
             disabled|hosttoguest|guesttohost|bidirectional</computeroutput>:
-            With this setting, you can specify the current drag and drop
-            mode being used between the host and the virtual machine.
-            See <xref linkend="guestadd-dnd" />. This requires that the
-            Guest Additions be installed in the virtual machine.
+            Specifies the drag and drop mode to use between the host and
+            the virtual machine. See <xref linkend="guestadd-dnd" />.
+            This requires that the Guest Additions be installed in the
+            virtual machine.
           </para>
         </listitem>
@@ -1843,5 +1827,5 @@
           <para>
             <computeroutput>--monitorcount
-            &lt;count&gt;</computeroutput>: This enables multi-monitor
+            &lt;count&gt;</computeroutput>: Enables multi-monitor
             support. See <xref linkend="settings-display" />.
           </para>
@@ -1850,6 +1834,6 @@
         <listitem>
           <para>
-            <computeroutput>--usb on|off</computeroutput>: This setting
-            enables or disables the VM's virtual USB controller. See
+            <computeroutput>--usb on|off</computeroutput>: Enables and
+            disables the VM's virtual USB controller. See
             <xref
           linkend="settings-usb" />.
@@ -1859,15 +1843,15 @@
         <listitem>
           <para>
-            <computeroutput>--usbehci on|off</computeroutput>: This
-            setting enables or disables the VM's virtual USB 2.0
-            controller. See <xref linkend="settings-usb" />.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--usbxhci on|off</computeroutput>: This
-            setting enables or disables the VM's virtual USB 3.0
-            controller. See <xref linkend="settings-usb" />.
+            <computeroutput>--usbehci on|off</computeroutput>: Enables
+            and disables the VM's virtual USB 2.0 controller. See
+            <xref linkend="settings-usb" />.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--usbxhci on|off</computeroutput>: Enables
+            and disables the VM's virtual USB 3.0 controller. See
+            <xref linkend="settings-usb" />.
           </para>
         </listitem>
@@ -1876,7 +1860,7 @@
           <para>
             <computeroutput>--usbrename &lt;oldname&gt;
-            &lt;newname&gt;</computeroutput>: This setting enables
-            renaming of the VM's virtual USB controller from
-            &lt;oldname&gt; to &lt;newname&gt;.
+            &lt;newname&gt;</computeroutput>: Enables renaming of the
+            VM's virtual USB controller from &lt;oldname&gt; to
+            &lt;newname&gt;.
           </para>
         </listitem>
@@ -1891,113 +1875,108 @@
 
       <para>
-        The following settings for changing video and/or audio recording
-        parameters are available through <computeroutput>VBoxManage
-        modifyvm</computeroutput>.
+        The <command>VBoxManage modifyvm</command> command enables you
+        to modify recording settings for video recording, audio
+        recording, or both.
       </para>
 
+      <para>
+        Use the following options to update the recording settings:
+      </para>
+
       <itemizedlist>
 
         <listitem>
           <para>
-            <computeroutput>--recording on|off</computeroutput>: This
-            option enables or disables recording a VM session into a
-            file. If this option is enabled, recording will start when the
-            VM session is started.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--recordingscreens all|&lt;screen ID&gt;
-            [&lt;screen ID&gt; ...]</computeroutput>: This option allows
-            to specify which screens of the VM are being recorded. Each
-            screen is recorded into a separate file.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--recordingfile
-            &lt;filename&gt;</computeroutput>: This option sets the
-            filename VirtualBox uses to save the recorded content.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--recordingmaxtime
-            &lt;ms&gt;</computeroutput>: This option sets the maximum
-            time in milliseconds the recording will be enabled
-            since activation. The recording stops when the defined time
-            interval has elapsed. If this value is zero the recording is
-            not limited by time.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--recordingmaxsize
-            &lt;MB&gt;</computeroutput>: This option limits the maximum
-            size of the recorded file (in MB). The recording stops
-            when the file size has reached the specified size. If this
-            value is zero the recording will not be limited by file size.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--recordingopts &lt;key=value&gt;
-            [,&lt;key=value&gt; ...]</computeroutput>: This format can
-            be used to specify additional recording options. These
-            options only are for advanced users and must be specified in
-            a comma-separated key=value format. For example:
+            <option>--recording on|off</option> enables or disables the
+            recording of a VM session into a WebM/VP8 file. When this
+            option value is <computeroutput>on</computeroutput>,
+            recording begins when the VM session starts.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--recordingscreens
+            all|<replaceable>screen-ID</replaceable>
+            [<replaceable>screen-ID</replaceable> ...]</option> enables
+            you to specify which VM screens to record. The recording for
+            each screen that you specify is saved to its own file.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--recordingfile
+            <replaceable>filename</replaceable></option> specifies the
+            file in which to save the recording.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--recordingmaxsize
+            <replaceable>MB</replaceable></option> specifies the maximum
+            size of the recorded video file in megabytes. The recording
+            stops when the file reaches the specified size. If this
+            value is zero, the recording continues until you stop the
+            recording.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--recordingmaxtime
+            <replaceable>seconds</replaceable></option> specifies the
+            maximum amount time to record in seconds. The recording
+            stops after the specified number of seconds elapses. If this
+            value is zero, the recording continues until you stop the
+            recording.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--recordingopts
+            <replaceable>keyword</replaceable>=<replaceable>value</replaceable>[,<replaceable>keyword</replaceable>=<replaceable>value</replaceable>
+            ...]</option> specifies additional video-recording options
+            in a comma-separated keyword-value format. For example,
             <computeroutput>foo=bar,a=b</computeroutput>.
           </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--recordingvideores
-            &lt;width&gt;x&lt;height&gt;</computeroutput>: This option
-            sets the video resolution (in pixels) of the recorded file.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--recordingvideorate
-            &lt;rate&gt;</computeroutput>: This option sets the video bitrate
-            in kilobits (kb) per second. Increasing this value makes the
-            video look better for the cost of an increased file size.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--recordingvideofps &lt;fps&gt;</computeroutput>:
-            This option sets the maximum number of video frames per second
-            (FPS) to be recorded. Frames with a higher frequency will be
-            skipped. Reducing this value increases the number of skipped
-            frames and reduces the file size.
-          </para>
-
-          <para>
-            The following keys and their corresponding values are
-            available:
-          </para>
-
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                <computeroutput>ac_enabled</computeroutput>: Enables
-                audio recording when set to
-                <computeroutput>true</computeroutput>, otherwise set to
-                <computeroutput>false</computeroutput> to disable. This
-                feature is considered being experimental.
-              </para>
-            </listitem>
-
-          </itemizedlist>
+
+          <para>
+            Only use this option only if you are an advanced user. For
+            information about keywords, see <emphasis>Oracle VM
+            VirtualBox Programming Guide and Reference</emphasis>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--recordingvideofps
+            <replaceable>fps</replaceable></option> specifies the
+            maximum number of video frames per second (FPS) to record.
+            Frames that have a higher frequency are skipped. Increasing
+            this value reduces the number of skipped frames and
+            increases the file size.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--recordingvideorate
+            <replaceable>bit-rate</replaceable></option> specifies the
+            bit rate of the video in kilobits per second. Increasing
+            this value improves the appearance of the video at the cost
+            of an increased file size.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--recordingvideores
+            <replaceable>width</replaceable>x<replaceable>height</replaceable></option>
+            specifies the video resolution of the recorded video in
+            pixels.
+          </para>
         </listitem>
 
@@ -2012,6 +1991,5 @@
       <para>
         The following settings that affect remote machine behavior are
-        available through <computeroutput>VBoxManage
-        modifyvm</computeroutput>:
+        available through <command>VBoxManage modifyvm</command>:
       </para>
 
@@ -2020,6 +1998,6 @@
         <listitem>
           <para>
-            <computeroutput>--vrde on|off</computeroutput>: This enables
-            or disables the VirtualBox remote desktop extension (VRDE)
+            <computeroutput>--vrde on|off</computeroutput>: Enables and
+            disables the VirtualBox Remote Desktop Extension (VRDE)
             server.
           </para>
@@ -2029,6 +2007,6 @@
           <para>
             <computeroutput>--vrdeproperty
-            "TCP/Ports|Address=&lt;value&gt;"</computeroutput> sets the
-            port number(s) and IP address on the VM that the VRDE server
+            "TCP/Ports|Address=&lt;value&gt;"</computeroutput>: Sets the
+            port numbers and IP address on the VM that the VRDE server
             can bind to.
           </para>
@@ -2039,7 +2017,8 @@
               <para>
                 For TCP/Ports, &lt;value&gt; should be a port or a range
-                of ports that the VRDE server can bind to; "default" or
-                "0" means port 3389, the standard port for RDP. See the
-                description for the
+                of ports that the VRDE server can bind to.
+                <computeroutput>default</computeroutput> or
+                <computeroutput>0</computeroutput> means port 3389, the
+                standard port for RDP. See the description for the
                 <computeroutput>--vrdeport</computeroutput> option in
                 <xref
@@ -2067,6 +2046,6 @@
           <para>
             <computeroutput>--vrdeproperty
-            "VideoChannel/Enabled|Quality|DownscaleProtection=&lt;value&gt;"</computeroutput>
-            sets the VRDP video redirection properties.
+            "VideoChannel/Enabled|Quality|DownscaleProtection=&lt;value&gt;"</computeroutput>:
+            Sets the VRDP video redirection properties.
           </para>
 
@@ -2076,6 +2055,6 @@
               <para>
                 For VideoChannel/Enabled, &lt;value&gt; can be set to
-                "1" switching the VRDP video channel on. For details,
-                see <xref linkend="vrde-videochannel" />.
+                "1", switching the VRDP video channel on. See
+                <xref linkend="vrde-videochannel" />.
               </para>
             </listitem>
@@ -2112,8 +2091,5 @@
           <para>
             <computeroutput>--vrdeproperty
-            "Client/DisableDisplay|DisableInput|DisableAudio|DisableUSB=1"</computeroutput>
-          </para>
-
-          <para>
+            "Client/DisableDisplay|DisableInput|DisableAudio|DisableUSB=1"</computeroutput>:
             Disables one of the VRDE server features: Display, Input,
             Audio or USB respectively. To reenable a feature, use
@@ -2126,8 +2102,5 @@
           <para>
             <computeroutput>--vrdeproperty
-            "Client/DisableClipboard|DisableUpstreamAudio=1"</computeroutput>
-          </para>
-
-          <para>
+            "Client/DisableClipboard|DisableUpstreamAudio=1"</computeroutput>:
             Disables one of the VRDE server features: Clipboard or
             UpstreamAudio respectively. To reenable a feature, use
@@ -2140,11 +2113,7 @@
           <para>
             <computeroutput>--vrdeproperty
-            "Client/DisableRDPDR=1"</computeroutput>
-          </para>
-
-          <para>
-            Disables the VRDE server feature: RDP device redirection for
-            smart cards. To reenable this feature, use
-            "Client/DisableRDPR=".
+            "Client/DisableRDPDR=1"</computeroutput>: Disables the VRDE
+            server feature: RDP device redirection for smart cards. To
+            reenable this feature, use "Client/DisableRDPR=".
           </para>
         </listitem>
@@ -2153,10 +2122,7 @@
           <para>
             <computeroutput>--vrdeproperty
-            "H3DRedirect/Enabled=1"</computeroutput>
-          </para>
-
-          <para>
-            Enables the VRDE server feature: 3D redirection. To disable
-            this feature, use "H3DRedirect/Enabled=".
+            "H3DRedirect/Enabled=1"</computeroutput>: Enables the VRDE
+            server feature: 3D redirection. To disable this feature, use
+            "H3DRedirect/Enabled=".
           </para>
         </listitem>
@@ -2165,8 +2131,8 @@
           <para>
             <computeroutput>--vrdeproperty
-            "Security/Method|ServerCertificate|ServerPrivateKey|CACertificate=&lt;value&gt;"</computeroutput>
-            sets the desired security method/Path of server certificate,
-            path of server private key, path of CA certificate, used for
-            a connection.
+            "Security/Method|ServerCertificate|ServerPrivateKey|CACertificate=&lt;value&gt;"</computeroutput>:
+            Sets the desired security method and path of server
+            certificate, path of server private key, path of CA
+            certificate, that are used for a connection.
           </para>
 
@@ -2185,5 +2151,5 @@
                 <listitem>
                   <para>
-                    <computeroutput>Negotiate</computeroutput> - both
+                    <computeroutput>Negotiate</computeroutput>: Both
                     Enhanced (TLS) and Standard RDP Security connections
                     are allowed. The security method is negotiated with
@@ -2194,5 +2160,5 @@
                 <listitem>
                   <para>
-                    <computeroutput>RDP</computeroutput> - only Standard
+                    <computeroutput>RDP</computeroutput>: Only Standard
                     RDP Security is accepted.
                   </para>
@@ -2201,5 +2167,5 @@
                 <listitem>
                   <para>
-                    <computeroutput>TLS</computeroutput> - only Enhanced
+                    <computeroutput>TLS</computeroutput>: Only Enhanced
                     RDP Security is accepted. The client must support
                     TLS.
@@ -2219,5 +2185,5 @@
                 "Security/ServerCertificate=&lt;value&gt;"</computeroutput>
                 where &lt;value&gt; is the absolute path of the server
-                certificate. Ssee <xref linkend="vrde-crypt" />.
+                certificate. See <xref linkend="vrde-crypt" />.
               </para>
             </listitem>
@@ -2248,5 +2214,5 @@
             <computeroutput>--vrdeproperty
             "Audio/RateCorrectionMode|LogPath=&lt;value&gt;"</computeroutput>
-            sets the Audio connection mode, or Path of the audio
+            sets the audio connection mode, or path of the audio
             logfile.
           </para>
@@ -2258,6 +2224,6 @@
                 <computeroutput>--vrdeproperty
                 "Audio/RateCorrectionMode=&lt;value&gt;"</computeroutput>
-                where &lt;value&gt; is the desired rate correction mode,
-                allowed values are:
+                where &lt;value&gt; is the desired rate correction mode.
+                Allowed values are:
               </para>
 
@@ -2266,6 +2232,6 @@
                 <listitem>
                   <para>
-                    <computeroutput>VRDP_AUDIO_MODE_VOID</computeroutput>
-                    - no mode specified, use to unset any Audio mode
+                    <computeroutput>VRDP_AUDIO_MODE_VOID</computeroutput>:
+                    No mode specified, use to unset any Audio mode
                     already set.
                   </para>
@@ -2274,6 +2240,6 @@
                 <listitem>
                   <para>
-                    <computeroutput>VRDP_AUDIO_MODE_RC</computeroutput>
-                    - rate correction mode.
+                    <computeroutput>VRDP_AUDIO_MODE_RC</computeroutput>:
+                    Rate correction mode.
                   </para>
                 </listitem>
@@ -2281,6 +2247,6 @@
                 <listitem>
                   <para>
-                    <computeroutput>VRDP_AUDIO_MODE_LPF</computeroutput>
-                    - low pass filter mode.
+                    <computeroutput>VRDP_AUDIO_MODE_LPF</computeroutput>:
+                    Low pass filter mode.
                   </para>
                 </listitem>
@@ -2288,7 +2254,7 @@
                 <listitem>
                   <para>
-                    <computeroutput>VRDP_AUDIO_MODE_CS</computeroutput>
-                    - client sync mode to prevent under/overflow of the
-                    client queue.
+                    <computeroutput>VRDP_AUDIO_MODE_CS</computeroutput>:
+                    Client sync mode to prevent underflow or overflow of
+                    the client queue.
                   </para>
                 </listitem>
@@ -2312,8 +2278,8 @@
           <para>
             <computeroutput>--vrdeextpack
-            default|&lt;name&gt;</computeroutput>: Enables specification
-            of the library for accessing the VM remotely. The default is
-            to use the RDP code which is part of the Oracle VM
-            VirtualBox Extension Pack.
+            default|&lt;name&gt;</computeroutput>: Specifies the library
+            to use for accessing the VM remotely. The default is to use
+            the RDP code which is part of the &product-name; Extension
+            Pack.
           </para>
         </listitem>
@@ -2323,16 +2289,15 @@
             <computeroutput>--vrdeport
             default|&lt;ports&gt;</computeroutput>: A port or a range of
-            ports the VRDE server can bind to; "default" or "0" means
-            port 3389, the standard port for RDP. You can specify a
-            comma-separated list of ports or ranges of ports. Use a dash
-            between two port numbers to specify a range. The VRDE server
-            will bind to
-            <emphasis
-            role="bold">one</emphasis> of the
-            available ports from the specified list. Only one machine
-            can use a given port at a time. For example, the option
-            <computeroutput> --vrdeport 5000,5010-5012</computeroutput>
-            will tell the server to bind to one of following ports:
-            5000, 5010, 5011 or 5012.
+            ports the VRDE server can bind to.
+            <computeroutput>default</computeroutput> or
+            <computeroutput>0</computeroutput> means port 3389, the
+            standard port for RDP. You can specify a comma-separated
+            list of ports or ranges of ports. Use a dash between two
+            port numbers to specify a range. The VRDE server will bind
+            to <emphasis>one</emphasis> of the available ports from the
+            specified list. Only one machine can use a given port at a
+            time. For example, the option <computeroutput> --vrdeport
+            5000,5010-5012</computeroutput> will tell the server to bind
+            to one of following ports: 5000, 5010, 5011, or 5012.
           </para>
         </listitem>
@@ -2349,5 +2314,5 @@
           <para>
             The setting can be used to specify whether the VRDP server
-            should accept either IPv4, IPv6 or both connections:
+            should accept either IPv4, IPv6, or both connections:
           </para>
 
@@ -2370,6 +2335,10 @@
             <listitem>
               <para>
-                Both IPv6 and IPv4 (default):
-                <computeroutput>--vrdeaddress "" </computeroutput>
+                Both IPv6 and IPv4: <computeroutput>--vrdeaddress ""
+                </computeroutput>
+              </para>
+
+              <para>
+                This is the default setting.
               </para>
             </listitem>
@@ -2381,5 +2350,5 @@
           <para>
             <computeroutput>--vrdeauthtype
-            null|external|guest</computeroutput>: This enables you to
+            null|external|guest</computeroutput>: Enables you to
             indicate use of authorization, and specify how authorization
             will be performed. See <xref linkend="vbox-auth" />.
@@ -2390,7 +2359,7 @@
           <para>
             <computeroutput>--vrdeauthlibrary
-            default|&lt;name&gt;</computeroutput>: This specifies the
-            library used for RDP authentication. See
-            <xref
+            default|&lt;name&gt;</computeroutput>: Specifies the library
+            used for RDP authentication. See
+            <xref 
             linkend="vbox-auth" />.
           </para>
@@ -2399,8 +2368,8 @@
         <listitem>
           <para>
-            <computeroutput>--vrdemulticon on|off</computeroutput>: This
-            enables multiple connections to be made to the same VRDE
+            <computeroutput>--vrdemulticon on|off</computeroutput>:
+            Enables multiple connections to be made to the same VRDE
             server, if the server supports this feature. See
-            <xref
+            <xref 
             linkend="vrde-multiconnection" />.
           </para>
@@ -2422,6 +2391,6 @@
           <para>
             <computeroutput>--vrdevideochannel on|off</computeroutput>:
-            This enables video redirection, if it is supported by the
-            VRDE server. See <xref linkend="vrde-videochannel" />.
+            Enables video redirection, if it is supported by the VRDE
+            server. See <xref linkend="vrde-videochannel" />.
           </para>
         </listitem>
@@ -2432,5 +2401,5 @@
             &lt;percent&gt;</computeroutput>: Specifies the image
             quality for video redirection. See
-            <xref
+            <xref 
             linkend="vrde-videochannel" />.
           </para>
@@ -2446,7 +2415,7 @@
 
       <para>
-        With the following commands for <computeroutput>VBoxManage
-        modifyvm</computeroutput> you can configure a machine to be a
-        target for teleporting. See <xref linkend="teleporting" />.
+        With the following commands for <command>VBoxManage
+        modifyvm</command> you can configure a machine to be a target
+        for teleporting. See <xref linkend="teleporting" />.
       </para>
 
@@ -2455,7 +2424,7 @@
         <listitem>
           <para>
-            <computeroutput>--teleporter on|off</computeroutput>: This
-            setting enables/disables the teleporter feature whereby when
-            the machine is started, it waits to receieve a teleporting
+            <computeroutput>--teleporter on|off</computeroutput>:
+            Enables and disables the teleporter feature whereby when the
+            machine is started, it waits to receive a teleporting
             request from the network instead of booting normally.
             Teleporting requests are received on the port and address
@@ -2470,12 +2439,13 @@
             <computeroutput>--teleporteraddress
             &lt;address&gt;</computeroutput>: These settings must be
-            used with --teleporter and they specify the port and address
-            the virtual machine should listen to to receive a
-            teleporting request sent from another virtual machine.
+            used with <computeroutput>--teleporter</computeroutput>.
+            They specify the port and address the virtual machine should
+            listen to in order to receive a teleporting request sent
+            from another virtual machine.
             <computeroutput>&lt;port&gt;</computeroutput> can be any
             free TCP/IP port number, such as 6000.
             <computeroutput>&lt;address&gt;</computeroutput> can be any
             IP address or hostname and specifies the TCP/IP socket to
-            bind to. The default is "0.0.0.0", which means any address.
+            bind to. The default is 0.0.0.0, which means any address.
           </para>
         </listitem>
@@ -2485,5 +2455,5 @@
             <computeroutput>--teleporterpassword
             &lt;password&gt;</computeroutput>: If this optional setting
-            is given, then the teleporting request will only succeed if
+            is used, then the teleporting request will only succeed if
             the source machine specifies the same password as the one
             given with this command.
@@ -2495,5 +2465,5 @@
             <computeroutput>--teleporterpasswordfile
             &lt;password&gt;</computeroutput>: If this optional setting
-            is given, then the teleporting request will only succeed if
+            is used, then the teleporting request will only succeed if
             the source machine specifies the same password as the one
             specified in the file give with this command. Use
@@ -2507,14 +2477,15 @@
             <computeroutput>--cpuid &lt;leaf&gt; &lt;eax&gt; &lt;ebx&gt;
             &lt;ecx&gt; &lt;edx&gt;</computeroutput>: Advanced users can
-            use this setting before a teleporting operation to restrict
-            the virtual CPU capabilities that VirtualBox presents to the
-            guest operating system. This must be run on both the source
-            and the target machines involved in the teleporting and will
-            then modify what the guest sees when it executes the
-            <computeroutput>CPUID</computeroutput> machine instruction.
-            This might help with misbehaving applications that wrongly
-            assume that certain CPU capabilities are present. The
-            meaning of the parameters is hardware dependent, refer to
-            the AMD or Intel processor documentation.
+            use this setting before a teleporting operation, to restrict
+            the virtual CPU capabilities that &product-name; presents to
+            the guest operating system. This must be run on both the
+            source and the target machines involved in the teleporting
+            and will then modify what the guest sees when it executes
+            the <computeroutput>CPUID</computeroutput> machine
+            instruction. This might help with misbehaving applications
+            that wrongly assume that certain CPU capabilities are
+            present. The meaning of the parameters is hardware
+            dependent, refer to the AMD or Intel processor
+            documentation.
           </para>
         </listitem>
@@ -2538,5 +2509,5 @@
           <para>
             <computeroutput>--tracing-enabled on|off</computeroutput>:
-            Enable the tracebuffer. This consumes some memory for the
+            Enables the tracebuffer. This consumes some memory for the
             tracebuffer and adds extra overhead.
           </para>
@@ -2555,6 +2526,6 @@
           <para>
             <computeroutput>--tracing-allow-vm-access
-            on|off</computeroutput>: Enables/disables (default) VM
-            access to the tracebuffer.
+            on|off</computeroutput>: Enables and disables VM access to
+            the tracebuffer. By default, this setting is disabled.
           </para>
         </listitem>
@@ -2580,5 +2551,5 @@
           <para>
             <computeroutput>--usbcardreader on|off</computeroutput>:
-            Enables/disables the USB card reader interface.
+            Enables and disables the USB card reader interface.
           </para>
         </listitem>
@@ -2603,7 +2574,7 @@
         <listitem>
           <para>
-            <computeroutput>--autostart on|off</computeroutput>:
-            Enables/disables VM autostart at host system boot-up, using
-            specified user name.
+            <computeroutput>--autostart-enabled on|off</computeroutput>:
+            Enables and disables VM autostart at host system boot-up,
+            using the specified user name.
           </para>
         </listitem>
@@ -2612,6 +2583,6 @@
           <para>
             <computeroutput>--autostart-delay
-            &lt;seconds&gt;</computeroutput>: Specifies a delay
-            (seconds) following host system boot-up, before VM
+            &lt;seconds&gt;</computeroutput>: Specifies a delay, in
+            seconds, following host system boot-up, before the VM
             autostarts.
           </para>
@@ -2629,13 +2600,19 @@
 
     <para>
-      This command creates a full or linked copy of an existing virtual
-      machine.
-    </para>
-
-    <para>
-      The <computeroutput>clonevm</computeroutput> subcommand takes at
-      least the name of the virtual machine which should be cloned. The
-      following additional settings can be used to further configure the
-      clone VM operation:
+      The <command>VBoxManage clonevm</command> command creates a clone
+      of an existing virtual machine (VM). The clone can be a full copy
+      of the VM or a linked copy of a VM.
+    </para>
+
+<screen>
+VBoxManage clonevm <replaceable>vm</replaceable> [ --basefolder <replaceable>basefolder</replaceable> ]
+[ --group <replaceable>group</replaceable>, ... ] [ --mode machine | machinechildren | all ]
+[ --name <replaceable>name</replaceable> ] [ --options link | keepallmacs | keepnatmacs | keepdisknames | keephwuuids ]
+[ --register ] [ --snapshot <replaceable>vm</replaceable> ] [ --uuid <replaceable>uuid</replaceable> ]
+</screen>
+
+    <para>
+      In addition to specifying the name of the VM to clone, which is
+      required, you can specify any of the following options:
     </para>
 
@@ -2644,94 +2621,206 @@
       <listitem>
         <para>
-          <computeroutput>--snapshot
-          &lt;uuid&gt;|&lt;name&gt;</computeroutput>: Select a specific
-          snapshot where the clone operation should refer to. Default is
-          referring to the current state.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--mode
-          machine|machineandchildren|all</computeroutput>: Selects the
-          cloning mode of the operation. If
-          <computeroutput>machine</computeroutput> is selected (the
-          default), the current state of the VM without any snapshots is
-          cloned. In the
-          <computeroutput>machineandchildren</computeroutput> mode the
-          snapshot provided by
-          <computeroutput>--snapshot</computeroutput> and all child
-          snapshots are cloned. If <computeroutput>all</computeroutput>
-          is the selected mode all snapshots and the current state are
-          cloned.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--options
-          link|keepallmacs|keepnatmacs|keepdisknames|keephwuuids</computeroutput>:
-          Allows additional fine tuning of the clone operation. The
-          first option defines that a linked clone should be created,
-          which is only possible for a machine cloned from a snapshot.
-          The next two options enable specification of the handling of
-          MAC addresses of every virtual network card. They can either
-          be reinitialized (the default), left unchanged
-          (<computeroutput>keepallmacs</computeroutput>) or left
-          unchanged when the network type is NAT
-          (<computeroutput>keepnatmacs</computeroutput>). If you add
-          <computeroutput>keepdisknames</computeroutput> all new disk
-          images are called like the original ones, otherwise they are
-          renamed. If you add <computeroutput>keephwuuids</computeroutput>
-          source hardware IDs will be preserved.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--name &lt;name&gt;</computeroutput>: Select a
-          new name for the new virtual machine. Default is "Original
-          Name Clone".
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--groups &lt;group&gt;, ...</computeroutput>
-          Enables the clone to be assigned membership of the specified
-          VM groups in the list. Note that group ids always start with a
-          <computeroutput>/</computeroutput> and can be nested. By
-          default, clones are always assigned membership of the group
-          <computeroutput>/</computeroutput>.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--basefolder
-          &lt;basefolder&gt;</computeroutput>: Select the folder where
-          the new virtual machine configuration should be saved in.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--uuid &lt;uuid&gt;</computeroutput>: Select
-          the UUID the new VM should have. This ID has to be unique in
-          the VirtualBox instance this clone should be registered.
-          Default is creating a new UUID.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--register</computeroutput>: Automatically
-          register the new clone in this VirtualBox installation. If you
-          manually want to register the new VM later, see
-          <xref linkend="vboxmanage-registervm" />.
+          <option>--basefolder</option>
+          <replaceable>basefolder</replaceable> specifies the name of
+          the folder in which to save the configuration for the new VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--groups <replaceable>group</replaceable>,
+          ...</option> assigns the clone to the specified group or
+          groups. If you specify more than one group, separate each
+          group name with a comma.
+        </para>
+
+        <para>
+          Note that each group is identified by a group ID that starts
+          with a slash character (<computeroutput>/</computeroutput>) so
+          that groups can be nested. By default, a clone is always
+          assigned membership to the <computeroutput>/</computeroutput>
+          group.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--mode machine|machineandchildren|all</option>
+          specifies which of the following cloning modes to use:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <computeroutput>machine</computeroutput> mode clones the
+              current state of the existing VM without any snapshots.
+              This is the default mode.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <computeroutput>machineandchildren</computeroutput> mode
+              clones the snapshot specified by by the
+              <option>--snapshot</option> option and all child
+              snapshots.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <computeroutput>all</computeroutput> mode clones all
+              snapshots and the current state of the existing VM.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--name <replaceable>name</replaceable></option>
+          specifies a new name for the new VM. The default value is
+          "<replaceable>name</replaceable> Clone", where
+          <replaceable>name</replaceable> is the original name of the
+          VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--options</option> specifies how to create a new
+          clone.
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <option>--options link</option> creates a linked clone,
+              which can be cloned only from a snapshot.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--options keepallmacs</option> specifies that the
+              new clone reuses the MAC addresses of each virtual network
+              card from the existing VM.
+            </para>
+
+            <para>
+              If you do not specify this option or the <option>--options
+              keepnatmacs</option> option, the default behavior is to
+              reinitialize the MAC addresses of each virtual network
+              card.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--options keepnatmacs</option> specifies that the
+              new clone reuses the MAC addresses of each virtual network
+              card from the existing VM when the network type is NAT.
+            </para>
+
+            <para>
+              If you do not specify this option or the <option>--options
+              keepallmacs</option> option, the default behavior is to
+              reinitialize the MAC addresses of each virtual network
+              card.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--option keepdisknames</option> specifies that the
+              new clone reuses the disk image names from the existing
+              VM. By default, disk images are renamed. You can preserve
+              source hardware IDs by adding
+              <computeroutput>keephwuuids</computeroutput>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--option keephwuuids</option> specifies that the
+              new clone reuses the hardware IDs from the existing VM. By
+              default, new UUIDs are used.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--register</option> automatically registers the new
+          clone in this &product-name; installation. You can manually
+          register the new VM later by using the <command>VMBoxManage
+          registervm</command> command. See the
+          <xref linkend="vboxmanage-registervm" /> man page.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--snapshot <replaceable>vm</replaceable></option>
+          specifies the snapshot on which to base the new VM. By
+          default, the clone is created from the current state of the
+          specified VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--uuid <replaceable>uuid</replaceable></option>
+          specifies the UUID for the new VM. Ensure that this ID is
+          unique for the &product-name; instance if you decide to
+          register this new VM. By default, &product-name; provides a
+          new UUID.
         </para>
       </listitem>
 
     </itemizedlist>
+
+  </sect1>
+
+  <sect1 id="vboxmanage-movevm">
+
+    <title>VBoxManage movevm</title>
+
+    <para>
+      This command moves a virtual machine to a new location on the
+      host.
+    </para>
+
+    <para>
+      Associated files of the virtual machine, such as settings files
+      and disk image files, are moved to the new location. The
+      &product-name; configuration is updated automatically.
+    </para>
+
+    <para>
+      The <command>movevm</command> subcommand requires the name of the
+      virtual machine which should be moved.
+    </para>
+
+    <remark>
+      What does the --type basic setting do?
+    </remark>
+
+    <para>
+      Also required is the type of move operation, specified by
+      <computeroutput>--type basic</computeroutput>. Other types of move
+      operation may be supported in future releases.
+    </para>
+
+    <para>
+      The <computeroutput>--folder</computeroutput> setting configures
+      the new location on the host file system. Enter a relative
+      pathname or a full pathname.
+    </para>
 
   </sect1>
@@ -2744,23 +2833,24 @@
       This command imports a virtual appliance in OVF format by copying
       the virtual disk images and creating virtual machines in
-      VirtualBox. See <xref linkend="ovf" /> for an introduction to
+      &product-name;. See <xref linkend="ovf" /> for an introduction to
       appliances.
     </para>
 
     <para>
-      The <computeroutput>import</computeroutput> subcommand takes at
-      least the path name of an OVF file as input and expects the disk
-      images, if needed, in the same directory as the OVF file. A lot of
-      additional command-line options are supported to control in detail
-      what is being imported and modify the import parameters, but the
-      details depend on the content of the OVF file.
-    </para>
-
-    <para>
-      It is therefore recommended to first run the import subcommand
-      with the <computeroutput>--dry-run</computeroutput> or
+      The <command>import</command> subcommand takes at least the path
+      name of an OVF file as input and expects the disk images, if
+      needed, in the same directory as the OVF file. A lot of additional
+      command-line options are supported to control in detail what is
+      being imported and modify the import parameters, but the details
+      depend on the content of the OVF file.
+    </para>
+
+    <para>
+      It is therefore recommended to first run the
+      <command>import</command> subcommand with the
+      <computeroutput>--dry-run</computeroutput> or
       <computeroutput>-n</computeroutput> option. This will then print a
       description of the appliance's contents to the screen how it would
-      be imported into VirtualBox, together with the optional
+      be imported into &product-name;, together with the optional
       command-line options to influence the import behavior.
     </para>
@@ -2768,9 +2858,9 @@
     <para>
       Use of the <computeroutput>--options
-      keepallmacs|keepnatmacs|keepdisknames</computeroutput>:
-      option enables additional fine tuning of the clone operation. The
-      first two options enable specification of how the MAC addresses of
-      every virtual network card should be handled. They can either be
-      reinitialized (the default), left unchanged
+      keepallmacs|keepnatmacs|keepdisknames</computeroutput> option
+      enables additional fine tuning of the clone operation. The first
+      two options enable specification of how the MAC addresses of every
+      virtual network card should be handled. They can either be
+      reinitialized, which is the default setting, left unchanged
       (<computeroutput>keepallmacs</computeroutput>) or left unchanged
       when the network type is NAT
@@ -2782,6 +2872,6 @@
 
     <para>
-      As an example, here is the screen output with a sample appliance
-      containing a Windows XP guest:
+      As an example, the following is a screen output for a sample
+      appliance containing a Windows XP guest:
     </para>
 
@@ -2828,14 +2918,14 @@
       subcommand can be directed to ignore many such items with a
       <computeroutput>--vsys X --unit Y --ignore</computeroutput>
-      option, where X is the number of the virtual system (zero unless
-      there are several virtual system descriptions in the appliance)
-      and Y the item number, as printed on the screen.
+      option, where X is the number of the virtual system and Y the item
+      number, as printed on the screen. X is zero, unless there are
+      several virtual system descriptions in the appliance.
     </para>
 
     <para>
       In the above example, Item #1 specifies the name of the target
-      machine in VirtualBox. Items #9 and #10 specify hard disk
-      controllers, respectively. Item #11 describes a hard disk image;
-      in this case, the additional
+      machine in &product-name;. Items #9 and #10 specify hard disk
+      controllers, respectively. Item #11 describes a hard disk image.
+      In this case, the additional
       <computeroutput>--controller</computeroutput> option indicates
       which item the disk image should be connected to, with the default
@@ -2849,5 +2939,5 @@
       the sound card and without the USB controller, and with the disk
       image connected to the IDE controller instead of the SCSI
-      controller, use this command:
+      controller, use the following command:
     </para>
 
@@ -2862,58 +2952,239 @@
 
     <para>
-      This command exports one or more virtual machines from VirtualBox
-      into a virtual appliance in OVF format, including copying their
-      virtual disk images to compressed VMDK. See <xref linkend="ovf" />
-      for an introduction to appliances.
-    </para>
-
-    <para>
-      The <computeroutput>export</computeroutput> command is simple to
-      use: list the machine (or the machines) that you would like to
-      export to the same OVF file and specify the target OVF file after
-      an additional <computeroutput>--output</computeroutput> or
-      <computeroutput>-o</computeroutput> option. Note that the
-      directory of the target OVF file will also receive the exported
-      disk images in the compressed VMDK format (regardless of the
-      original format) and should have enough disk space left for them.
-    </para>
-
-    <para>
-      Beside a simple export of a given virtual machine, you can append
-      several product information to the appliance file. Use
-      <computeroutput>--product</computeroutput>,
-      <computeroutput>--producturl</computeroutput>,
-      <computeroutput>--vendor</computeroutput>,
-      <computeroutput>--vendorurl</computeroutput>,
-      <computeroutput>--version</computeroutput> and
-      <computeroutput>--description</computeroutput> to specify this
-      additional information. For legal reasons you may add a license
-      text or the content of a license file by using the
-      <computeroutput>--eula</computeroutput> and
-      <computeroutput>--eulafile</computeroutput> option respectively.
-      As with OVF import, you must use the <computeroutput>--vsys
-      X</computeroutput> option to direct the previously mentioned
-      options to the correct virtual machine.
-    </para>
-
-    <para>
-      For virtualization products which are not fully compatible with
-      the OVF standard 1.0 you can enable an OVF 0.9 legacy mode with
-      the <computeroutput>--legacy09</computeroutput> option. Other
-      options are <computeroutput>--ovf09</computeroutput>,
-      <computeroutput>--ovf10</computeroutput>,
-      <computeroutput>--ovf20</computeroutput>.
-    </para>
-
-    <para>
-      To specify options controlling the exact content of the appliance
-      file, you can use <computeroutput>--options</computeroutput> to
-      request the creation of a manifest file, which allows detection of
-      corrupted appliances on import, the additional export of DVD
-      images, and the exclusion of MAC addresses. You can specify a list
-      of options, such as <computeroutput>--options
-      manifest,nomacs</computeroutput>. For details, check the help
-      output of <computeroutput>VBoxManage export</computeroutput>.
-    </para>
+      This command exports one or more virtual machines from
+      &product-name;. You can export to either of the following:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          A virtual appliance in OVF format, including copying their
+          virtual disk images to compressed VMDK
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          A cloud service, such as &oci;.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>
+      See <xref linkend="ovf" /> for more details on exporting VMs from
+      &product-name;.
+    </para>
+
+    <sect2 id="vboxmanage-export-ovf">
+
+      <title>Export to OVF</title>
+
+      <para>
+        List the machine, or the machines, that you would like to export
+        to the same OVF file and specify the target OVF file after an
+        additional <computeroutput>--output</computeroutput> or
+        <computeroutput>-o</computeroutput> option. Note that the
+        directory of the target OVF file will also receive the exported
+        disk images in the compressed VMDK format, regardless of the
+        original format, and should have enough disk space left for
+        them.
+      </para>
+
+      <para>
+        Beside a simple export of a given virtual machine, you can
+        append several product information to the appliance file. Use
+        <computeroutput>--product</computeroutput>,
+        <computeroutput>--producturl</computeroutput>,
+        <computeroutput>--vendor</computeroutput>,
+        <computeroutput>--vendorurl</computeroutput>,
+        <computeroutput>--version</computeroutput> and
+        <computeroutput>--description</computeroutput> to specify this
+        additional information. For legal reasons you may add a license
+        text or the content of a license file by using the
+        <computeroutput>--eula</computeroutput> and
+        <computeroutput>--eulafile</computeroutput> option respectively.
+      </para>
+
+      <para>
+        As with OVF import, you use the <computeroutput>--vsys
+        X</computeroutput> option to apply these options to the correct
+        virtual machine.
+      </para>
+
+      <para>
+        For virtualization products which are not fully compatible with
+        the OVF standard 1.0 you can enable an OVF 0.9 legacy mode with
+        the <computeroutput>--legacy09</computeroutput> option. Other
+        options are <computeroutput>--ovf09</computeroutput>,
+        <computeroutput>--ovf10</computeroutput>,
+        <computeroutput>--ovf20</computeroutput>.
+      </para>
+
+      <para>
+        To specify options controlling the exact content of the
+        appliance file, you can use <option>--options</option> to
+        request the creation of a manifest file, which enables detection
+        of corrupted appliances on import, the additional export of DVD
+        images, and the exclusion of MAC addresses. You can specify a
+        list of options, such as <option>--options
+        manifest,nomacs</option>. For details, check the help output of
+        <command>VBoxManage export</command>.
+      </para>
+
+    </sect2>
+
+    <sect2 id="vboxmanage-export-cloud">
+
+      <title>Export to &oci;</title>
+
+      <para>
+        List the machine that you want to export to &oci; and specify
+        output to &oci; by using the
+        <computeroutput>--output</computeroutput> or
+        <computeroutput>-o</computeroutput> option.
+      </para>
+
+      <para>
+        To export a VM to a cloud service such as &oci;, you must use
+        the <option>--cloud</option> option to identify the virtual
+        machine that you want to export. This option works in the same
+        way as the <option>--vsys</option> option for OVF export.
+      </para>
+
+      <para>
+        Specify the following options. Some of these are settings for
+        the VM instance and require you to enter an Oracle Cloud
+        Identifier (OCID) for a resource. OCIDs can be viewed using the
+        &oci; Console.
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <computeroutput>--output</computeroutput>: The short name
+            for the cloud service you are exporting to. For &oci;, enter
+            <computeroutput>OCI//</computeroutput>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cloud &lt;number of virtual
+            system&gt;</computeroutput>: A number identifying the VM
+            that you are exporting. Numbering starts at
+            <computeroutput>0</computeroutput> for the first VM.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--vmname &lt;vnamem&gt;</computeroutput>:
+            The name of the VM to export. This is the name used in the
+            VirtualBox Manager.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cloudprofile &lt;cloud profile
+            name&gt;</computeroutput>: The cloud profile used for the
+            export. The cloud profile contains details for your &oci;
+            account, such as your user OCID, and the fingerprint for
+            your public key. See <xref linkend="ovf-export-oci"/>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cloudshape &lt;shape&gt;</computeroutput>:
+            The shape used for the VM instance. This determines the
+            number of CPUs and the amount of memory allocated to a the
+            VM instance.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--clouddomain
+            &lt;domain&gt;</computeroutput>: The availability domain
+            used for the VM instance. Enter the OCID for the
+            availability domain.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--clouddisksize &lt;disk
+            size&gt;</computeroutput>: The disk size used for the VM
+            instance, in gigabytes.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cloudbucket &lt;bucket
+            name&gt;</computeroutput>: The bucket used to store the VM
+            instance. In &oci;, a bucket is a logical container for
+            storing objects.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cloudocivcn &lt;OCI vcn
+            id&gt;</computeroutput>: The virtual cloud network (VCN)
+            used for the VM instance. Enter the OCID for the VCN.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cloudocisubnet &lt;OCI subnet
+            ID&gt;</computeroutput>: The subnet of the VCN used for the
+            VM instance. Enter the OCID for the subnet.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cloudkeepobject
+            &lt;true/false&gt;</computeroutput>: Whether to store the
+            exported disk image in Oracle Object Storage.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cloudlaunchinstance
+            &lt;true/false&gt;</computeroutput>: Whether to start the VM
+            instance after export to &oci; has completed.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <computeroutput>--cloudpublicip
+            &lt;true/false&gt;</computeroutput>: Whether to enable a
+            public IP address for the VM instance.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <para>
+        The following example shows a typical command line for exporting
+        a VM to &oci;.
+      </para>
+
+<screen>VBoxManage export "OCI_Export" --output OCI:// --cloud 0 --vmname OCI_export \
+--cloudshape VM.Standard2.1 --clouddomain abcd:US-ASHBURN-AD-1 --clouddisksize 50 \
+--cloudbucket test_bucket --cloudocivcn ocid1.vcn.oc1.iad.aaaa... \
+--cloudpublicip true --cloudprofile "standard user" --cloudocisubnet ocid1.subnet.oc1.iad.aaaa... \
+--cloudkeepobject true --cloudlaunchinstance true</screen>
+
+    </sect2>
 
   </sect1>
@@ -2925,5 +3196,5 @@
     <para>
       This command starts a virtual machine that is currently in the
-      "Powered off" or "Saved" states.
+      Powered Off or Saved states.
     </para>
 
@@ -2932,8 +3203,8 @@
       determines whether the machine will be started in a window or
       whether the output should go through
-      <computeroutput>VBoxHeadless</computeroutput>, with VRDE enabled
-      or not. See <xref linkend="vboxheadless" />. The list of types is
-      subject to change, and it is not guaranteed that all types are
-      accepted by any product variant.
+      <command>VBoxHeadless</command>, with VRDE enabled or not. See
+      <xref linkend="vboxheadless" />. The list of types is subject to
+      change, and it is not guaranteed that all types are accepted by
+      any product variant.
     </para>
 
@@ -2976,16 +3247,4 @@
       <varlistentry>
         <term>
-          <computeroutput>sdl</computeroutput>
-        </term>
-
-        <listitem>
-          <para>
-            Starts a VM with a minimal GUI and limited features.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
           <computeroutput>separate</computeroutput>
         </term>
@@ -2993,8 +3252,8 @@
         <listitem>
           <para>
-            Starts a VM with detachable UI. Technically, it is a
+            Starts a VM with a detachable UI. Technically, it is a
             headless VM with user interface in a separate process. This
             is an experimental feature as it lacks certain
-            functionality, such as 3D acceleration, at the moment.
+            functionality, such as 3D acceleration.
           </para>
         </listitem>
@@ -3020,7 +3279,7 @@
 
     <para>
-      The <computeroutput>controlvm</computeroutput> subcommand allows
-      you to change the state of a virtual machine that is currently
-      running. The following can be specified:
+      The <command>controlvm</command> subcommand enables you to change
+      the state of a virtual machine that is currently running. The
+      following can be specified:
     </para>
 
@@ -3029,51 +3288,53 @@
       <listitem>
         <para>
-          <computeroutput>VBoxManage controlvm &lt;vm&gt;
-          pause</computeroutput> temporarily puts a virtual machine on
-          hold, without changing its state for good. The VM window will
-          be painted in gray to indicate that the VM is currently
-          paused. This is equivalent to selecting the "Pause" item in
-          the "Machine" menu of the GUI.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Use <computeroutput>VBoxManage controlvm &lt;vm&gt;
-          resume</computeroutput> to undo a previous
-          <computeroutput>pause</computeroutput> command. This is
-          equivalent to selecting the "Resume" item in the "Machine"
-          menu of the GUI.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>VBoxManage controlvm &lt;vm&gt;
-          reset</computeroutput> has the same effect on a virtual
-          machine as pressing the "Reset" button on a real computer: a
-          cold reboot of the virtual machine, which will restart and
-          boot the guest operating system again immediately. The state
-          of the VM is not saved beforehand, and data may be lost. This
-          is equivalent to selecting the "Reset" item in the "Machine"
-          menu of the GUI.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>VBoxManage controlvm &lt;vm&gt;
-          poweroff</computeroutput> has the same effect on a virtual
-          machine as pulling the power cable on a real computer. Again,
-          the state of the VM is not saved beforehand, and data may be
-          lost. This is equivalent to selecting the "Close" item in the
-          "Machine" menu of the GUI or pressing the window's close
-          button, and then selecting "Power off the machine" in the
-          dialog.
-        </para>
-
-        <para>
-          After this, the VM's state will be "Powered off". From there,
-          it can be started again. See
+          <command>VBoxManage controlvm &lt;vm&gt; pause</command>:
+          Temporarily puts a virtual machine on hold, without
+          permanently changing its state. The VM window is gray, to
+          indicate that the VM is currently paused. This is equivalent
+          to selecting the <emphasis role="bold">Pause</emphasis> item
+          in the <emphasis role="bold">Machine</emphasis> menu of the
+          GUI.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Use <command>VBoxManage controlvm &lt;vm&gt; resume</command>:
+          Undoes a previous <command>pause</command> command. This is
+          equivalent to selecting the
+          <emphasis role="bold">Resume</emphasis> item in the
+          <emphasis role="bold">Machine</emphasis> menu of the GUI.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>VBoxManage controlvm &lt;vm&gt; reset</command>: Has
+          the same effect on a virtual machine as pressing the Reset
+          button on a real computer. A cold reboot of the virtual
+          machine is done, which immediately restarts and reboots the
+          guest operating system. The state of the VM is not saved
+          beforehand, and data may be lost. This is equivalent to
+          selecting the <emphasis role="bold">Reset</emphasis> item in
+          the <emphasis role="bold">Machine</emphasis> menu of the GUI.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>VBoxManage controlvm &lt;vm&gt; poweroff</command>:
+          Has the same effect on a virtual machine as pulling the power
+          cable on a real computer. The state of the VM is not saved
+          beforehand, and data may be lost. This is equivalent to
+          selecting the <emphasis role="bold">Close</emphasis> item in
+          the <emphasis role="bold">Machine</emphasis> menu of the GUI,
+          or clicking the VM window's close button, and then selecting
+          <emphasis role="bold">Power Off the Machine</emphasis> in the
+          displayed dialog.
+        </para>
+
+        <para>
+          After this, the VM's state will be Powered Off. From that
+          state, it can be started again. See
           <xref
           linkend="vboxmanage-startvm" />.
@@ -3083,36 +3344,38 @@
       <listitem>
         <para>
-          <computeroutput>VBoxManage controlvm &lt;vm&gt;
-          savestate</computeroutput> will save the current state of the
-          VM to disk and then stop the VM. This is equivalent to
-          selecting the "Close" item in the "Machine" menu of the GUI or
-          pressing the window's close button, and then selecting "Save
-          the machine state" in the dialog.
-        </para>
-
-        <para>
-          After this, the VM's state will be "Saved". From there, it can
-          be started again. See <xref linkend="vboxmanage-startvm" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>VBoxManage controlvm &lt;vm&gt;
-          acpipowerbutton</computeroutput> will send an ACPI shutdown
-          signal to the VM, as if the power button on a real computer
-          had been pressed. So long as the VM is running a fairly modern
-          guest operating system providing ACPI support, this should
-          trigger a proper shutdown mechanism from within the VM.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>VBoxManage controlvm &lt;vm&gt;
-          keyboardputscancode &lt;hex&gt;
-          [&lt;hex&gt;...]</computeroutput> Sends commands using
+          <command>VBoxManage controlvm &lt;vm&gt; savestate</command>:
+          Saves the current state of the VM to disk and then stops the
+          VM. This is equivalent to selecting the
+          <emphasis role="bold">Close</emphasis> item in the
+          <emphasis role="bold">Machine</emphasis> menu of the GUI or
+          clicking the VM window's close button, and then selecting
+          <emphasis role="bold">Save the Machine State</emphasis> in the
+          displayed dialog.
+        </para>
+
+        <para>
+          After this, the VM's state will be Saved. From this state, it
+          can be started again. See
+          <xref linkend="vboxmanage-startvm" />.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>VBoxManage controlvm &lt;vm&gt;
+          acpipowerbutton</command>: Sends an ACPI shutdown signal to
+          the VM, as if the power button on a real computer had been
+          pressed. So long as the VM is running a fairly modern guest
+          operating system providing ACPI support, this should trigger a
+          proper shutdown mechanism from within the VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>VBoxManage controlvm &lt;vm&gt; keyboardputscancode
+          &lt;hex&gt; [&lt;hex&gt;...]</command>: Sends commands using
           keycodes to the VM. Keycodes are documented in the public
-          domain, e.g.
+          domain. For example:
           http://www.win.tue.nl/~aeb/linux/kbd/scancodes-1.html.
         </para>
@@ -3121,14 +3384,12 @@
       <listitem>
         <para>
-          <computeroutput>VBoxManage controlvm "VM name" teleport
-          --hostname &lt;name&gt; --port &lt;port&gt; [--passwordfile
-          &lt;file&gt; | --password &lt;password&gt;]</computeroutput>
-          makes the machine the source of a teleporting operation and
-          initiates a teleport to the given target. See
-          <xref linkend="teleporting" /> for an introduction. If the
-          optional password is specified, it must match the password
-          that was given to the
-          <computeroutput>modifyvm</computeroutput> command for the
-          target machine. See
+          <command>VBoxManage controlvm "VM name" teleport --hostname
+          &lt;name&gt; --port &lt;port&gt; [--passwordfile &lt;file&gt;
+          | --password &lt;password&gt;]</command>: Makes the machine
+          the source of a teleporting operation and initiates a teleport
+          to the given target. See <xref linkend="teleporting" />. If
+          the optional password is specified, it must match the password
+          that was given to the <command>modifyvm</command> command for
+          the target machine. See
           <xref linkend="vboxmanage-modifyvm-teleport" />.
         </para>
@@ -3138,7 +3399,7 @@
 
     <para>
-      A few extra options are available with
-      <computeroutput>controlvm</computeroutput> that do not directly
-      affect the VM's running state:
+      The following extra options are available with
+      <command>controlvm</command> that do not directly affect the VM's
+      running state:
     </para>
 
@@ -3147,7 +3408,7 @@
       <listitem>
         <para>
-          The <computeroutput>setlinkstate&lt;1-N&gt;</computeroutput>
-          operation connects or disconnects virtual network cables from
-          their network interfaces.
+          <computeroutput>setlinkstate&lt;1-N&gt;</computeroutput>:
+          Connects or disconnects virtual network cables from their
+          network interfaces.
         </para>
       </listitem>
@@ -3157,16 +3418,16 @@
           <computeroutput>nic&lt;1-N&gt;
           null|nat|bridged|intnet|hostonly|generic|natnetwork[&lt;devicename&gt;]</computeroutput>:
-          specifies the type of networking that should be made available
-          on the specified VM virtual network card. They can be: not
-          connected to the host (<computeroutput>null</computeroutput>),
-          use network address translation
-          (<computeroutput>nat</computeroutput>), bridged networking
-          (<computeroutput>bridged</computeroutput>) or communicate with
-          other virtual machines using internal networking
-          (<computeroutput>intnet</computeroutput>) or host-only
-          networking (<computeroutput>hostonly</computeroutput>) or
-          natnetwork networking
-          (<computeroutput>natnetwork</computeroutput>) or access to
-          rarely used sub-modes
+          Specifies the type of networking that should be made available
+          on the specified VM virtual network card. They available types
+          are: not connected to the host
+          (<computeroutput>null</computeroutput>), use network address
+          translation (<computeroutput>nat</computeroutput>), bridged
+          networking (<computeroutput>bridged</computeroutput>),
+          communicate with other virtual machines using internal
+          networking (<computeroutput>intnet</computeroutput>),
+          host-only networking
+          (<computeroutput>hostonly</computeroutput>), natnetwork
+          networking (<computeroutput>natnetwork</computeroutput>), or
+          access to rarely used submodes
           (<computeroutput>generic</computeroutput>). These options
           correspond to the modes which are described in detail in
@@ -3178,12 +3439,12 @@
       <listitem>
         <para>
-          With the "nictrace" options, you can optionally trace network
-          traffic by dumping it to a file, for debugging purposes.
-        </para>
-
-        <para>
-          With <computeroutput>nictrace&lt;1-N&gt;
-          on|off</computeroutput>, you can enable network tracing for a
-          particular virtual network card.
+          With the <computeroutput>nictrace</computeroutput> options,
+          you can optionally trace network traffic by dumping it to a
+          file, for debugging purposes.
+        </para>
+
+        <para>
+          <computeroutput>nictrace&lt;1-N&gt; on|off</computeroutput>:
+          Enables network tracing for a particular virtual network card.
         </para>
 
@@ -3199,13 +3460,14 @@
         <para>
           <computeroutput>nicpromisc&lt;1-N&gt;
-          deny|allow-vms|allow-all</computeroutput>: This specifies how
-          the promiscious mode is handled for the specified VM virtual
+          deny|allow-vms|allow-all</computeroutput>: Specifies how the
+          promiscious mode is handled for the specified VM virtual
           network card. This setting is only relevant for bridged
-          networking. <computeroutput>deny</computeroutput> (default
-          setting) hides any traffic not intended for this VM.
+          networking. The default setting of
+          <computeroutput>deny</computeroutput> hides any traffic not
+          intended for this VM.
           <computeroutput>allow-vms</computeroutput> hides all host
-          traffic from this VM but allows the VM to see traffic from/to
-          other VMs. <computeroutput>allow-all</computeroutput> removes
-          this restriction completely.
+          traffic from this VM but enables the VM to see traffic to and
+          from other VMs. <computeroutput>allow-all</computeroutput>
+          removes this restriction completely.
         </para>
       </listitem>
@@ -3215,12 +3477,13 @@
           <computeroutput>nicproperty&lt;1-N&gt;
           &lt;paramname&gt;="paramvalue"</computeroutput>: This option,
-          in combination with "nicgenericdrv" enables you to pass
-          parameters to rarely-used network backends.
+          in combination with <computeroutput>nicgenericdrv
+          </computeroutput>enables you to pass parameters to rarely-used
+          network backends.
         </para>
 
         <para>
           Those parameters are backend engine-specific, and are
-          different between UDP Tunnel and the VDE backend drivers. For
-          example, please see <xref linkend="network_udp_tunnel" />.
+          different between UDP Tunnel and the VDE backend drivers. See
+          <xref linkend="network_udp_tunnel" />.
         </para>
       </listitem>
@@ -3230,6 +3493,6 @@
           <computeroutput>natpf&lt;1-N&gt;
           [&lt;name&gt;],tcp|udp,[&lt;hostip&gt;],&lt;hostport&gt;,[&lt;guestip&gt;],
-          &lt;guestport&gt;</computeroutput>: This option specifies a
-          NAT port-forwarding rule. See <xref linkend="natforward"/>.
+          &lt;guestport&gt;</computeroutput>: Specifies a NAT
+          port-forwarding rule. See <xref linkend="natforward"/>.
         </para>
       </listitem>
@@ -3238,6 +3501,6 @@
         <para>
           <computeroutput>natpf&lt;1-N&gt; delete
-          &lt;name&gt;</computeroutput>: This option deletes a NAT
-          port-forwarding rule. See <xref linkend="natforward"/>.
+          &lt;name&gt;</computeroutput>: Deletes a NAT port-forwarding
+          rule. See <xref linkend="natforward"/>.
         </para>
       </listitem>
@@ -3246,9 +3509,9 @@
         <para>
           The <computeroutput>guestmemoryballoon&lt;balloon size in
-          MB&gt;</computeroutput> operation changes the size of the
-          guest memory balloon, that is, memory allocated by the
-          VirtualBox Guest Additions from the guest operating system and
-          returned to the hypervisor for re-use by other virtual
-          machines. This must be specified in megabytes. See
+          MB&gt;</computeroutput>: Changes the size of the guest memory
+          balloon. This is the memory allocated by the &product-name;
+          Guest Additions from the guest operating system and returned
+          to the hypervisor for reuse by other virtual machines. This
+          must be specified in megabytes. See
           <xref linkend="guestadd-balloon" />.
         </para>
@@ -3263,9 +3526,10 @@
         <para>
           and <computeroutput>usbdetach &lt;uuid|address&gt;
-          [--capturefile &lt;filename&gt;]</computeroutput> make host
-          USB devices visible/invisible to the virtual machine on the
+          [--capturefile &lt;filename&gt;]</computeroutput>: Makes host
+          USB devices visible or invisible to the virtual machine on the
           fly, without the need for creating filters first. The USB
           devices can be specified by UUID (unique identifier) or by
-          address on the host system. Use the --capturefile option to
+          address on the host system. Use the
+          <computeroutput>--capturefile</computeroutput> option to
           specify the absolute path of a file for writing activity
           logging data.
@@ -3273,22 +3537,20 @@
 
         <para>
-          You can use <computeroutput>VBoxManage list
-          usbhost</computeroutput> to locate this information.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>audioin on</computeroutput>: With this
-          setting, you can select whether capturing audio from the host
-          is enabled or disabled.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>audioout on</computeroutput>: With this
-          setting, you can select whether audio playback from the guest
-          is enabled or disabled.
+          You can use <command>VBoxManage list usbhost</command> to
+          locate this information.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>audioin on</computeroutput>: Selects whether
+          capturing audio from the host is enabled or disabled.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>audioout on</computeroutput>: Selects whether
+          audio playback from the guest is enabled or disabled.
         </para>
       </listitem>
@@ -3298,8 +3560,8 @@
           <computeroutput>clipboard
           disabled|hosttoguest|guesttohost|bidirectional</computeroutput>:
-          With this setting, you can select if and how the guest or host
-          operating system's clipboard should be shared with the host or
-          guest. See <xref linkend="generalsettings" />. This requires
-          that the Guest Additions be installed in the virtual machine.
+          Selects how the guest or host operating system's clipboard
+          should be shared with the host or guest. See
+          <xref linkend="generalsettings" />. This requires that the
+          Guest Additions be installed in the virtual machine.
         </para>
       </listitem>
@@ -3309,6 +3571,6 @@
           <computeroutput>draganddrop
           disabled|hosttoguest|guesttohost|bidirectional</computeroutput>:
-          With this setting, you can select the current drag and drop
-          mode being used between the host and the virtual machine. See
+          Selects the current drag and drop mode being used between the
+          host and the virtual machine. See
           <xref linkend="guestadd-dnd" />. This requires that the Guest
           Additions be installed in the virtual machine.
@@ -3318,6 +3580,6 @@
       <listitem>
         <para>
-          <computeroutput>vrde on|off</computeroutput> lets you enable
-          or disable the VRDE server, if it is installed.
+          <computeroutput>vrde on|off</computeroutput>: Enables and
+          disables the VRDE server, if it is installed.
         </para>
       </listitem>
@@ -3326,8 +3588,9 @@
         <para>
           <computeroutput>vrdeport
-          default|&lt;ports&gt;</computeroutput> changes the port or a
-          range of ports that the VRDE server can bind to; "default" or
-          "0" means port 3389, the standard port for RDP. See the
-          description for the
+          default|&lt;ports&gt;</computeroutput>: Changes the port or a
+          range of ports that the VRDE server can bind to.
+          <computeroutput>default</computeroutput> or
+          <computeroutput>0</computeroutput> means port 3389, the
+          standard port for RDP. See the description for the
           <computeroutput>--vrdeport</computeroutput> option in
           <xref
@@ -3339,7 +3602,7 @@
         <para>
           <computeroutput>vrdeproperty
-          "TCP/Ports|Address=&lt;value&gt;"</computeroutput> sets the
-          port number(s) and IP address on the VM to which the VRDE
-          server can bind.
+          "TCP/Ports|Address=&lt;value&gt;"</computeroutput>: Sets the
+          port numbers and IP address on the VM to which the VRDE server
+          can bind.
         </para>
 
@@ -3349,7 +3612,8 @@
             <para>
               For TCP/Ports, &lt;value&gt; should be a port or a range
-              of ports to which the VRDE server can bind; "default" or
-              "0" means port 3389, the standard port for RDP. See the
-              description for the
+              of ports to which the VRDE server can bind.
+              <computeroutput>default</computeroutput> or
+              <computeroutput>0</computeroutput> means port 3389, the
+              standard port for RDP. See the description for the
               <computeroutput>--vrdeport</computeroutput> option in
               <xref
@@ -3360,10 +3624,10 @@
           <listitem>
             <para>
-              For TCP/Address, &lt;value&gt; should be the IP address of
-              the host network interface that the VRDE server will bind
-              to. If specified, the server will accept connections only
-              on the specified host network interface. See the
-              description for the
-              <computeroutput>--vrdeaddress</computeroutput> option in
+              For TCP/Address, &lt;value&gt;: The IP address of the host
+              network interface that the VRDE server will bind to. If
+              specified, the server will accept connections only on the
+              specified host network interface. See the description for
+              the <computeroutput>--vrdeaddress</computeroutput> option
+              in
               <xref
             linkend="vboxmanage-modifyvm-vrde" />.
@@ -3377,6 +3641,6 @@
         <para>
           <computeroutput>vrdeproperty
-          "VideoChannel/Enabled|Quality|DownscaleProtection=&lt;value&gt;"</computeroutput>
-          sets the VRDP video redirection properties.
+          "VideoChannel/Enabled|Quality|DownscaleProtection=&lt;value&gt;"</computeroutput>:
+          Sets the VRDP video redirection properties.
         </para>
 
@@ -3396,6 +3660,6 @@
               between 10 and 100% inclusive, representing a JPEG
               compression level on the VRDE server video channel. Lower
-              values mean lower quality but higher compression. For
-              details, see <xref linkend="vrde-videochannel" />.
+              values mean lower quality but higher compression. See
+              <xref linkend="vrde-videochannel" />.
             </para>
           </listitem>
@@ -3407,8 +3671,8 @@
               feature. When enabled, if a video's size equals the shadow
               buffer size, then it is regarded as a full screen video,
-              and is displayed; but if its size is between fullscreen
-              and the downscale threshold - it is NOT displayed, as it
-              could be an application window, which would be unreadable
-              when downscaled. When the downscale protection feature is
+              and is displayed. If its size is between fullscreen and
+              the downscale threshold it is not displayed, as it could
+              be an application window, which would be unreadable when
+              downscaled. When the downscale protection feature is
               disabled, an attempt is always made to display videos.
             </para>
@@ -3421,10 +3685,7 @@
         <para>
           <computeroutput>vrdeproperty
-          "Client/DisableDisplay|DisableInput|DisableAudio|DisableUSB=1"</computeroutput>
-        </para>
-
-        <para>
-          disables one of the VRDE server features: Display, Input,
-          Audio or USB respectively. To reenable a feature, use
+          "Client/DisableDisplay|DisableInput|DisableAudio|DisableUSB=1"</computeroutput>:
+          Disables one of the VRDE server features: Display, Input,
+          Audio, or USB. To reenable a feature, use
           "Client/DisableDisplay=" for example. See
           <xref linkend="vrde-customization" />.
@@ -3435,10 +3696,7 @@
         <para>
           <computeroutput>vrdeproperty
-          "Client/DisableClipboard|DisableUpstreamAudio=1"</computeroutput>
-        </para>
-
-        <para>
-          disables one of the VRDE server features: Clipboard or
-          UpstreamAudio respectively. To reenable a feature, use
+          "Client/DisableClipboard|DisableUpstreamAudio=1"</computeroutput>.
+          Disables one of the VRDE server features: Clipboard or
+          UpstreamAudio. To reenable a feature, use
           "Client/DisableClipboard=" for example. See
           <xref linkend="vrde-customization" />.
@@ -3449,11 +3707,7 @@
         <para>
           <computeroutput>vrdeproperty
-          "Client/DisableRDPDR=1"</computeroutput>
-        </para>
-
-        <para>
-          disables the VRDE server feature: RDP device redirection for
-          smart cards. To reenable this feature, use
-          "Client/DisableRDPR=".
+          "Client/DisableRDPDR=1"</computeroutput>: Disables the VRDE
+          server feature: RDP device redirection for smart cards. To
+          reenable this feature, use "Client/DisableRDPR=".
         </para>
       </listitem>
@@ -3462,10 +3716,7 @@
         <para>
           <computeroutput>vrdeproperty
-          "H3DRedirect/Enabled=1"</computeroutput>
-        </para>
-
-        <para>
-          enables the VRDE server feature: 3D redirection. To disable
-          this feature, use "H3DRedirect/Enabled=".
+          "H3DRedirect/Enabled=1"</computeroutput>: Enables the VRDE
+          server feature: 3D redirection. To disable this feature, use
+          "H3DRedirect/Enabled=".
         </para>
       </listitem>
@@ -3474,8 +3725,8 @@
         <para>
           <computeroutput>vrdeproperty
-          "Security/Method|ServerCertificate|ServerPrivateKey|CACertificate=&lt;value&gt;"</computeroutput>
-          sets the desired security method/Path of server certificate,
-          path of server private key, path of CA certificate, used for a
-          connection.
+          "Security/Method|ServerCertificate|ServerPrivateKey|CACertificate=&lt;value&gt;"</computeroutput>:
+          Sets the desired security method, path of the server
+          certificate, path of the server private key, and path of CA
+          certificate, used for a connection.
         </para>
 
@@ -3485,7 +3736,7 @@
             <para>
               <computeroutput>vrdeproperty
-              "Security/Method=&lt;value&gt;"</computeroutput> sets the
+              "Security/Method=&lt;value&gt;"</computeroutput>: Sets the
               desired security method, which is used for a connection.
-              Valid values are:
+              Valid values are as follows:
             </para>
 
@@ -3494,5 +3745,5 @@
               <listitem>
                 <para>
-                  <computeroutput>Negotiate</computeroutput> - both
+                  <computeroutput>Negotiate</computeroutput>: Both
                   Enhanced (TLS) and Standard RDP Security connections
                   are allowed. The security method is negotiated with
@@ -3503,5 +3754,5 @@
               <listitem>
                 <para>
-                  <computeroutput>RDP</computeroutput> - only Standard
+                  <computeroutput>RDP</computeroutput>: Only Standard
                   RDP Security is accepted.
                 </para>
@@ -3510,5 +3761,5 @@
               <listitem>
                 <para>
-                  <computeroutput>TLS</computeroutput> - only Enhanced
+                  <computeroutput>TLS</computeroutput>: Only Enhanced
                   RDP Security is accepted. The client must support TLS.
                 </para>
@@ -3555,6 +3806,6 @@
         <para>
           <computeroutput>vrdeproperty
-          "Audio/RateCorrectionMode|LogPath=&lt;value&gt;"</computeroutput>
-          sets the Audio connection mode, or Path of the audio logfile.
+          "Audio/RateCorrectionMode|LogPath=&lt;value&gt;"</computeroutput>:
+          Sets the audio connection mode, or path of the audio logfile.
         </para>
 
@@ -3573,7 +3824,7 @@
               <listitem>
                 <para>
-                  <computeroutput>VRDP_AUDIO_MODE_VOID</computeroutput>
-                  - no mode specified, use to unset any Audio mode
-                  already set.
+                  <computeroutput>VRDP_AUDIO_MODE_VOID</computeroutput>:
+                  No mode specified, use to unset any Audio mode already
+                  set.
                 </para>
               </listitem>
@@ -3581,6 +3832,6 @@
               <listitem>
                 <para>
-                  <computeroutput>VRDP_AUDIO_MODE_RC</computeroutput> -
-                  rate correction mode.
+                  <computeroutput>VRDP_AUDIO_MODE_RC</computeroutput>:
+                  Rate correction mode.
                 </para>
               </listitem>
@@ -3588,6 +3839,6 @@
               <listitem>
                 <para>
-                  <computeroutput>VRDP_AUDIO_MODE_LPF</computeroutput> -
-                  low pass filter mode.
+                  <computeroutput>VRDP_AUDIO_MODE_LPF</computeroutput>:
+                  Low pass filter mode.
                 </para>
               </listitem>
@@ -3595,7 +3846,7 @@
               <listitem>
                 <para>
-                  <computeroutput>VRDP_AUDIO_MODE_CS</computeroutput> -
-                  client sync mode to prevent under/overflow of the
-                  client queue.
+                  <computeroutput>VRDP_AUDIO_MODE_CS</computeroutput>:
+                  Client sync mode to prevent underflow or overflow of
+                  the client queue.
                 </para>
               </listitem>
@@ -3608,5 +3859,5 @@
               <computeroutput>vrdeproperty
               "Audio/LogPath=&lt;value&gt;"</computeroutput> where
-              &lt;value&gt; is the absolute path of the Audio log file.
+              &lt;value&gt; is the absolute path of the audio log file.
             </para>
           </listitem>
@@ -3620,5 +3871,5 @@
           &lt;percent&gt;</computeroutput>: Sets the image quality for
           video redirection. See
-          <xref
+          <xref 
         linkend="vrde-videochannel" />.
         </para>
@@ -3627,5 +3878,5 @@
       <listitem>
         <para>
-          <computeroutput>setvideomodehint</computeroutput> requests
+          <computeroutput>setvideomodehint</computeroutput>: Requests
           that the guest system change to a particular video mode. This
           requires that the Guest Additions be installed, and will not
@@ -3636,5 +3887,5 @@
       <listitem>
         <para>
-          <computeroutput>screenshotpng</computeroutput> takes a
+          <computeroutput>screenshotpng</computeroutput>: Takes a
           screenshot of the guest display and saves it in PNG format.
         </para>
@@ -3643,24 +3894,62 @@
       <listitem>
         <para>
-          <computeroutput>record on|off</computeroutput> enables or
-          disables recording a VM session into a WebM/VP8 file.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>recordscreens all|&lt;screen ID&gt;
-          [&lt;screen ID&gt; ...]]</computeroutput> allows to specify
-          which screens of the VM are being recorded. This setting
-          cannot be changed while recording is enabled. Each
-          screen is recorded into a separate file.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>recordfile &lt;file&gt;</computeroutput>
-          sets the filename VirtualBox uses to save the recorded
-          content. This setting cannot be changed while recording
+          <computeroutput>recording on|off</computeroutput> enables or
+          disables the recording of a VM session into a WebM/VP8 file.
+          When this option value is <computeroutput>on</computeroutput>,
+          recording begins when the VM session starts.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>recordingscreens
+          all|<replaceable>screen-ID</replaceable>
+          [<replaceable>screen-ID</replaceable> ...]</computeroutput>
+          enables you to specify which VM screens to record. The
+          recording for each screen that you specify is saved to its own
+          file. You cannot modify this setting while recording is
+          enabled.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>recordingfile
+          <replaceable>filename</replaceable></computeroutput> specifies
+          the file in which to save the recording. You cannot modify
+          this setting while recording is enabled.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>recordingvideores
+          <replaceable>width</replaceable>x<replaceable>height</replaceable></computeroutput>
+          specifies the resolution of the recorded video in pixels. You
+          cannot modify this setting while recording is enabled.
+        </para>
+      </listitem>
+
+      <listitem>
+<!-- @todo r=andy Clarify rate. -->
+
+        <para>
+          <computeroutput>recordingvideorate
+          <replaceable>bit-rate</replaceable></computeroutput> specifies
+          the bit rate of the video in kilobits per second. Increasing
+          this value improves the appearance of the video at the cost of
+          an increased file size. You cannot modify this setting while
+          recording is enabled.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>recordingvideofps
+          <replaceable>fps</replaceable></computeroutput> specifies the
+          maximum number of video frames per second (FPS) to record.
+          Frames that have a higher frequency are skipped. Increasing
+          this value reduces the number of skipped frames and increases
+          the file size. You cannot modify this setting while recording
           is enabled.
         </para>
@@ -3668,69 +3957,49 @@
 
       <listitem>
-        <para>
-          <computeroutput>recordvideores &lt;width&gt;
-          &lt;height&gt;</computeroutput> sets the resolution (in
-          pixels) of the recorded video. This setting cannot be changed
-          while recording is enabled.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>recordvideorate &lt;rate&gt;</computeroutput>
-          sets the bitrate in kilobits (kb) per second. Increasing this
-          value makes the video look better for the cost of an increased
-          file size. This setting cannot be changed while recording is enabled.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>recordvideofps &lt;fps&gt;</computeroutput> sets
-          the maximum number of frames per second (FPS) to be recorded.
-          Frames with a higher frequency will be skipped. Reducing this
-          value increases the number of skipped frames and reduces the
-          file size. This setting cannot be changed while recording is enabled.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>recordmaxtime &lt;ms&gt;</computeroutput>
-          sets the maximum time in milliseconds the recording will
-          be enabled since activation. The recording stops when the
-          defined time interval has elapsed. If this value is zero the
-          recording is not limited by time. This setting cannot be
-          changed while recording is enabled.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>recordmaxsize &lt;MB&gt;</computeroutput>
-          limits the maximum size of the recorded file, in MB. The
-          recording stops when the file size has reached the specified
-          size. If this value is zero the recording will not be limited
-          by file size. This setting cannot be changed while recording
-          is enabled.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>recordopts
-          &lt;key=value&gt;[,&lt;key=value&gt; ...]</computeroutput> can
-          be used to specify additional recording options. These
-          options only are for advanced users and must be specified in a
-          comma-separated key=value format, e.g.
-          <computeroutput>foo=bar,a=b</computeroutput>. This setting
-          cannot be changed while recording is enabled.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The <computeroutput>setcredentials</computeroutput> operation
-          is used for remote logons in Windows guests. See
+<!-- @todo r=andy Clarify time format. -->
+
+        <para>
+          <computeroutput>recordingmaxtime
+          <replaceable>seconds</replaceable></computeroutput> specifies
+          the maximum amount time to record in seconds. The recording
+          stops after the specified number of seconds elapses. If this
+          value is zero, the recording continues until you stop the
+          recording.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>recordingmaxsize
+          <replaceable>MB</replaceable></computeroutput> specifies the
+          maximum size of the recorded video file in megabytes. The
+          recording stops when the file reaches the specified size. If
+          this value is zero, the recording continues until you stop the
+          recording. You cannot modify this setting while recording is
+          enabled.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>recordingopts
+          <replaceable>keyword</replaceable>=<replaceable>value</replaceable>[,<replaceable>keyword</replaceable>=<replaceable>value</replaceable>
+          ...]</computeroutput> specifies additional recording options
+          in a comma-separated keyword-value format. For example,
+          <computeroutput>foo=bar,a=b</computeroutput>. You cannot
+          modify this setting while recording is enabled.
+        </para>
+
+        <para>
+          Only use this option only if you are an advanced user. For
+          information about keywords, see <emphasis>Oracle VM VirtualBox
+          Programming Guide and Reference</emphasis>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>setcredentials</computeroutput>: Used for
+          remote logins on Windows guests. See
           <xref linkend="autologon" />.
         </para>
@@ -3740,10 +4009,10 @@
         <para>
           <computeroutput>teleport --host &lt;name&gt; --port
-          &lt;port&gt;</computeroutput> can be used to configure a VM as
-          a target for teleporting. &lt;name&gt; specifies the virtual
-          machine name. &lt;port&gt; specifies the port on the virtual
-          machine which should listen for teleporting requests from
-          other virtual machines. It can be any free TCP/IP port number,
-          such as 6000. See <xref linkend="teleporting" />.
+          &lt;port&gt;</computeroutput>: Configures a VM as a target for
+          teleporting. &lt;name&gt; specifies the virtual machine name.
+          &lt;port&gt; specifies the port on the virtual machine which
+          should listen for teleporting requests from other virtual
+          machines. It can be any free TCP/IP port number, such as 6000.
+          See <xref linkend="teleporting" />.
         </para>
 
@@ -3753,6 +4022,6 @@
             <para>
               <computeroutput>--maxdowntime
-              &lt;msec&gt;</computeroutput>: specifies the maximum
-              downtime (milliseconds) for the teleporting target VM.
+              &lt;msec&gt;</computeroutput>: Specifies the maximum
+              downtime, in milliseconds, for the teleporting target VM.
               Optional.
             </para>
@@ -3762,8 +4031,7 @@
             <para>
               <computeroutput>--password
-              &lt;password&gt;</computeroutput>: indicates that the
-              teleporting request will only succeed if the source
-              machine specifies the same password as the one given with
-              this command. Optional.
+              &lt;password&gt;</computeroutput>: The teleporting request
+              will only succeed if the source machine specifies the same
+              password as the one given with this command. Optional.
             </para>
           </listitem>
@@ -3772,8 +4040,8 @@
             <para>
               <computeroutput>--passwordfile &lt;password
-              file&gt;</computeroutput>: indicates that the teleporting
-              request will only succeed if the source machine specifies
-              the same password as the one specified in the password
-              file with the path specified with this command. Use
+              file&gt;</computeroutput>: The teleporting request will
+              only succeed if the source machine specifies the same
+              password as the one specified in the password file with
+              the path specified with this command. Use
               <computeroutput>stdin</computeroutput> to read the
               password from stdin. Optional.
@@ -3787,10 +4055,10 @@
         <para>
           <computeroutput>plugcpu|unplugcpu &lt;id&gt;</computeroutput>:
-          If CPU hot-plugging is enabled, this adds a virtual CPU to the
-          virtual machines (or removes one).
+          If CPU hot-plugging is enabled, this setting adds and removes
+          a virtual CPU to the virtual machine.
           <computeroutput>&lt;id&gt;</computeroutput> specifies the
           index of the virtual CPU to be added or removed and must be a
-          number from 0 to the maximum no. of CPUs configured. CPU 0 can
-          never be removed.
+          number from 0 to the maximum number of CPUs configured. CPU 0
+          can never be removed.
         </para>
       </listitem>
@@ -3799,7 +4067,7 @@
         <para>
           The <computeroutput>cpuexecutioncap
-          &lt;1-100&gt;</computeroutput>: This operation controls how
-          much cpu time a virtual CPU can use. A value of 50 implies a
-          single virtual CPU can use up to 50% of a single host CPU.
+          &lt;1-100&gt;</computeroutput>: Controls how much CPU time a
+          virtual CPU can use. A value of 50 implies a single virtual
+          CPU can use up to 50% of a single host CPU.
         </para>
       </listitem>
@@ -3808,20 +4076,22 @@
         <para>
           <computeroutput>webcam attach &lt;path|alias&gt;
-          [&lt;key=value&gt;[;&lt;key=value&gt;...]]</computeroutput>:
-          This operation attaches a webcam to a running VM. Specify the
-          absolute path of the webcam on the host operating system, or
-          use its alias, obtained by using the command: VBoxManage list
-          webcams.
-        </para>
-
-        <para>
-          Note that alias '.0' means default video input device on the
-          host operating system, '.1', '.2', etc. mean first, second,
-          etc. video input device. The device order is host-specific.
-        </para>
-
-        <para>
-          The optional settings parameter is a ';' delimited list of
-          name/value pairs, enabling configuration of the emulated
+          [&lt;keyword=value&gt;[;&lt;keyword=value&gt;...]]</computeroutput>:
+          Attaches a webcam to a running VM. Specify the absolute path
+          of the webcam on the host operating system, or use its alias,
+          obtained by using the command: <command>VBoxManage list
+          webcams</command>.
+        </para>
+
+        <para>
+          Note that alias '.0' means the default video input device on
+          the host operating system, '.1', '.2', etc. mean first,
+          second, etc. video input device. The device order is
+          host-specific.
+        </para>
+
+        <para>
+          The optional settings parameter is a
+          <computeroutput>;</computeroutput> delimited list of
+          name-value pairs, enabling configuration of the emulated
           webcam device.
         </para>
@@ -3832,16 +4102,17 @@
 
         <para>
-          MaxFramerate (default no maximum limit) - this specifies the
-          highest rate (frames/sec) at which video frames are sent to
-          the guest. Higher frame rates increase CPU load, so this
-          setting can be useful when there is a need to reduce CPU load.
-          Its default 'value' is 'no maximum limit', thus enabling the
-          guest to use all frame rates supported by the host webcam.
-        </para>
-
-        <para>
-          MaxPayloadTransferSize (default 3060 bytes) - this specifies
-          the maximum number of bytes the emulated webcam can send to
-          the guest in one buffer. The default is used by some webcams.
+          MaxFramerate: Specifies the highest rate in frames per second,
+          at which video frames are sent to the guest. Higher frame
+          rates increase CPU load, so this setting can be useful when
+          there is a need to reduce CPU load. The default setting is
+          <computeroutput>no maximum limit</computeroutput>, thus
+          enabling the guest to use all frame rates supported by the
+          host webcam.
+        </para>
+
+        <para>
+          MaxPayloadTransferSize: Specifies the maximum number of bytes
+          the emulated webcam can send to the guest in one buffer. The
+          default setting is 3060 bytes, which is used by some webcams.
           Higher values can slightly reduce CPU load, if the guest is
           able to use larger buffers. Note that higher
@@ -3854,58 +4125,58 @@
         <para>
           <computeroutput>webcam detach
-          &lt;path|alias&gt;</computeroutput>: This operation detaches a
-          webcam from a running VM. Specify the absolute path of the
-          webcam on the host, or use its alias (obtained from webcam
-          list below).
-        </para>
-
-        <para>
-          Note the points below relating to specific Host Operating
-          Systems:
-        </para>
-
-        <para>
-          Windows hosts
-        </para>
-
-        <para>
-          When the webcam device is detached from the host, the emulated
-          webcam device is automatically detached from the guest.
-        </para>
-
-        <para>
-          Mac OS X hosts
-        </para>
-
-        <para>
-          OS X version 10.7 or newer is required.
-        </para>
-
-        <para>
-          When the webcam device is detached from the host, the emulated
-          webcam device remains attached to the guest and must be
-          manually detached using the VBoxManage controlvm "VM name"
-          webcam detach command.
-        </para>
-
-        <para>
-          Linux hosts
-        </para>
-
-        <para>
-          When the webcam is detached from the host, the emulated webcam
-          device is automatically detached from the guest only if the
-          webcam is streaming video. If the emulated webcam is inactive,
-          it should be manually detached using the VBoxManage controlvm
-          "VM name" webcam detach command.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>webcam list</computeroutput>: This operation
-          lists webcams attached to the running VM. The output is a list
-          of absolute paths or aliases that were used for attaching the
-          webcams to the VM using the 'webcam attach' command above.
+          &lt;path|alias&gt;</computeroutput>: Detaches a webcam from a
+          running VM. Specify the absolute path of the webcam on the
+          host, or use its alias obtained from the <command>webcam
+          list</command> command.
+        </para>
+
+        <para>
+          Please note the following points, relating to specific host
+          operating systems:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Windows hosts: When the webcam device is detached from the
+              host, the emulated webcam device is automatically detached
+              from the guest.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Mac OS X hosts: OS X version 10.7 or newer is required.
+            </para>
+
+            <para>
+              When the webcam device is detached from the host, the
+              emulated webcam device remains attached to the guest and
+              must be manually detached using the <command>VBoxManage
+              controlvm webcam detach</command> command.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Linux hosts: When the webcam is detached from the host,
+              the emulated webcam device is automatically detached from
+              the guest only if the webcam is streaming video. If the
+              emulated webcam is inactive, it should be manually
+              detached using the <command>VBoxManage controlvm webcam
+              detach</command> command.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>webcam list</computeroutput>: Lists webcams
+          attached to the running VM. The output is a list of absolute
+          paths or aliases that were used for attaching the webcams to
+          the VM using the <command>webcam attach</command> command.
         </para>
       </listitem>
@@ -3915,16 +4186,17 @@
           <computeroutput>addencpassword &lt;id&gt; &lt;password
           file&gt;|- [--removeonsuspend
-          &lt;yes|no&gt;]</computeroutput>: This operation supplies an
-          encrypted VM specified by &lt;id&gt; with the encryption
-          password to enable a headless start. Either specify the
-          absolute path of a password file on the host file system:
-          &lt;password file&gt;, or use a '-' to instruct VBoxManage to
-          prompt the user for the encryption password.
+          &lt;yes|no&gt;]</computeroutput>: Supplies an encrypted VM
+          specified by &lt;id&gt; with the encryption password to enable
+          a headless start. Either specify the absolute path of a
+          password file on the host file system: &lt;password file&gt;,
+          or use <option>-</option> to instruct
+          <command>VBoxManage</command> to prompt the user for the
+          encryption password.
         </para>
 
         <para>
           <computeroutput>--removeonsuspend
-          &lt;yes|no&gt;</computeroutput> specifies whether to
-          remove/keep the password from/in VM memory when the VM is
+          &lt;yes|no&gt;</computeroutput>: Specifies whether to remove
+          the passsword or keep the password in VM memory when the VM is
           suspended. If the VM has been suspended and the password has
           been removed, the user needs to resupply the password before
@@ -3934,23 +4206,26 @@
         </para>
 
-        <para>
-          Note: On VirtualBox versions 5.0 and later, data stored on
-          hard disk images can be transparently encrypted for the guest.
-          VirtualBox uses the AES algorithm in XTS mode and supports 128
-          or 256 bit data encryption keys (DEK). The DEK is stored
-          encrypted in the medium properties, and is decrypted during VM
-          startup by supplying the encryption password.
-        </para>
-
-        <para>
-          The "VBoxManage encryptmedium" operation is used to create a
-          DEK encrypted medium. See
+        <note>
+          <para>
+            On &product-name; versions 5.0 and later, data stored on
+            hard disk images can be transparently encrypted for the
+            guest. &product-name; uses the AES algorithm in XTS mode and
+            supports 128 or 256 bit data encryption keys (DEK). The DEK
+            is stored encrypted in the medium properties, and is
+            decrypted during VM startup by supplying the encryption
+            password.
+          </para>
+        </note>
+
+        <para>
+          The <command>VBoxManage encryptmedium</command> command is
+          used to create a DEK encrypted medium. See
           <xref linkend="diskencryption-encryption" />. When starting an
-          encrypted VM from a VirtualBox GUI app, the user will be
+          encrypted VM from the &product-name; GUI, the user will be
           prompted for the encryption password.
         </para>
 
         <para>
-          For a headless encrypted VM start, use:
+          For a headless encrypted VM start, use the folowing command:
         </para>
 
@@ -3960,5 +4235,5 @@
 
         <para>
-          followed by:
+          Then supply the required encryption password as follows:
         </para>
 
@@ -3967,7 +4242,5 @@
         </screen>
 
-        <para>
-          to supply the encryption password required.
-        </para>
+        <para></para>
       </listitem>
 
@@ -3975,15 +4248,21 @@
         <para>
           <computeroutput>removeencpassword &lt;id&gt;</computeroutput>:
-          This operation removes encryption password authorization for
-          password &lt;id&gt; for all encrypted media attached to the
-          VM.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>removeallencpasswords</computeroutput>: This
-          operation removes encryption password authorization for all
-          passwords for all encrypted media attached to the VM.
+          Removes encryption password authorization for password
+          &lt;id&gt; for all encrypted media attached to the VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>removeallencpasswords</computeroutput>:
+          Removes encryption password authorization for all passwords
+          for all encrypted media attached to the VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>changeuartmode &lt;1-N&gt;</computeroutput>:
+          Changes the connection mode for a given virtual serial port.
         </para>
       </listitem>
@@ -3999,8 +4278,8 @@
     <para>
       This command discards the saved state of a virtual machine which
-      is not currently running, which will cause its operating system to
-      restart next time you start it. This is the equivalent of pulling
-      out the power cable on a physical machine, and should be avoided
-      if possible.
+      is not currently running. This will cause the VM's operating
+      system to restart next time you start it. This is the equivalent
+      of pulling out the power cable on a physical machine, and should
+      be avoided if possible.
     </para>
 
@@ -4012,10 +4291,11 @@
 
     <para>
-      If you have a saved state file
+      If you have a Saved state file
       (<computeroutput>.sav</computeroutput>) that is separate from the
-      VM configuration, you can use this command to "adopt" the file.
-      This will change the VM to saved state and when you start it,
-      VirtualBox will attempt to restore it from the saved state file
-      you indicated. This command should only be used in special setups.
+      VM configuration, you can use this command to
+      <emphasis>adopt</emphasis> the file. This will change the VM to
+      saved state and when you start it, &product-name; will attempt to
+      restore it from the saved state file you indicated. This command
+      should only be used in special setups.
     </para>
 
@@ -4032,9 +4312,9 @@
       optionally a virtual machine saved state file if the snapshot was
       taken while the machine was running. After a snapshot has been
-      taken, VirtualBox creates differencing hard disk for each normal
-      hard disk associated with the machine so that when a snapshot is
-      restored, the contents of the virtual machine's virtual hard disks
-      can be quickly reset by simply dropping the pre-existing
-      differencing files.
+      taken, &product-name; creates a differencing hard disk for each
+      normal hard disk associated with the machine so that when a
+      snapshot is restored, the contents of the virtual machine's
+      virtual hard disks can be quickly reset by simply dropping the
+      preexisting differencing files.
     </para>
 
@@ -4052,56 +4332,56 @@
 
     <para>
-      The <computeroutput>take</computeroutput> operation takes a
-      snapshot of the current state of the virtual machine. You must
-      supply a name for the snapshot and can optionally supply a
-      description. The new snapshot is inserted into the snapshots tree
-      as a child of the current snapshot and then becomes the new
-      current snapshot. The
-      <computeroutput>--description</computeroutput> parameter allows to
-      describe the snapshot. If <computeroutput>--live</computeroutput>
-      is specified, the VM will not be stopped during the snapshot
-      creation (live snapshotting).
-    </para>
-
-    <para>
-      The <computeroutput>delete</computeroutput> operation deletes a
-      snapshot (specified by name or by UUID). This can take a while to
-      finish since the differencing images associated with the snapshot
-      might need to be merged with their child differencing images.
-    </para>
-
-    <para>
-      The <computeroutput>restore</computeroutput> operation will
-      restore the given snapshot (specified by name or by UUID) by
-      resetting the virtual machine's settings and current state to that
-      of the snapshot. The previous current state of the machine will be
-      lost. After this, the given snapshot becomes the new "current"
-      snapshot so that subsequent snapshots are inserted under the
-      snapshot from which was restored.
-    </para>
-
-    <para>
-      The <computeroutput>restorecurrent</computeroutput> operation is a
-      shortcut to restore the current snapshot (i.e. the snapshot from
-      which the current state is derived). This subcommand is equivalent
-      to using the "restore" subcommand with the name or UUID of the
-      current snapshot, except that it avoids the extra step of
+      The <command>take</command> operation takes a snapshot of the
+      current state of the virtual machine. You must supply a name for
+      the snapshot and can optionally supply a description. The new
+      snapshot is inserted into the snapshots tree as a child of the
+      current snapshot and then becomes the new current snapshot. The
+      <computeroutput>--description</computeroutput> parameter enables
+      you to describe the snapshot. If
+      <computeroutput>--live</computeroutput> is specified, the VM will
+      not be stopped during the snapshot creation. This is called live
+      snapshotting.
+    </para>
+
+    <para>
+      The <command>delete</command> operation deletes a snapshot,
+      specified by name or by UUID. This can take a while to finish
+      since the differencing images associated with the snapshot might
+      need to be merged with their child differencing images.
+    </para>
+
+    <para>
+      The <command>restore</command> operation will restore the given
+      snapshot, specified by name or by UUID, by resetting the virtual
+      machine's settings and current state to that of the snapshot. The
+      previous current state of the machine will be lost. After this,
+      the given snapshot becomes the new current snapshot so that
+      subsequent snapshots are inserted under the snapshot from which
+      was restored.
+    </para>
+
+    <para>
+      The <command>restorecurrent</command> operation is a shortcut to
+      restore the current snapshot, which is the snapshot from which the
+      current state is derived. This subcommand is equivalent to using
+      the <command>restore</command> subcommand with the name or UUID of
+      the current snapshot, except that it avoids the extra step of
       determining that name or UUID.
     </para>
 
     <para>
-      With the <computeroutput>edit</computeroutput> operation, you can
-      change the name or description of an existing snapshot.
-    </para>
-
-    <para>
-      The <computeroutput>list</computeroutput> operation shows all
-      snapshots of a virtual machine.
-    </para>
-
-    <para>
-      With the <computeroutput>showvminfo</computeroutput> operation,
-      you can view the virtual machine settings that were stored with an
-      existing snapshot.
+      With the <command>edit</command> operation, you can change the
+      name or description of an existing snapshot.
+    </para>
+
+    <para>
+      The <command>list</command> operation shows all snapshots of a
+      virtual machine.
+    </para>
+
+    <para>
+      With the <command>showvminfo</command> operation, you can view the
+      virtual machine settings that were stored with an existing
+      snapshot.
     </para>
 
@@ -4114,20 +4394,5 @@
     <para>
       This command removes a hard disk, DVD, or floppy image from a
-      VirtualBox media registry.
-
-      <footnote>
-
-        <para>
-          Before VirtualBox 4.0, it was necessary to call VBoxManage
-          openmedium before a medium could be attached to a virtual
-          machine; that call "registered" the medium with the global
-          VirtualBox media registry. With VirtualBox 4.0 this is no
-          longer necessary; media are added to media registries
-          automatically. The "closemedium" call has been retained,
-          however, to allow for explicitly removing a medium from a
-          registry.
-        </para>
-
-      </footnote>
+      &product-name; media registry.
     </para>
 
@@ -4148,8 +4413,8 @@
 
     <para>
-      This command attaches/modifies/removes a storage medium connected
-      to a storage controller that was previously added with the
-      <computeroutput>storagectl</computeroutput> command. The syntax is
-      as follows:
+      This command attaches, modifies, and removes a storage medium
+      connected to a storage controller that was previously added with
+      the <command>storagectl</command> command. The syntax is as
+      follows:
     </para>
 
@@ -4185,11 +4450,10 @@
 
     <para>
-      A number of parameters are commonly required. The ones at the end
-      of the list are required only for iSCSI targets, as described
-      below.
-    </para>
-
-    <para>
-      The common parameters are:
+      A number of parameters are commonly required. Some parameters are
+      required only for iSCSI targets.
+    </para>
+
+    <para>
+      The common parameters are as follows:
     </para>
 
@@ -4217,6 +4481,5 @@
             Name of the storage controller. Mandatory. The list of the
             storage controllers currently attached to a VM can be
-            obtained with <computeroutput>VBoxManage
-            showvminfo</computeroutput>. See
+            obtained with <command>VBoxManage showvminfo</command>. See
             <xref linkend="vboxmanage-showvminfo" />.
           </para>
@@ -4260,5 +4523,5 @@
           <para>
             Define the type of the drive to which the medium is being
-            attached/detached/modified. This argument can only be
+            attached, detached, or modified. This argument can only be
             omitted if the type of medium can be determined from either
             the medium given with the
@@ -4284,22 +4547,24 @@
             <listitem>
               <para>
-                "none": Any existing device should be removed from the
-                given slot.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                "emptydrive": For a virtual DVD or floppy drive only,
-                this makes the device slot behaves like a removeable
-                drive into which no media has been inserted.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                "additions": For a virtual DVD drive only, this attaches
-                the <emphasis>VirtualBox Guest Additions</emphasis>
-                image to the given device slot.
+                <computeroutput>none</computeroutput>: Any existing
+                device should be removed from the given slot.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <computeroutput>emptydrive</computeroutput>: For a
+                virtual DVD or floppy drive only, this makes the device
+                slot behave like a removeable drive into which no media
+                has been inserted.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <computeroutput>additions</computeroutput>: For a
+                virtual DVD drive only, this attaches the
+                <emphasis>VirtualBox Guest Additions</emphasis> image to
+                the given device slot.
               </para>
             </listitem>
@@ -4308,9 +4573,9 @@
               <para>
                 If a UUID is specified, it must be the UUID of a storage
-                medium that is already known to VirtualBox (e.g. because
-                it has been attached to another virtual machine). See
-                <xref linkend="vboxmanage-list" /> for how to list known
-                media. This medium is then attached to the given device
-                slot.
+                medium that is already known to &product-name;. For
+                example, because it has been attached to another virtual
+                machine. See <xref linkend="vboxmanage-list" /> for
+                details of how to list known media. This medium is then
+                attached to the given device slot.
               </para>
             </listitem>
@@ -4319,22 +4584,25 @@
               <para>
                 If a filename is specified, it must be the full path of
-                an existing disk image (ISO, RAW, VDI, VMDK or other),
-                which is then attached to the given device slot.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                "host:&lt;drive&gt;": For a virtual DVD or floppy drive
-                only, this connects the given device slot to the
-                specified DVD or floppy drive on the host computer.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                "iscsi": For virtual hard disks only, this allows for
-                specifying an iSCSI target. In this case, more
-                parameters must be given. See the description below.
+                an existing disk image in ISO, RAW, VDI, VMDK, or other
+                format. The disk image is then attached to the given
+                device slot.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <computeroutput>host:&lt;drive&gt;</computeroutput>: For
+                a virtual DVD or floppy drive only, this connects the
+                given device slot to the specified DVD or floppy drive
+                on the host computer.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <computeroutput>iscsi</computeroutput>: For virtual hard
+                disks only, this is used for specifying an iSCSI target.
+                In this case, additional parameters must be given. These
+                are described below.
               </para>
             </listitem>
@@ -4344,7 +4612,7 @@
           <para>
             Some of the above changes, in particular for removeable
-            media (floppies and CDs/DVDs), can be effected while a VM is
-            running. Others, such as device changes or changes in hard
-            disk device slots, require the VM to be powered off.
+            media such as floppies and CDs/DVDs, can be effected while a
+            VM is running. Others, such as device changes or changes in
+            hard disk device slots, require the VM to be powered off.
           </para>
         </listitem>
@@ -4359,6 +4627,5 @@
           <para>
             Defines how this medium behaves with respect to snapshots
-            and write operations. See <xref linkend="hdimagewrites" />
-            for details.
+            and write operations. See <xref linkend="hdimagewrites" />.
           </para>
         </listitem>
@@ -4392,7 +4659,8 @@
             broken VM configurations if any other VM is referring to the
             same media already. The most frequently used variant is
-            <code>--setuuid ""</code>, which assigns a new (random) UUID
-            to an image. This is useful to resolve the duplicate UUID
-            errors if one duplicated an image using file copy utilities.
+            <computeroutput>--setuuid ""</computeroutput>, which assigns
+            a new random UUID to an image. This option is useful for
+            resolving duplicate UUID errors if you duplicated an image
+            using a file copy utility.
           </para>
         </listitem>
@@ -4422,8 +4690,8 @@
           <para>
             For a virtual DVD drive only, you can configure the behavior
-            for guest-triggered medium eject. If this is set to "on",
-            the eject has only temporary effects. If the VM is powered
-            off and restarted the originally configured medium will be
-            still in the drive.
+            for guest-triggered medium eject. If this is set to on, the
+            eject has only a temporary effect. If the VM is powered off
+            and restarted the originally configured medium will be still
+            in the drive.
           </para>
         </listitem>
@@ -4437,8 +4705,8 @@
         <listitem>
           <para>
-            This switch allows to enable the non-rotational flag for
-            virtual hard disks. Some guests (i.e. Windows 7+) treat such
-            disks like SSDs and do not perform disk fragmentation on
-            such media.
+            Enables you to enable the non-rotational flag for virtual
+            hard disks. Some guests, such as Windows 7 or later, treat
+            such disks like SSDs and do not perform disk fragmentation
+            on such media.
           </para>
         </listitem>
@@ -4452,8 +4720,8 @@
         <listitem>
           <para>
-            This switch enables the auto-discard feature for the virtual
-            hard disks. This specifies that a VDI image will be shrunk
-            in response to the trim command from the guest OS. The
-            following requirements must be met:
+            Enables the auto-discard feature for a virtual hard disks.
+            This specifies that a VDI image will be shrunk in response
+            to the trim command from the guest OS. The following
+            requirements must be met:
           </para>
 
@@ -4468,17 +4736,18 @@
             <listitem>
               <para>
-                The size of the cleared area must be at least 1MB.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                VirtualBox will only trim whole 1 MB blocks. The VDIs
-                themselves are organized into 1 MB blocks, so this will
-                only work if the space being TRIM-ed is at least a 1 MB
-                contiguous block at a 1 MB boundary. On Windows,
-                occasional defrag (with "defrag.exe /D"), or under Linux
-                running "btrfs filesystem defrag" as a background cron
-                job may be beneficial.
+                The size of the cleared area must be at least 1 MB.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                &product-name; will only trim whole 1 MB blocks. The
+                VDIs themselves are organized into 1 MB blocks, so this
+                will only work if the space being trimmed is at least a
+                1 MB contiguous block at a 1 MB boundary. On Windows,
+                occasional defragmentation with <command>defrag.exe
+                /D</command>, or on Linux running <command>btrfs
+                filesystem defrag</command> as a background cron job may
+                be beneficial.
               </para>
             </listitem>
@@ -4486,13 +4755,16 @@
           </itemizedlist>
 
-          <para>
-            Notes: the Guest OS must be configured to issue trim
-            command, and typically this means that the guest OS is made
-            to 'see' the disk as an SSD. Ext4 supports -o discard mount
-            flag; OSX probably requires additional settings. Windows
-            ought to automatically detect and support SSDs - at least in
-            versions 7, 8 and 10. Linux exFAT driver (courtesy of
-            Samsung) supports the trim command.
-          </para>
+          <note>
+            <para>
+              The Guest OS must be configured to issue the
+              <command>trim</command> command, and typically this means
+              that the guest OS is made to see the disk as an SSD. Ext4
+              supports the -o discard mount flag. Mac OS X probably
+              requires additional settings. Windows should automatically
+              detect and support SSDs, at least in versions 7, 8, and
+              10. The Linux exFAT driver from Samsung supports the
+              <command>trim</command> command.
+            </para>
+          </note>
 
           <para>
@@ -4503,9 +4775,10 @@
 
           <para>
-            Alternatively, there are ad hoc methods to issue trim, e.g.
-            Linux fstrim command, part of util-linux package. Earlier
-            solutions required a user to zero out unused areas, e.g.
-            using zerofree, and explicitly compact the disk - only
-            possible when the VM is offline.
+            Alternatively, there are other methods to issue trim. For
+            example, the Linux <command>fstrim</command> command, part
+            of the util-linux package. Earlier solutions required a user
+            to zero out unused areas, using zerofree or similar, and to
+            compact the disk. This is only possible when the VM is
+            offline.
           </para>
         </listitem>
@@ -4535,6 +4808,5 @@
             unmounts the DVD/CD/Floppy or mounts a new DVD/CD/Floppy
             even if the previous one is locked down by the guest for
-            reading. Again, see <xref linkend="storage-cds" /> for
-            details.
+            reading. See <xref linkend="storage-cds" />.
           </para>
         </listitem>
@@ -4544,5 +4816,5 @@
 
     <para>
-      When "iscsi" is used with the
+      When <computeroutput>iscsi</computeroutput> is used with the
       <computeroutput>--medium</computeroutput> parameter for iSCSI
       support, additional parameters must or can be used. See also
@@ -4559,5 +4831,5 @@
         <listitem>
           <para>
-            The host name or IP address of the iSCSI target; required.
+            The host name or IP address of the iSCSI target. Required.
           </para>
         </listitem>
@@ -4572,5 +4844,5 @@
           <para>
             Target name string. This is determined by the iSCSI target
-            and used to identify the storage resource; required.
+            and used to identify the storage resource. Required.
           </para>
         </listitem>
@@ -4610,5 +4882,5 @@
         <listitem>
           <para>
-            Hex encoded Logical Unit Number of the target resource.
+            Hex-encoded Logical Unit Number of the target resource.
             Optional. Often, this value is zero.
           </para>
@@ -4624,20 +4896,20 @@
         <listitem>
           <para>
-            Username and password (initiator secret) for target
-            authentication, if required. Optional.
-
-            <note>
-              <para>
-                Username and password are stored without encryption, in
-                clear text, in the XML machine configuration file if no
-                settings password is provided. When a settings password
-                was specified the first time, the password is stored
-                encrypted. Alternatively to providing the password on
-                the command line, a reference to a file containing the
-                text can be provided instead via the passwordfile
-                option.
-              </para>
-            </note>
-          </para>
+            Username and password, called the initiator secret, for
+            target authentication, if required. Optional.
+          </para>
+
+          <note>
+            <para>
+              Username and password are stored without encryption, in
+              clear text, in the XML machine configuration file if no
+              settings password is provided. When a settings password is
+              specified for the first time, the password is stored in
+              encrypted form. As an alternative to providing the
+              password on the command line, a reference to a file
+              containing the text can be provided using the
+              <computeroutput>passwordfile</computeroutput> option.
+            </para>
+          </note>
         </listitem>
       </varlistentry>
@@ -4650,38 +4922,49 @@
         <listitem>
           <para>
-            iSCSI Initiator (optional).
-          </para>
-
-          <para>
-            Note: Microsoft iSCSI Initiator is a system, such as a
-            server that attaches to an IP network and initiates requests
-            and receives responses from an iSCSI target. The SAN
-            components in Microsoft iSCSI Initiator are largely
-            analogous to Fibre Channel SAN components, and they include
-            the following:
-          </para>
-
-          <para>
-            To transport blocks of iSCSI commands over the IP network,
-            an iSCSI driver must be installed on the iSCSI host. An
-            iSCSI driver is included with Microsoft iSCSI Initiator.
-          </para>
-
-          <para>
-            A gigabit Ethernet adapter that transmits 1000 megabits per
-            second (Mbps) is recommended for the connection to an iSCSI
-            target. Like standard 10/100 adapters, most gigabit adapters
-            use a pre-existing Category 5 or Category 6E cable. Each
-            port on the adapter is identified by a unique IP address.
-          </para>
-
-          <para>
-            An iSCSI target is any device that receives iSCSI commands.
-            The device can be an end node, such as a storage device, or
-            it can be an intermediate device, such as a network bridge
-            between IP and Fibre Channel devices. Each port on the
-            storage array controller or network bridge is identified by
-            one or more IP addresses
-          </para>
+            iSCSI Initiator. Optional.
+          </para>
+
+          <para>
+            Microsoft iSCSI Initiator is a system, such as a server that
+            attaches to an IP network and initiates requests and
+            receives responses from an iSCSI target. The SAN components
+            in Microsoft iSCSI Initiator are largely analogous to Fibre
+            Channel SAN components, and they include the following:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                To transport blocks of iSCSI commands over the IP
+                network, an iSCSI driver must be installed on the iSCSI
+                host. An iSCSI driver is included with Microsoft iSCSI
+                Initiator.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                A gigabit Ethernet adapter that transmits 1000 megabits
+                per second (Mbps) is recommended for the connection to
+                an iSCSI target. Like standard 10/100 adapters, most
+                gigabit adapters use a preexisting Category 5 or
+                Category 6E cable. Each port on the adapter is
+                identified by a unique IP address.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                An iSCSI target is any device that receives iSCSI
+                commands. The device can be an end node, such as a
+                storage device, or it can be an intermediate device,
+                such as a network bridge between IP and Fibre Channel
+                devices. Each port on the storage array controller or
+                network bridge is identified by one or more IP addresses
+              </para>
+            </listitem>
+
+          </itemizedlist>
         </listitem>
       </varlistentry>
@@ -4694,5 +4977,5 @@
         <listitem>
           <para>
-            If specified, connect to the iSCSI target via Internal
+            If specified, connect to the iSCSI target using Internal
             Networking. This needs further configuration, see
             <xref linkend="iscsi-intnet" />.
@@ -4710,11 +4993,11 @@
 
     <para>
-      This command attaches/modifies/removes a storage controller. After
-      this, virtual media can be attached to the controller with the
-      <computeroutput>storageattach</computeroutput> command .
-    </para>
-
-    <para>
-      The syntax is as follows:
+      This command attaches, modifies, and removes a storage controller.
+      After this, virtual media can be attached to the controller with
+      the <command>storageattach</command> command.
+    </para>
+
+    <para>
+      The syntax for this command is as follows:
     </para>
 
@@ -4732,5 +5015,5 @@
 
     <para>
-      where the parameters mean:
+      The parameters are as follows:
     </para>
 
@@ -4846,5 +5129,5 @@
         <listitem>
           <para>
-            Removes the storage controller from the VM config.
+            Removes the storage controller from the VM configuration.
           </para>
         </listitem>
@@ -4860,6 +5143,7 @@
 
     <para>
-      This command creates/deletes/modifies/shows bandwidth groups of
-      the given virtual machine:
+      This command creates, deletes, modifies, and shows bandwidth
+      groups of the given virtual machine.
+    </para>
 
 <screen>VBoxManage bandwidthctl    &lt;uuid|vmname&gt;
@@ -4868,5 +5152,4 @@
                            remove &lt;name&gt; |
                            list [--machinereadable]</screen>
-    </para>
 
     <para>
@@ -4878,27 +5161,26 @@
       <listitem>
         <para>
-          <computeroutput>add</computeroutput>, creates a new bandwidth
-          group of a given type.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>set</computeroutput>, modifies the limit for
-          an existing bandwidth group.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>remove</computeroutput>, destroys a bandwidth
-          group.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>list</computeroutput>, shows all bandwidth
-          groups defined for the given VM. Use the
+          <command>add</command>: Creates a new bandwidth group of a
+          given type.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>set</command>: Modifies the limit for an existing
+          bandwidth group.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>remove</command>: Deletes a bandwidth group.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>list</command>: Shows all bandwidth groups defined
+          for the given VM. Use the
           <computeroutput>--machinereadable</computeroutput> option to
           produce the same output, but in machine readable format. This
@@ -4910,5 +5192,5 @@
 
     <para>
-      The parameters mean the following:
+      The parameters are as follows:
     </para>
 
@@ -4967,10 +5249,10 @@
             megabytes per second. The unit can be changed by specifying
             one of the following suffixes:
-            <computeroutput>k</computeroutput> for kilobits/s,
-            <computeroutput>m</computeroutput> for megabits/s,
-            <computeroutput>g</computeroutput> for gigabits/s,
-            <computeroutput>K</computeroutput> for kilobytes/s,
-            <computeroutput>M</computeroutput> for megabytes/s,
-            <computeroutput>G</computeroutput> for gigabytes/s.
+            <computeroutput>k</computeroutput> for kilobits per second,
+            <computeroutput>m</computeroutput> for megabits per second,
+            <computeroutput>g</computeroutput> for gigabits per second,
+            <computeroutput>K</computeroutput> for kilobytes per second,
+            <computeroutput>M</computeroutput> for megabytes per second,
+            <computeroutput>G</computeroutput> for gigabytes per second.
           </para>
         </listitem>
@@ -5002,24 +5284,25 @@
     <para>
       This command shows information about a medium, notably its size,
-      its size on disk, its type and the virtual machines which use it.
-
-      <note>
-        <para>
-          For compatibility with earlier versions of VirtualBox, the
-          "showvdiinfo" command is also supported and mapped internally
-          to the "showmediuminfo" command.
-        </para>
-      </note>
-    </para>
+      its size on disk, its type, and the virtual machines which use it.
+    </para>
+
+    <note>
+      <para>
+        For compatibility with earlier versions of &product-name;, the
+        <command>showvdiinfo</command> command is also supported and
+        mapped internally to the <command>showmediuminfo</command>
+        command.
+      </para>
+    </note>
 
 <screen>VBoxManage showmediuminfo     [disk|dvd|floppy] &lt;uuid|filename&gt;</screen>
 
     <para>
-      The medium must be specified either by its UUID (if the medium is
-      registered) or by its filename. Registered images can be listed by
-      <computeroutput>VBoxManage list hdds</computeroutput>,
-      <computeroutput>VBoxManage list dvds</computeroutput>, or
-      <computeroutput>VBoxManage list floppies</computeroutput>, as
-      appropriate. See <xref linkend="vboxmanage-list" />.
+      The medium must be specified either by its UUID, if the medium is
+      registered, or by its filename. Registered images can be listed
+      using <command>VBoxManage list hdds</command>, <command>VBoxManage
+      list dvds</command>, or <command>VBoxManage list
+      floppies</command>, as appropriate. See
+      <xref linkend="vboxmanage-list" />.
     </para>
 
@@ -5041,5 +5324,5 @@
 
     <para>
-      where the parameters mean:
+      The parameters are as follows:
     </para>
 
@@ -5066,6 +5349,5 @@
         <listitem>
           <para>
-            &lt;megabytes&gt; Specifies the image capacity, in 1 MB
-            units. Optional.
+            Specifies the image capacity, in 1 MB units. Optional.
           </para>
         </listitem>
@@ -5096,19 +5378,20 @@
           <para>
             Specifies the file format for the output file. Available
-            options are VDI, VMDK, VHD. Default is VDI. Optional.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <computeroutput>--variant
-          Standard,Fixed,Split2G,Stream,ESX</computeroutput>
-        </term>
-
-        <listitem>
-          <para>
-            Specifies any required file format variant(s) for the output
-            file. It is a comma-separated list of variant flags. Not all
+            options are VDI, VMDK, VHD. The default format is VDI.
+            Optional.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <computeroutput>--variant</computeroutput>
+        </term>
+
+        <listitem>
+          <para>
+            Specifies any required file format variants for the output
+            file. This is a comma-separated list of variant flags.
+            Options are Standard,Fixed,Split2G,Stream,ESX. Not all
             combinations are supported, and specifying mutually
             incompatible flags results in an error message. Optional.
@@ -5121,7 +5404,8 @@
     <note>
       <para>
-        For compatibility with earlier versions of VirtualBox, the
-        "createvdi" and "createhd" commands are also supported and
-        mapped internally to the "createmedium" command.
+        For compatibility with earlier versions of &product-name;, the
+        <command>createvdi</command> and <command>createhd</command>
+        commands are also supported and mapped internally to the
+        <command>createmedium</command> command.
       </para>
     </note>
@@ -5134,7 +5418,7 @@
 
     <para>
-      With the <computeroutput>modifymedium</computeroutput> command,
-      you can change the characteristics of a disk image after it has
-      been created:
+      With the <command>modifymedium</command> command, you can change
+      the characteristics of a disk image after it has been created.
+    </para>
 
 <screen>VBoxManage modifymedium  [disk|dvd|floppy]    &lt;uuid|filename&gt;
@@ -5148,20 +5432,20 @@
                          [--setlocation &lt;path&gt;]</screen>
 
-      <note>
-        <para>
-          For compatibility with earlier versions of VirtualBox, the
-          "modifyvdi" and "modifyhd" commands are also supported and
-          mapped internally to the "modifymedium" command.
-        </para>
-      </note>
-    </para>
-
-    <para>
-      The disk image to modify must be specified either by its UUID (if
-      the medium is registered) or by its filename. Registered images
-      can be listed by <computeroutput>VBoxManage list
-      hdds</computeroutput>, see <xref linkend="vboxmanage-list" />. A
-      filename must be specified as a valid path, either as an absolute
-      path or as a relative path starting from the current directory.
+    <note>
+      <para>
+        For compatibility with earlier versions of &product-name;, the
+        <command>modifyvdi</command> and <command>modifyhd</command>
+        commands are also supported and mapped internally to the
+        <command>modifymedium</command> command.
+      </para>
+    </note>
+
+    <para>
+      The disk image to modify must be specified either by its UUID, if
+      the medium is registered, or by its filename. Registered images
+      can be listed using <command>VBoxManage list hdds</command>, see
+      <xref linkend="vboxmanage-list" />. A filename must be specified
+      as a valid path, either as an absolute path or as a relative path
+      starting from the current directory.
     </para>
 
@@ -5184,9 +5468,8 @@
       <listitem>
         <para>
-          For immutable (differencing) hard disks only, the
-          <computeroutput>--autoreset on|off</computeroutput> option
-          determines whether the disk is automatically reset on every VM
-          startup, see <xref linkend="hdimagewrites" />. The default is
-          "on".
+          For immutable hard disks only, the <computeroutput>--autoreset
+          on|off</computeroutput> option determines whether the disk is
+          automatically reset on every VM startup. See
+          <xref linkend="hdimagewrites" />. By default, autoreset is on.
         </para>
       </listitem>
@@ -5195,10 +5478,11 @@
         <para>
           The <computeroutput>--compact</computeroutput> option can be
-          used to compact disk images, i.e. remove blocks that only
-          contains zeroes. This will shrink a dynamically allocated
-          image again; it will reduce the <emphasis>physical</emphasis>
-          size of the image without affecting the logical size of the
-          virtual disk. Compaction works both for base images and for
-          diff images created as part of a snapshot.
+          used to compact disk images. Compacting removes blocks that
+          only contains zeroes. Using this option will shrink a
+          dynamically allocated image. It will reduce the
+          <emphasis>physical</emphasis> size of the image without
+          affecting the logical size of the virtual disk. Compaction
+          works both for base images and for differencing images created
+          as part of a snapshot.
         </para>
 
@@ -5207,12 +5491,11 @@
           space in the guest system first be zeroed out using a suitable
           software tool. For Windows guests, you can use the
-          <computeroutput>sdelete</computeroutput> tool provided by
-          Microsoft. Execute <computeroutput>sdelete -z</computeroutput>
-          in the guest to zero the free disk space before compressing
-          the virtual disk image. For Linux, use the
-          <code>zerofree</code> utility which supports ext2/ext3
-          filesystems. For Mac OS X guests, use the <code>diskutil
-          secureErase freespace 0 /</code> command line from an elevated
-          Terminal.
+          <command>sdelete</command> tool provided by Microsoft. Run
+          <command>sdelete -z</command> in the guest to zero the free
+          disk space, before compressing the virtual disk image. For
+          Linux, use the <command>zerofree</command> utility which
+          supports ext2/ext3 filesystems. For Mac OS X guests, use the
+          <computeroutput>diskutil secureErase freespace 0
+          /</computeroutput> command from an elevated Terminal.
         </para>
 
@@ -5229,26 +5512,19 @@
         <para>
           The <computeroutput>--resize x</computeroutput> option, where
-          x is the desired new total space in
-          <emphasis role="bold">megabytes</emphasis> enables you to
+          x is the desired new total space in megabytes enables you to
           change the capacity of an existing image. This adjusts the
           <emphasis>logical</emphasis> size of a virtual disk without
           affecting the physical size much.
-
-          <footnote>
-
-            <para>
-              Image resizing was added with VirtualBox 4.0.
-            </para>
-
-          </footnote>
-
-          This currently works only for VDI and VHD formats, and only
-          for the dynamically allocated variants, and can only be used
-          to expand (not shrink) the capacity. For example, if you
-          originally created a 10 GB disk which is now full, you can use
-          the <computeroutput>--resize 15360</computeroutput> command to
-          change the capacity to 15 GB (15,360 MB) without having to
-          create a new image and copy all data from within a virtual
-          machine. Note however that this only changes the drive
+        </para>
+
+        <para>
+          This option currently works only for VDI and VHD formats, and
+          only for the dynamically allocated variants. It can only be
+          used to expand, but not shrink, the capacity. For example, if
+          you originally created a 10 GB disk which is now full, you can
+          use the <computeroutput>--resize 15360</computeroutput>
+          command to change the capacity to 15 GB (15,360 MB) without
+          having to create a new image and copy all data from within a
+          virtual machine. Note however that this only changes the drive
           capacity. You will typically next need to use a partition
           management tool inside the guest to adjust the main partition
@@ -5272,18 +5548,20 @@
       </listitem>
 
-     <listitem>
-       <para>
-         The <computeroutput>--setlocation &lt;path&gt;</computeroutput>
-         option can be used to set new location &lt;path&gt; of the
-         medium on the host file system if the medium had been moved
-         for any reasons. The path can be either relative to the
-         current directory or absolute.
-       </para>
-
-       <para>
-         Note, the new location is used as is, without any sanity checks,
-         so user is responsible to set correct path.
-       </para>
-     </listitem>
+      <listitem>
+        <para>
+          The <computeroutput>--setlocation
+          &lt;path&gt;</computeroutput> option can be used to set the
+          new location &lt;path&gt; of the medium on the host file
+          system if the medium has been moved for any reasons. The path
+          can be either relative to the current directory or absolute.
+        </para>
+
+        <note>
+          <para>
+            The new location is used as is, without any sanity checks.
+            The user is responsible for setting the correct path.
+          </para>
+        </note>
+      </listitem>
 
     </itemizedlist>
@@ -5296,10 +5574,10 @@
 
     <para>
-      This command duplicates a virtual disk/DVD/floppy medium to a new
-      medium, usually an image file, with a new unique identifier
+      This command duplicates a virtual disk, DVD, or floppy medium to a
+      new medium, usually an image file, with a new unique identifier
       (UUID). The new image can be transferred to another host system or
-      reimported into VirtualBox using the Virtual Media Manager. See
-      <xref linkend="vdis" /> and <xref linkend="cloningvdis" />. The
-      syntax is as follows:
+      reimported into &product-name; using the Virtual Media Manager.
+      See <xref linkend="vdis" /> and <xref linkend="cloningvdis" />.
+      The syntax is as follows:
     </para>
 
@@ -5313,9 +5591,8 @@
       The medium to clone as well as the target image must be described
       either by its UUIDs, if the mediums are registered, or by its
-      filename. Registered images can be listed by
-      <computeroutput>VBoxManage list hdds</computeroutput>. See
-      <xref linkend="vboxmanage-list" />. A filename must be specified
-      as valid path, either as an absolute path or as a relative path
-      starting from the current directory.
+      filename. Registered images can be listed by <command>VBoxManage
+      list hdds</command>. See <xref linkend="vboxmanage-list" />. A
+      filename must be specified as valid path, either as an absolute
+      path or as a relative path starting from the current directory.
     </para>
 
@@ -5333,6 +5610,6 @@
         <listitem>
           <para>
-            Allow to choose a file format for the output file different
-            from the file format of the input file.
+            Set a file format for the output file different from the
+            file format of the input file.
           </para>
         </listitem>
@@ -5346,8 +5623,8 @@
         <listitem>
           <para>
-            Allow to choose a file format variant for the output file.
-            It is a comma-separated list of variant flags. Not all
-            combinations are supported, and specifying inconsistent
-            flags will result in an error message.
+            Set a file format variant for the output file. This is a
+            comma-separated list of variant flags. Not all combinations
+            are supported, and specifying inconsistent flags will result
+            in an error message.
           </para>
         </listitem>
@@ -5376,7 +5653,8 @@
     <note>
       <para>
-        For compatibility with earlier versions of VirtualBox, the
-        "clonevdi" and "clonehd" commands are still supported and mapped
-        internally to the "clonehd disk" command.
+        For compatibility with earlier versions of &product-name;, the
+        <command>clonevdi</command> and <command>clonehd</command>
+        commands are still supported and mapped internally to the
+        <command>clonehd disk</command> command.
       </para>
     </note>
@@ -5389,6 +5667,6 @@
 
     <para>
-      This command sets up, gets or deletes a medium property. The
-      syntax is as follows:
+      This command sets, gets, or deletes a medium property. The syntax
+      is as follows:
     </para>
 
@@ -5402,5 +5680,5 @@
           Use <computeroutput>&lt;disk|dvd|floppy&gt;</computeroutput>
           to optionally specify the type of medium: disk (hard drive),
-          dvd or floppy.
+          dvd, or floppy.
         </para>
       </listitem>
@@ -5409,6 +5687,6 @@
         <para>
           Use <computeroutput>&lt;uuid|filename&gt;</computeroutput> to
-          supply either the uuid or absolute path of the medium/image to
-          be encrypted.
+          supply either the UUID or absolute path of the medium or
+          image.
         </para>
       </listitem>
@@ -5439,5 +5717,5 @@
           Use <computeroutput>&lt;disk|dvd|floppy&gt;</computeroutput>
           to optionally specify the type of medium: disk (hard drive),
-          dvd or floppy.
+          dvd, or floppy.
         </para>
       </listitem>
@@ -5446,6 +5724,6 @@
         <para>
           Use <computeroutput>&lt;uuid|filename&gt;</computeroutput> to
-          supply either the uuid or absolute path of the medium/image to
-          be encrypted.
+          supply either the UUID or absolute path of the medium or
+          image.
         </para>
       </listitem>
@@ -5469,5 +5747,5 @@
           Use <computeroutput>&lt;disk|dvd|floppy&gt;</computeroutput>
           to optionally specify the type of medium: disk (hard drive),
-          dvd or floppy.
+          dvd, or floppy.
         </para>
       </listitem>
@@ -5476,5 +5754,6 @@
         <para>
           Use <computeroutput>&lt;uuid|filename&gt;</computeroutput> to
-          supply either the uuid or absolute path of the medium/image.
+          supply either the UUID or absolute path of the medium or
+          image.
         </para>
       </listitem>
@@ -5496,6 +5775,6 @@
 
     <para>
-      This command is used to create a DEK encrypted medium/image. See
-      <xref linkend="diskencryption-encryption" />.
+      This command is used to create a DEK encrypted medium or image.
+      See <xref linkend="diskencryption-encryption" />.
     </para>
 
@@ -5514,6 +5793,6 @@
       <listitem>
         <para>
-          use <computeroutput>&lt;uuid|filename&gt;</computeroutput> to
-          supply the uuid or absolute path of the medium/image to be
+          Use <computeroutput>&lt;uuid|filename&gt;</computeroutput> to
+          supply the UUID or absolute path of the medium or image to be
           encrypted.
         </para>
@@ -5524,5 +5803,5 @@
           Use <computeroutput>--newpassword
           &lt;file|-&gt;</computeroutput> to supply a new encryption
-          password; either specify the absolute pathname of a password
+          password. Either specify the absolute pathname of a password
           file on the host operating system, or
           <computeroutput>-</computeroutput> to prompt you for the
@@ -5535,7 +5814,7 @@
       <listitem>
         <para>
-          use <computeroutput>--oldpassword
+          Use <computeroutput>--oldpassword
           &lt;file|-&gt;</computeroutput> to supply any old encryption
-          password; either specify the absolute pathname of a password
+          password. Either specify the absolute pathname of a password
           file on the host operating system, or
           <computeroutput>-</computeroutput> to prompt you for the old
@@ -5544,9 +5823,8 @@
 
         <para>
-          Use this option to gain access to an encrypted medium/image to
-          change its password using
-          <computeroutput>--newpassword</computeroutput> and/or change
-          its encryption using
-          <computeroutput>--cipher</computeroutput>.
+          Use this option to gain access to an encrypted medium or image
+          to either change its password using
+          <computeroutput>--newpassword</computeroutput> or change its
+          encryption using <computeroutput>--cipher</computeroutput>.
         </para>
       </listitem>
@@ -5555,5 +5833,5 @@
         <para>
           Use <computeroutput>--cipher &lt;cipher&gt;</computeroutput>
-          to specify the cipher to use for encryption; this can be
+          to specify the cipher to use for encryption. This can be
           either <computeroutput>AES-XTS128-PLAIN64</computeroutput> or
           <computeroutput>AES-XTS256-PLAIN64</computeroutput>.
@@ -5562,5 +5840,6 @@
         <para>
           Use this option to change any existing encryption on the
-          medium/image, or setup new encryption on it for the 1st time.
+          medium or image, or to set up new encryption on it for the
+          first time.
         </para>
       </listitem>
@@ -5570,5 +5849,5 @@
           Use <computeroutput>--newpasswordid &lt;password
           id&gt;</computeroutput> to supply the new password identifier.
-          This can be freely chosen by the user, and is used for correct
+          This can be chosen by the user, and is used for correct
           identification when supplying multiple passwords during VM
           startup.
@@ -5592,5 +5871,5 @@
     <para>
       This command is used to check the current encryption password on a
-      DEK encrypted medium/image. See
+      DEK encrypted medium or image. See
       <xref linkend="diskencryption-encryption" />.
     </para>
@@ -5608,5 +5887,5 @@
         <para>
           Use <computeroutput>&lt;uuid|filename&gt;</computeroutput> to
-          supply the uuid or absolute path of the medium/image to be
+          supply the UUID or absolute path of the medium or image to be
           checked.
         </para>
@@ -5632,6 +5911,6 @@
 
     <para>
-      This command converts a raw disk image to a VirtualBox Disk Image
-      (VDI) file. The syntax is as follows:
+      This command converts a raw disk image to a &product-name; Disk
+      Image (VDI) file. The syntax is as follows:
     </para>
 
@@ -5646,5 +5925,5 @@
 
     <para>
-      where the parameters mean:
+      The parameters are as follows:
     </para>
 
@@ -5671,6 +5950,6 @@
         <listitem>
           <para>
-            Select the disk image format to create. Default is VDI.
-            Other options are VMDK and VHD.
+            Select the disk image format to create. The default format
+            is VDI. Other options are VMDK and VHD.
           </para>
         </listitem>
@@ -5684,8 +5963,8 @@
         <listitem>
           <para>
-            Allow to choose a file format variant for the output file.
-            It is a comma-separated list of variant flags. Not all
-            combinations are supported, and specifying inconsistent
-            flags will result in an error message.
+            Choose a file format variant for the output file. This is a
+            comma-separated list of variant flags. Not all combinations
+            are supported, and specifying inconsistent flags will result
+            in an error message.
           </para>
         </listitem>
@@ -5699,5 +5978,5 @@
         <listitem>
           <para>
-            Allow to specifiy the UUID of the output file.
+            Specify the UUID of the output file.
           </para>
         </listitem>
@@ -5707,18 +5986,18 @@
 
     <para>
-      The second form forces VBoxManage to read the content for the disk
-      image from standard input (useful for using that command in a
-      pipe).
-    </para>
-
-    <para>
-      <note>
-        <para>
-          For compatibility with earlier versions of VirtualBox, the
-          "convertdd" command is also supported and mapped internally to
-          the "convertfromraw" command.
-        </para>
-      </note>
-    </para>
+      The <command>stdin</command> form of the command forces
+      <command>VBoxManage</command> to read the content of the disk
+      image from standard input. This useful when using the command in a
+      pipe.
+    </para>
+
+    <note>
+      <para>
+        For compatibility with earlier versions of &product-name;, the
+        <command>convertdd</command> command is also supported and
+        mapped internally to the <command>convertfromraw</command>
+        command.
+      </para>
+    </note>
 
   </sect1>
@@ -5729,10 +6008,10 @@
 
     <para>
-      These commands let you attach and retrieve string data to a
-      virtual machine or to a VirtualBox configuration, by specifying
-      <computeroutput>global</computeroutput> instead of a virtual
-      machine name. You must specify a key as a text string to associate
-      the data with, which you can later use to retrieve it. For
-      example:
+      These commands enable you to attach and retrieve string data for a
+      virtual machine or for a &product-name; configuration, by
+      specifying <computeroutput>global</computeroutput> instead of a
+      virtual machine name. You must specify a keyword as a text string
+      to associate the data with, which you can later use to retrieve
+      it. For example:
     </para>
 
@@ -5741,7 +6020,8 @@
 
     <para>
-      would associate the string "2006.01.01" with the key installdate
-      for the virtual machine Fedora5, and "2006.02.02" on the machine
-      SUSE10. You could retrieve the information as follows:
+      This example would associate the string "2006.01.01" with the
+      keyword installdate for the virtual machine Fedora5, and
+      "2006.02.02" on the machine SUSE10. You could then retrieve the
+      information as follows:
     </para>
 
@@ -5749,5 +6029,5 @@
 
     <para>
-      which would return
+      This would return the following:
     </para>
 
@@ -5759,5 +6039,5 @@
 
     <para>
-      You could retrieve the information for all keys as follows:
+      You could retrieve the information for all keywords as follows:
     </para>
 
@@ -5765,6 +6045,6 @@
 
     <para>
-      To remove a key, the <computeroutput>setextradata</computeroutput>
-      command must be run without specifying data, only the key. For
+      To remove a keyword, the <command>setextradata</command> command
+      must be run without specifying data, only the keyword. For
       example:
     </para>
@@ -5780,7 +6060,8 @@
     <para>
       This command is used to change global settings which affect the
-      entire VirtualBox installation. Some of these correspond to the
-      settings in the "Global settings" dialog in the graphical user
-      interface. The following properties are available:
+      entire &product-name; installation. Some of these correspond to
+      the settings in the <emphasis role="bold">Global
+      Settings</emphasis> dialog in the graphical user interface. The
+      following properties are available:
     </para>
 
@@ -5794,5 +6075,5 @@
         <listitem>
           <para>
-            This specifies the default folder in which virtual machine
+            Specifies the default folder in which virtual machine
             definitions are kept. See <xref linkend="vboxconfigdata" />.
           </para>
@@ -5807,5 +6088,5 @@
         <listitem>
           <para>
-            This specifies whether VirtualBox will make exclusive use of
+            Specifies whether &product-name; will make exclusive use of
             the hardware virtualization extensions (Intel VT-x or AMD-V)
             of the host system's processor. See
@@ -5825,7 +6106,7 @@
         <listitem>
           <para>
-            This specifies which library to use when "external"
-            authentication has been selected for a particular virtual
-            machine. See <xref linkend="vbox-auth" />.
+            Specifies which library to use when external authentication
+            has been selected for a particular virtual machine. See
+            <xref linkend="vbox-auth" />.
           </para>
         </listitem>
@@ -5839,8 +6120,8 @@
         <listitem>
           <para>
-            This specifies which library the web service uses to
-            authenticate users. For details about the VirtualBox web
-            service, please refer to the separate VirtualBox SDK
-            reference. See <xref
+            Specifies which library the web service uses to authenticate
+            users. For details about the &product-name; web service, see
+            the &product-name; SDK reference,
+            <xref
             linkend="VirtualBoxAPI" />.
           </para>
@@ -5855,6 +6136,6 @@
         <listitem>
           <para>
-            This specifies which library implements the VirtualBox
-            Remote Desktop Extension.
+            Specifies which library implements the VirtualBox Remote
+            Desktop Extension.
           </para>
         </listitem>
@@ -5868,5 +6149,5 @@
         <listitem>
           <para>
-            This selects how many rotated (old) VM logs are kept.
+            Selects how many rotated VM logs are retained.
           </para>
         </listitem>
@@ -5880,5 +6161,5 @@
         <listitem>
           <para>
-            This selects the path to the autostart database. See
+            Selects the path to the autostart database. See
             <xref linkend="autostart" />.
           </para>
@@ -5893,5 +6174,5 @@
         <listitem>
           <para>
-            This selects the global default VM frontend setting. See
+            Selects the global default VM frontend setting. See
             <xref linkend="vboxmanage-startvm" />.
           </para>
@@ -5906,13 +6187,33 @@
         <listitem>
           <para>
-            This configures the VBoxSVC release logging details.
-
-            <footnote>
-
-              <para>
-                <ulink url="http://www.virtualbox.org/wiki/VBoxLogging">http://www.virtualbox.org/wiki/VBoxLogging</ulink>.
-              </para>
-
-            </footnote>
+            Configures the VBoxSVC release logging details. See
+            <ulink url="http://www.virtualbox.org/wiki/VBoxLogging">http://www.virtualbox.org/wiki/VBoxLogging</ulink>.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <computeroutput>proxymode</computeroutput>
+        </term>
+
+        <listitem>
+          <para>
+            Configures the mode for an HTTP proxy server.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <computeroutput>proxyurl</computeroutput>
+        </term>
+
+        <listitem>
+          <para>
+            Configures the URL for an HTTP proxy server. Used when a
+            manual proxy is configured using the
+            <computeroutput>manual</computeroutput> setting of the
+            <computeroutput>proxymode</computeroutput> property.
           </para>
         </listitem>
@@ -5962,58 +6263,57 @@
 
     <para>
-      The <computeroutput>usbfilter</computeroutput> commands are used
-      for working with USB filters in virtual machines, or global
-      filters which affect the whole VirtualBox setup. Global filters
-      are applied before machine-specific filters, and may be used to
-      prevent devices from being captured by any virtual machine. Global
-      filters are always applied in a particular order, and only the
-      first filter which fits a device is applied. So for example, if
-      the first global filter says to hold (make available) a particular
-      Kingston memory stick device and the second to ignore all Kingston
-      devices, that memory stick will be available to any machine with
-      an appropriate filter, but no other Kingston device will.
-    </para>
-
-    <para>
-      When creating a USB filter using <computeroutput>usbfilter
-      add</computeroutput>, you must supply three or four mandatory
-      parameters. The index specifies the position in the list at which
-      the filter should be placed. If there is already a filter at that
-      position, then it and the following ones will be shifted back one
-      place. Otherwise the new filter will be added onto the end of the
-      list. The <computeroutput>target</computeroutput> parameter
-      selects the virtual machine that the filter should be attached to
-      or use "global" to apply it to all virtual machines.
-      <computeroutput>name</computeroutput> is a name for the new filter
-      and for global filters, <computeroutput>action</computeroutput>
-      says whether to allow VMs access to devices that fit the filter
-      description ("hold") or not to give them access ("ignore"). In
-      addition, you should specify parameters to filter by. You can find
-      the parameters for devices attached to your system using
-      <computeroutput>VBoxManage list usbhost</computeroutput>. Finally,
-      you can specify whether the filter should be active, and for local
-      filters, whether they are for local devices, remote (over an RDP
-      connection) or either.
-    </para>
-
-    <para>
-      When you modify a USB filter using <computeroutput>usbfilter
-      modify</computeroutput>, you must specify the filter by index and
-      by target, which is either a virtual machine or "global". See the
-      output of <computeroutput>VBoxManage list
-      usbfilters</computeroutput> to find global filter indexes and
-      <computeroutput>VBoxManage showvminfo</computeroutput> to find
-      indexes for individual machines. The properties which can be
-      changed are the same as for <computeroutput>usbfilter
-      add</computeroutput>. To remove a filter, use
-      <computeroutput>usbfilter remove</computeroutput> and specify the
-      index and the target.
-    </para>
-
-    <para>
-      The following is a list of the additional
-      <computeroutput>usbfilter add</computeroutput> and
-      <computeroutput>usbfilter modify</computeroutput> options, with
-      detailed explanations on how to use them.
+      The <command>usbfilter</command> commands are used for working
+      with USB filters in virtual machines, or global filters which
+      affect the whole &product-name; setup. Global filters are applied
+      before machine-specific filters, and may be used to prevent
+      devices from being captured by any virtual machine. Global filters
+      are always applied in a particular order, and only the first
+      filter which fits a device is applied. For example, if the first
+      global filter says to hold, or make available, a particular
+      Kingston memory stick device and the second filter says to ignore
+      all Kingston devices. That particular Kingston memory stick will
+      be available to any machine with the appropriate filter, but no
+      other Kingston device will.
+    </para>
+
+    <para>
+      When creating a USB filter using <command>usbfilter add</command>,
+      you must supply three or four mandatory parameters. The index
+      specifies the position in the list at which the filter should be
+      placed. If there is already a filter at that position, then it and
+      the following ones will be shifted back one place. Otherwise, the
+      new filter will be added onto the end of the list. The
+      <computeroutput>target</computeroutput> parameter selects the
+      virtual machine that the filter should be attached to or use
+      <computeroutput>global</computeroutput> to apply it to all virtual
+      machines. <computeroutput>name</computeroutput> is a name for the
+      new filter. For global filters,
+      <computeroutput>action</computeroutput> says whether to allow VMs
+      access to devices that fit the filter description (hold) or not to
+      give them access (ignore). In addition, you should specify
+      parameters to filter by. You can find the parameters for devices
+      attached to your system using <command>VBoxManage list
+      usbhost</command>. Finally, you can specify whether the filter
+      should be active. For local filters, whether they are for local
+      devices, remote devices over an RDP connection, or either.
+    </para>
+
+    <para>
+      When you modify a USB filter using <command>usbfilter
+      modify</command>, you must specify the filter by index and by
+      target, which is either a virtual machine or
+      <computeroutput>global</computeroutput>. See the output of
+      <command>VBoxManage list usbfilters</command> to find global
+      filter indexes and <command>VBoxManage showvminfo</command> to
+      find indexes for individual machines. The properties which can be
+      changed are the same as for <command>usbfilter add</command>. To
+      remove a filter, use <command>usbfilter remove</command> and
+      specify the index and the target.
+    </para>
+
+    <para>
+      The following is a list of the additional <command>usbfilter
+      add</command> and <command>usbfilter modify</command> options,
+      with details of how to use them.
     </para>
 
@@ -6022,14 +6322,14 @@
       <listitem>
         <para>
-          <computeroutput>--action ignore|hold</computeroutput>Specifies
-          whether devices that fit the filter description are allowed
-          access by machines ("hold"), or have access denied ("ignore").
-          Applies to global filters only.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--active yes|no</computeroutput>Specifies
+          <computeroutput>--action ignore|hold</computeroutput>:
+          Specifies whether devices that fit the filter description are
+          allowed access by machines (hold), or have access denied
+          (ignore). Applies to global filters only.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--active yes|no</computeroutput>: Specifies
           whether the USB Filter is active or temporarily disabled. For
           <computeroutput>usbfilter create</computeroutput> the default
@@ -6040,33 +6340,31 @@
       <listitem>
         <para>
-          <computeroutput>--vendorid
-          &lt;XXXX&gt;|""</computeroutput>Specifies a vendor ID filter -
-          the string representation for the exact matching has the form
-          XXXX, where X is the hex digit (including leading zeroes).
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--productid
-          &lt;XXXX&gt;|""</computeroutput>Specifies a product ID filter
-          - The string representation for the exact matching has the
-          form XXXX, where X is the hex digit (including leading
-          zeroes).
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--revision
-          &lt;IIFF&gt;|""</computeroutput>Specifies a revision ID filter
-          - the string representation for the exact matching has the
-          form IIFF, where I is the decimal digit of the integer part of
-          the revision, and F is the decimal digit of its fractional
-          part (including leading and trailing zeros). Note that for
-          interval filters, it's best to use the hex form, because the
-          revision is stored as a 16 bit packed BCD value; so the
-          expression int:0x0100-0x0199 will match any revision from 1.0
-          to 1.99 inclusive.
+          <computeroutput>--vendorid &lt;XXXX&gt;|""</computeroutput>:
+          Specifies a vendor ID filter. The string representation for an
+          exact match has the form XXXX, where X is the hexadecimal
+          digit, including leading zeroes.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--productid &lt;XXXX&gt;|""</computeroutput>:
+          Specifies a product ID filter. The string representation for
+          an exact match has the form XXXX, where X is the hexadecimal
+          digit, including leading zeroes.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--revision &lt;IIFF&gt;|""</computeroutput>:
+          Specifies a revision ID filter. The string representation for
+          an exact match has the form IIFF, where I is the decimal digit
+          of the integer part of the revision, and F is the decimal
+          digit of its fractional part, including leading and trailing
+          zeros. Note that for interval filters, it is best to use the
+          hexadecimal form, because the revision is stored as a 16-bit
+          packed BCD value. Therefore, the expression int:0x0100-0x0199
+          will match any revision from 1.0 to 1.99 inclusive.
         </para>
       </listitem>
@@ -6075,21 +6373,20 @@
         <para>
           <computeroutput>--manufacturer
-          &lt;string&gt;|""</computeroutput>Specifies a manufacturer ID
-          filter, as a string.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--product
-          &lt;string&gt;|""</computeroutput>Specifies a product ID
-          filter, as a string.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--remote yes|no""</computeroutput>Specifies a
-          remote filter - indicating whether the device is physically
+          &lt;string&gt;|""</computeroutput>: Specifies a manufacturer
+          ID filter, as a string.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--product &lt;string&gt;|""</computeroutput>:
+          Specifies a product ID filter, as a string.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--remote yes|no""</computeroutput>: Specifies
+          a remote filter, indicating whether the device is physically
           connected to a remote VRDE client or to a local host machine.
           Applies to VM filters only.
@@ -6100,5 +6397,5 @@
         <para>
           <computeroutput>--serialnumber
-          &lt;string&gt;|""</computeroutput>Specifies a serial number
+          &lt;string&gt;|""</computeroutput>: Specifies a serial number
           filter, as a string.
         </para>
@@ -6108,9 +6405,9 @@
         <para>
           <computeroutput>--maskedinterfaces
-          &lt;XXXXXXXX&gt;</computeroutput>Specifies a masked interface
-          filter, for hiding one or more USB interfaces from the guest.
-          The value is a bit mask where the set bits correspond to the
-          USB interfaces that should be hidden, or masked off. This
-          feature only works on Linux hosts.
+          &lt;XXXXXXXX&gt;</computeroutput>: Specifies a masked
+          interface filter, for hiding one or more USB interfaces from
+          the guest. The value is a bit mask where the set bits
+          correspond to the USB interfaces that should be hidden, or
+          masked off. This feature only works on Linux hosts.
         </para>
       </listitem>
@@ -6131,8 +6428,8 @@
 
     <para>
-      This command allows you to share folders on the host computer with
-      guest operating systems. For this, the guest systems must have a
-      version of the VirtualBox Guest Additions installed which supports
-      this functionality.
+      This command enables you to share folders on the host computer
+      with guest operating systems. For this, the guest systems must
+      have a version of the &product-name; Guest Additions installed
+      which supports this functionality.
     </para>
 
@@ -6145,39 +6442,40 @@
       <listitem>
         <para>
-          <computeroutput>&lt;uuid|vmname&gt;</computeroutput> Specifies
-          the UUID or name of the VM whose guest operating system will
-          be sharing folders with the host computer. Mandatory.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--name &lt;name&gt;</computeroutput> Specifies
-          the name of the share. Each share has a unique name within the
-          namespace of the host operating system. Mandatory.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>-hostpath &lt;hostpath&gt;</computeroutput>
+          <computeroutput>&lt;uuid|vmname&gt;</computeroutput>:
+          Specifies the UUID or name of the VM whose guest operating
+          system will be sharing folders with the host computer.
+          Mandatory.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--name &lt;name&gt;</computeroutput>:
+          Specifies the name of the share. Each share has a unique name
+          within the namespace of the host operating system. Mandatory.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>-hostpath &lt;hostpath&gt;</computeroutput>:
           Specifies the absolute path on the host operating system of
-          the folder/directory to be shared with the guest operating
-          system. Mandatory.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>-transient</computeroutput> Specifies that the
-          share is 'transient', meaning that it can be added and removed
-          at runtime and does not persist after the VM has stopped.
-          Optional.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>-readonly</computeroutput> Specifies that the
+          the directory to be shared with the guest operating system.
+          Mandatory.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>-transient</computeroutput>: Specifies that
+          the share is transient, meaning that it can be added and
+          removed at runtime and does not persist after the VM has
+          stopped. Optional.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>-readonly</computeroutput>: Specifies that the
           share has only read-only access to files at the host path.
         </para>
@@ -6185,18 +6483,20 @@
         <para>
           By default, shared folders have read/write access to the files
-          at the host path. More specifically, on Linux distros - shared
-          folders are mounted with 770 io permissions with root user and
-          vboxsf as the group, and using this option the io permissions
-          change to 700. Optional.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>-automount</computeroutput> Specifies that the
-          share will be automatically mounted. On Linux distros, this
-          will be to either /media/USER/sf_&lt;name&gt; or
-          /media/sf_&lt;name&gt; - depending on your guest OS. Where
-          &lt;name&gt; is the share name. Optional.
+          on the host path. On Linux distributions, shared folders are
+          mounted with 770 file permissions with root user and vboxsf as
+          the group. Using this option the file permissions change to
+          700. Optional.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>-automount</computeroutput>: Specifies that
+          the share will be automatically mounted. On Linux
+          distributions, this will be to either
+          <computeroutput>/media/USER/sf_&lt;name&gt;</computeroutput>
+          or <computeroutput>/media/sf_&lt;name&gt;</computeroutput>,
+          where &lt;name&gt; is the share named. The actual location
+          depends on the guest OS. Optional.
         </para>
       </listitem>
@@ -6211,7 +6511,7 @@
 
     <para>
-      This command allows you to delete shared folders on the host
+      This command enables you to delete shared folders on the host
       computer shares with the guest operating systems. For this, the
-      guest systems must have a version of the VirtualBox Guest
+      guest systems must have a version of the &product-name; Guest
       Additions installed which supports this functionality.
     </para>
@@ -6225,25 +6525,25 @@
       <listitem>
         <para>
-          <computeroutput>&lt;uuid|vmname&gt;</computeroutput> Specifies
-          the UUID or name of the VM whose guest operating system is
-          sharing folders with the host computer. Mandatory.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>--name &lt;name&gt;</computeroutput> Specifies
-          the name of the share to be removed. Each share has a unique
-          name within the namespace of the host operating system.
-          Mandatory.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>-transient</computeroutput> Specifies that the
-          share is 'transient', meaning that it can be added and removed
-          at runtime and does not persist after the VM has stopped.
-          Optional.
+          <computeroutput>&lt;uuid|vmname&gt;</computeroutput>:
+          Specifies the UUID or name of the VM whose guest operating
+          system is sharing folders with the host computer. Mandatory.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--name &lt;name&gt;</computeroutput>:
+          Specifies the name of the share to be removed. Each share has
+          a unique name within the namespace of the host operating
+          system. Mandatory.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>-transient</computeroutput>: Specifies that
+          the share is transient, meaning that it can be added and
+          removed at runtime and does not persist after the VM has
+          stopped. Optional.
         </para>
       </listitem>
@@ -6262,14 +6562,14 @@
 
     <para>
-      The "guestproperty" commands allow you to get or set properties of
-      a running virtual machine. See
-      <xref linkend="guestadd-guestprops" /> for an introduction. As
-      explained there, guest properties are arbitrary key/value string
-      pairs which can be written to and read from by either the guest or
-      the host, so they can be used as a low-volume communication
-      channel for strings, provided that a guest is running and has the
-      Guest Additions installed. In addition, a number of values whose
-      keys begin with "/VirtualBox/" are automatically set and
-      maintained by the Guest Additions.
+      The <command>guestproperty</command> commands enable you to get or
+      set properties of a running virtual machine. See
+      <xref linkend="guestadd-guestprops" />. Guest properties are
+      arbitrary keyword-value string pairs which can be written to and
+      read from by either the guest or the host, so they can be used as
+      a low-volume communication channel for strings, provided that a
+      guest is running and has the Guest Additions installed. In
+      addition, a number of values whose keywords begin with
+      <computeroutput>/VirtualBox/</computeroutput>are automatically set
+      and maintained by the Guest Additions.
     </para>
 
@@ -6277,5 +6577,6 @@
       The following subcommands are available, where
       <computeroutput>&lt;vm&gt;</computeroutput> can either be a VM
-      name or a VM UUID, as with the other VBoxManage commands:
+      name or a VM UUID, as with the other <command>VBoxManage</command>
+      commands:
     </para>
 
@@ -6285,8 +6586,8 @@
         <para>
           <computeroutput>enumerate &lt;vm&gt; [--patterns
-          &lt;pattern&gt;]</computeroutput>: This lists all the guest
+          &lt;pattern&gt;]</computeroutput>: Lists all the guest
           properties that are available for the given VM, including the
           value. This list will be very limited if the guest's service
-          process cannot be contacted, e.g. because the VM is not
+          process cannot be contacted, for example because the VM is not
           running or the Guest Additions are not installed.
         </para>
@@ -6303,6 +6604,6 @@
           <listitem>
             <para>
-              <computeroutput>*</computeroutput> (asterisk): represents
-              any number of characters; for example,
+              <computeroutput>*</computeroutput> (asterisk): Represents
+              any number of characters. For example,
               "<computeroutput>/VirtualBox*</computeroutput>" would
               match all properties beginning with "/VirtualBox".
@@ -6313,5 +6614,5 @@
             <para>
               <computeroutput>?</computeroutput> (question mark):
-              represents a single arbitrary character; for example,
+              Represents a single arbitrary character. For example,
               "<computeroutput>fo?</computeroutput>" would match both
               "foo" and "for".
@@ -6321,6 +6622,6 @@
           <listitem>
             <para>
-              <computeroutput>|</computeroutput> (pipe symbol): can be
-              used to specify multiple alternative patterns; for
+              <computeroutput>|</computeroutput> (pipe symbol): Can be
+              used to specify multiple alternative patterns. For
               example, "<computeroutput>s*|t*</computeroutput>" would
               match anything starting with either "s" or "t".
@@ -6333,11 +6634,12 @@
       <listitem>
         <para>
-          <computeroutput>get &lt;vm&gt; &lt;property&gt;
-          </computeroutput>: This retrieves the value of a single
-          property only. If the property cannot be found (e.g. because
-          the guest is not running), this will print
+          <computeroutput>get &lt;vm&gt;
+          &lt;property&gt;</computeroutput>: Retrieves the value of a
+          single property only. If the property cannot be found, for
+          example because the guest is not running, the following
+          message is shown:
+        </para>
 
 <screen>No value set!</screen>
-        </para>
       </listitem>
 
@@ -6345,6 +6647,6 @@
         <para>
           <computeroutput>set &lt;vm&gt; &lt;property&gt; [&lt;value&gt;
-          [--flags &lt;flags&gt;]]</computeroutput>: This allows you to
-          set a guest property by specifying the key and value. If
+          [--flags &lt;flags&gt;]]</computeroutput>: Enables you to set
+          a guest property by specifying the keyword and value. If
           <computeroutput>&lt;value&gt;</computeroutput> is omitted, the
           property is deleted. With
@@ -6366,5 +6668,5 @@
             <para>
               <computeroutput>TRANSRESET</computeroutput>: The value
-              will be deleted as soon as the VM restarts and/or exits.
+              will be deleted as soon as the VM restarts or exits.
             </para>
           </listitem>
@@ -6399,8 +6701,8 @@
         <para>
           <computeroutput>wait &lt;vm&gt; &lt;pattern&gt; --timeout
-          &lt;timeout&gt;</computeroutput>: This waits for a particular
-          value described by "pattern" to change or to be deleted or
-          created. The pattern rules are the same as for the "enumerate"
-          subcommand above.
+          &lt;timeout&gt;</computeroutput>: Waits for a particular value
+          described by the pattern string to change or to be deleted or
+          created. The pattern rules are the same as for the
+          <command>enumerate</command> subcommand.
         </para>
       </listitem>
@@ -6409,6 +6711,6 @@
         <para>
           <computeroutput>delete &lt;vm&gt;
-          &lt;property&gt;</computeroutput>: Deletes a formerly set
-          guest property.
+          &lt;property&gt;</computeroutput>: Deletes a guest property
+          which has been set previously.
         </para>
       </listitem>
@@ -6423,6 +6725,6 @@
 
     <para>
-      The <computeroutput>guestcontrol</computeroutput> commands enable
-      control of the guest from the host. See
+      The <command>guestcontrol</command> commands enable control of the
+      guest from the host. See
       <xref
     linkend="guestadd-guestcontrol" /> for an introduction.
@@ -6430,10 +6732,11 @@
 
     <para>
-      guestcontrol has two sets of subcommands. The first set requires
-      guest credentials to be specified, the second does not.
-    </para>
-
-    <para>
-      The first set of subcommands is of the form:
+      The <command>guestcontrol</command> command has two sets of
+      subcommands. The first set requires guest credentials to be
+      specified, the second does not.
+    </para>
+
+    <para>
+      The first set of subcommands is of the following form:
     </para>
 
@@ -6446,5 +6749,5 @@
 
     <para>
-      The "common-options" are:
+      The common options are as follows:
     </para>
 
@@ -6457,6 +6760,6 @@
 
     <para>
-      Where details of the common options for the first set of
-      subcommands are:
+      The common options for the first set of subcommands are explained
+      in the following list.
     </para>
 
@@ -6544,5 +6847,5 @@
 
     <para>
-      The first set of subcommands:
+      The first set of subcommands are as follows:
     </para>
 
@@ -6551,7 +6854,7 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>run</computeroutput></emphasis>
-          Executes a guest program - forwarding stdout, stderr and stdin
-          to/from the host until it completes.
+          <computeroutput>run</computeroutput>: Executes a guest
+          program, forwarding stdout, stderr, and stdin to and from the
+          host until it completes.
         </para>
 
@@ -6589,5 +6892,5 @@
               <para>
                 Specifies the absolute path of the executable on the
-                guest OS file system. Mandatory. e.g.:
+                guest OS file system. Mandatory. For example:
                 <computeroutput>C:\Windows\System32\calc.exe</computeroutput>.
               </para>
@@ -6602,8 +6905,10 @@
             <listitem>
               <para>
-                Specifies the maximum time (microseconds) that the
-                executable can run, during which VBoxManage receives its
-                output. Optional. If unspecified, VBoxManage waits
-                indefinitely for the process to end, or an error occurs.
+                Specifies the maximum time, in microseconds, that the
+                executable can run, during which
+                <command>VBoxManage</command> receives its output.
+                Optional. If unspecified, <command>VBoxManage</command>
+                waits indefinitely for the process to end, or an error
+                occurs.
               </para>
             </listitem>
@@ -6618,5 +6923,5 @@
             <listitem>
               <para>
-                Sets/modifies/unsets environment variable(s) in the
+                Sets, modifies, and unsets environment variables in the
                 environment in which the program will run. Optional.
               </para>
@@ -6625,5 +6930,5 @@
                 The guest process is created with the standard default
                 guest OS environment. Use this option to modify that
-                default environment. To set/modify a variable use:
+                default environment. To set or modify a variable use:
                 <computeroutput>&lt;NAME&gt;=&lt;VALUE&gt;</computeroutput>.
                 To unset a variable use:
@@ -6632,10 +6937,11 @@
 
               <para>
-                Any spaces in names/values should be enclosed by quotes.
-              </para>
-
-              <para>
-                To set/modify/unset multiple variables, use multiple
-                instances of the
+                Any spaces in names and values should be enclosed by
+                quotes.
+              </para>
+
+              <para>
+                To set, modify, and unset multiple variables, use
+                multiple instances of the
                 <computeroutput>--E|--putenv</computeroutput> option.
               </para>
@@ -6650,5 +6956,5 @@
             <listitem>
               <para>
-                Disables escaped double quoting (e.g. \"fred\") on
+                Disables escaped double quoting, such as \"fred\", on
                 arguments passed to the executed program. Optional.
               </para>
@@ -6688,8 +6994,9 @@
             <listitem>
               <para>
-                Does not wait/waits until the guest process ends and
+                Does not wait or waits until the guest process ends and
                 receives its exit code and reason/flags. In the case of
-                --wait-stdout - while the process runs, VBoxManage
-                receives its stdout. Optional.
+                <computeroutput>--wait-stdout</computeroutput>,
+                <command>VBoxManage</command> receives its stdout while
+                the process runs. Optional.
               </para>
             </listitem>
@@ -6703,8 +7010,10 @@
             <listitem>
               <para>
-                Does not wait/waits until the guest process ends and
-                receives its exit code and reason/flags. In case of
-                --wait-stderr - while the process runs, VBoxManage
-                receives its stderr. Optional.
+                Does not wait or waits until the guest process ends and
+                receives its exit code, error messages, and flags. In
+                the case of
+                <computeroutput>--wait-stderr</computeroutput>,
+                <command>VBoxManage</command> receives its stderr while
+                the process runs. Optional.
               </para>
             </listitem>
@@ -6748,11 +7057,10 @@
             <listitem>
               <para>
-                Specifies program name, followed by one or more
+                Specifies the program name, followed by one or more
                 arguments to pass to the program. Optional.
               </para>
 
               <para>
-                Note: Any spaces in arguments should be enclosed by
-                quotes.
+                Any spaces in arguments should be enclosed by quotes.
               </para>
             </listitem>
@@ -6761,14 +7069,15 @@
         </variablelist>
 
-        <para>
-          <note>
-            <para>
-              On Windows there are certain limitations for graphical
-              applications; please see <xref linkend="KnownIssues" />
-              for more information.
-            </para>
-          </note>
-
-          Examples:
+        <note>
+          <para>
+            On Windows there are certain limitations for graphical
+            applications. See <xref linkend="KnownIssues" />.
+          </para>
+        </note>
+
+        <para>
+          Examples of using the <command>guestcontrol run</command>
+          command are as follows:
+        </para>
 
 <screen>VBoxManage --nologo guestcontrol "My VM" run --exe "/bin/ls"
@@ -6778,229 +7087,13 @@
           --username foo --passwordfile bar.txt --wait-exit --wait-stdout</screen>
 
+        <para>
           Note that the double backslashes in the second example are
-          only required on Unix hosts.
-        </para>
-
-        <para>
-          <note>
-            <para>
-              For certain commands a user name of an existing user
-              account on the guest must be specified; anonymous
-              executions are not supported for security reasons. A user
-              account password, however, is optional and depends on the
-              guest's OS security policy or rules. If no password is
-              specified for a given user name, an empty password will be
-              used. On certain OSes like Windows the security policy may
-              needs to be adjusted in order to allow user accounts with
-              an empty password set. Also, global domain rules might
-              apply and therefore cannot be changed.
-            </para>
-          </note>
-        </para>
-
-        <para>
-          Starting at VirtualBox 4.1.2 guest process execution by
-          default is limited to serve up to 5 guest processes at a time.
-          If a new guest process gets started which would exceed this
-          limit, the oldest not running guest process will be discarded
-          in order to be able to run that new process. Also, retrieving
-          output from this old guest process will not be possible
-          anymore then. If all 5 guest processes are still active and
-          running, starting a new guest process will result in an
-          appropriate error message.
-        </para>
-
-        <para>
-          To raise or lower the guest process execution limit, either
-          the guest property
-          <computeroutput>/VirtualBox/GuestAdd/VBoxService/--control-procs-max-kept</computeroutput>
-          or VBoxService' command line by specifying
-          <computeroutput>--control-procs-max-kept</computeroutput>
-          needs to be modified. A restart of the guest OS is required
-          afterwards. To serve unlimited guest processes, a value of
-          <computeroutput>0</computeroutput> needs to be set (not
-          recommended).
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold"><computeroutput>start</computeroutput></emphasis>
-          Executes a guest program until it completes.
-        </para>
-
-<screen>VBoxManage guestcontrol &lt;uuid|vmname&gt; start [common-options]
-           [--exe &lt;path to executable&gt;] [--timeout &lt;msec&gt;]
-           [-E|--putenv &lt;NAME&gt;[=&lt;VALUE&gt;]] [--unquoted-args]
-           [--ignore-operhaned-processes] [--profile]
-            -- &lt;program/arg0&gt; [argument1] ... [argumentN]]
-          </screen>
-
-        <para>
-          Where the options are:
-        </para>
-
-        <variablelist>
-
-          <varlistentry>
-            <term>
-              <computeroutput>&lt;uuid|vmname&gt;</computeroutput>
-            </term>
-
-            <listitem>
-              <para>
-                Specifies the VM UUID or VM name. Mandatory.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>
-              <computeroutput>--exe &lt;path to
-              executable&gt;</computeroutput>
-            </term>
-
-            <listitem>
-              <para>
-                Specifies the absolute path of the executable on the
-                guest OS file system. Mandatory. e.g.:
-                <computeroutput>C:\Windows\System32\calc.exe</computeroutput>
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>
-              <computeroutput>--timeout &lt;msec&gt;</computeroutput>
-            </term>
-
-            <listitem>
-              <para>
-                Specifies the maximum time (microseconds) that the
-                executable can run. Optional. If unspecified, VBoxManage
-                waits indefinitely for the process to end, or an error
-                occurs.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>
-              <computeroutput>-E|--putenv &lt;NAME&gt;=&lt;VALUE&gt;
-              </computeroutput>
-            </term>
-
-            <listitem>
-              <para>
-                Sets/modifies/unsets environment variable(s) in the
-                environment in which the program will run. Optional.
-              </para>
-
-              <para>
-                The guest process is created with the standard default
-                guest OS environment. Use this option to modify that
-                default environment. To set/modify a variable use:
-                <computeroutput>&lt;NAME&gt;=&lt;VALUE&gt;</computeroutput>.
-                To unset a variable use:
-                <computeroutput>&lt;NAME&gt;=</computeroutput>
-              </para>
-
-              <para>
-                Any spaces in names/values should be enclosed by quotes.
-              </para>
-
-              <para>
-                To set/modify/unset multiple variables, use multiple
-                instances of the
-                <computeroutput>--E|--putenv</computeroutput> option.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>
-              <computeroutput>--unquoted-args</computeroutput>
-            </term>
-
-            <listitem>
-              <para>
-                Disables escaped double quoting (e.g. \"fred\") on
-                arguments passed to the executed program. Optional.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>
-              <computeroutput>--ignore-operhaned-processes</computeroutput>
-            </term>
-
-            <listitem>
-              <para>
-                Ignores orphaned processes. Not yet implemented.
-                Optional.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>
-              <computeroutput>--profile</computeroutput>
-            </term>
-
-            <listitem>
-              <para>
-                Use a profile. Not yet implemented. Optional.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>
-              <computeroutput>[-- &lt;program/arg0&gt;
-              [&lt;argument1&gt;] ...
-              [&lt;argumentN&gt;]]</computeroutput>
-            </term>
-
-            <listitem>
-              <para>
-                Specifies program name, followed by one or more
-                arguments to pass to the program. Optional.
-              </para>
-
-              <para>
-                Note: Any spaces in arguments should be enclosed by
-                quotes.
-              </para>
-            </listitem>
-          </varlistentry>
-
-        </variablelist>
+          only required on UNIX hosts.
+        </para>
 
         <note>
           <para>
-            On Windows there are certain limitations for graphical
-            applications; please see <xref linkend="KnownIssues" /> for
-            more information.
-          </para>
-        </note>
-
-        <para>
-          Examples:
-
-<screen>VBoxManage --nologo guestcontrol "My VM" start --exe "/bin/ls"
-          --username foo --passwordfile bar.txt --wait-exit --wait-stdout -- -l /usr</screen>
-
-<screen>VBoxManage --nologo guestcontrol "My VM" start --exe "c:\\windows\\system32\\ipconfig.exe"
-          --username foo --passwordfile bar.txt --wait-exit --wait-stdout</screen>
-
-          Note that the double backslashes in the second example are
-          only required on Unix hosts.
-        </para>
-
-        <note>
-          <para>
             For certain commands a user name of an existing user account
-            on the guest must be specified; anonymous executions are not
+            on the guest must be specified. Anonymous executions are not
             supported for security reasons. A user account password,
             however, is optional and depends on the guest's OS security
@@ -7015,33 +7108,250 @@
 
         <para>
-          Starting at VirtualBox 4.1.2 guest process execution by
-          default is limited to serve up to 5 guest processes at a time.
-          If a new guest process gets started which would exceed this
-          limit, the oldest not running guest process will be discarded
-          in order to be able to run that new process. Also, retrieving
-          output from this old guest process will not be possible
-          anymore then. If all 5 guest processes are still active and
-          running, starting a new guest process will result in an
-          appropriate error message.
+          Starting at &product-name; 4.1.2 guest process execution by
+          default is limited to serve up to five guest processes at a
+          time. If a new guest process gets started which would exceed
+          this limit, the oldest not running guest process will be
+          discarded in order to be able to run that new process. Also,
+          retrieving output from this old guest process will not be
+          possible anymore then. If all five guest processes are still
+          active and running, starting a new guest process will result
+          in an appropriate error message.
         </para>
 
         <para>
           To raise or lower the guest process execution limit, either
-          the guest property
+          use the guest property
           <computeroutput>/VirtualBox/GuestAdd/VBoxService/--control-procs-max-kept</computeroutput>
-          or VBoxService' command line by specifying
+          or <command>VBoxService</command> command line by specifying
           <computeroutput>--control-procs-max-kept</computeroutput>
           needs to be modified. A restart of the guest OS is required
           afterwards. To serve unlimited guest processes, a value of
-          <computeroutput>0</computeroutput> needs to be set (not
-          recommended).
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold"><computeroutput>copyfrom</computeroutput></emphasis>
-          Copies files from the guest to the host file system. (Note -
-          only with Guest Additions 4.0 or later installed).
+          <computeroutput>0</computeroutput> needs to be set, but this
+          is not recommended.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>start</computeroutput>: Executes a guest
+          program until it completes.
+        </para>
+
+<screen>VBoxManage guestcontrol &lt;uuid|vmname&gt; start [common-options]
+           [--exe &lt;path to executable&gt;] [--timeout &lt;msec&gt;]
+           [-E|--putenv &lt;NAME&gt;[=&lt;VALUE&gt;]] [--unquoted-args]
+           [--ignore-operhaned-processes] [--profile]
+            -- &lt;program/arg0&gt; [argument1] ... [argumentN]]
+          </screen>
+
+        <para>
+          Where the options are as follows:
+        </para>
+
+        <variablelist>
+
+          <varlistentry>
+            <term>
+              <computeroutput>&lt;uuid|vmname&gt;</computeroutput>
+            </term>
+
+            <listitem>
+              <para>
+                Specifies the VM UUID or VM name. Mandatory.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>
+              <computeroutput>--exe &lt;path to
+              executable&gt;</computeroutput>
+            </term>
+
+            <listitem>
+              <para>
+                Specifies the absolute path of the executable on the
+                guest OS file system. Mandatory. For example:
+                <computeroutput>C:\Windows\System32\calc.exe</computeroutput>
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>
+              <computeroutput>--timeout &lt;msec&gt;</computeroutput>
+            </term>
+
+            <listitem>
+              <para>
+                Specifies the maximum time, in microseconds, that the
+                executable can run. Optional. If unspecified,
+                <command>VBoxManage</command> waits indefinitely for the
+                process to end, or an error occurs.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>
+              <computeroutput>-E|--putenv &lt;NAME&gt;=&lt;VALUE&gt;
+              </computeroutput>
+            </term>
+
+            <listitem>
+              <para>
+                Sets, modifies, and unsets environment variables in the
+                environment in which the program will run. Optional.
+              </para>
+
+              <para>
+                The guest process is created with the standard default
+                guest OS environment. Use this option to modify that
+                default environment. To set or modify a variable use:
+                <computeroutput>&lt;NAME&gt;=&lt;VALUE&gt;</computeroutput>.
+                To unset a variable use:
+                <computeroutput>&lt;NAME&gt;=</computeroutput>
+              </para>
+
+              <para>
+                Any spaces in names and values should be enclosed by
+                quotes.
+              </para>
+
+              <para>
+                To set, modify, or unset multiple variables, use
+                multiple instances of the
+                <computeroutput>--E|--putenv</computeroutput> option.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>
+              <computeroutput>--unquoted-args</computeroutput>
+            </term>
+
+            <listitem>
+              <para>
+                Disables escaped double quoting, such as \"fred\", on
+                arguments passed to the executed program. Optional.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>
+              <computeroutput>--ignore-operhaned-processes</computeroutput>
+            </term>
+
+            <listitem>
+              <para>
+                Ignores orphaned processes. Not yet implemented.
+                Optional.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>
+              <computeroutput>--profile</computeroutput>
+            </term>
+
+            <listitem>
+              <para>
+                Use a profile. Not yet implemented. Optional.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>
+              <computeroutput>[-- &lt;program/arg0&gt;
+              [&lt;argument1&gt;] ...
+              [&lt;argumentN&gt;]]</computeroutput>
+            </term>
+
+            <listitem>
+              <para>
+                Specifies the program name, followed by one or more
+                arguments to pass to the program. Optional.
+              </para>
+
+              <para>
+                Any spaces in arguments should be enclosed by quotes.
+              </para>
+            </listitem>
+          </varlistentry>
+
+        </variablelist>
+
+        <note>
+          <para>
+            On Windows there are certain limitations for graphical
+            applications. See <xref linkend="KnownIssues" />.
+          </para>
+        </note>
+
+        <para>
+          Examples of using the <command>guestcontrol start</command>
+          command are as follows:
+        </para>
+
+<screen>VBoxManage --nologo guestcontrol "My VM" start --exe "/bin/ls"
+          --username foo --passwordfile bar.txt --wait-exit --wait-stdout -- -l /usr</screen>
+
+<screen>VBoxManage --nologo guestcontrol "My VM" start --exe "c:\\windows\\system32\\ipconfig.exe"
+          --username foo --passwordfile bar.txt --wait-exit --wait-stdout</screen>
+
+        <para>
+          Note that the double backslashes in the second example are
+          only required on UNIX hosts.
+        </para>
+
+        <note>
+          <para>
+            For certain commands a user name of an existing user account
+            on the guest must be specified. Anonymous executions are not
+            supported for security reasons. A user account password,
+            however, is optional and depends on the guest's OS security
+            policy or rules. If no password is specified for a given
+            user name, an empty password will be used. On certain OSes
+            like Windows the security policy may needs to be adjusted in
+            order to allow user accounts with an empty password set.
+            Also, global domain rules might apply and therefore cannot
+            be changed.
+          </para>
+        </note>
+
+        <para>
+          Starting at &product-name; 4.1.2 guest process execution by
+          default is limited to serve up to five guest processes at a
+          time. If a new guest process gets started which would exceed
+          this limit, the oldest not running guest process will be
+          discarded in order to be able to run that new process. Also,
+          retrieving output from this old guest process will not be
+          possible anymore then. If all five guest processes are still
+          active and running, starting a new guest process will result
+          in an appropriate error message.
+        </para>
+
+        <para>
+          To raise or lower the guest process execution limit, either
+          use the guest property
+          <computeroutput>/VirtualBox/GuestAdd/VBoxService/--control-procs-max-kept</computeroutput>
+          or <command>VBoxService</command> command line by specifying
+          <computeroutput>--control-procs-max-kept</computeroutput>
+          needs to be modified. A restart of the guest OS is required
+          afterwards. To serve unlimited guest processes, a value of
+          <computeroutput>0</computeroutput> needs to be set, but this
+          is not recommended.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>copyfrom</computeroutput>: Copies files from
+          the guest to the host file system. Only available with Guest
+          Additions 4.0 or later installed.
         </para>
 
@@ -7052,5 +7362,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7089,6 +7399,6 @@
             <listitem>
               <para>
-                Enables recursive copying of files/directories from the
-                specified guest file system directory. Optional.
+                Enables recursive copying of files and directories from
+                the specified guest file system directory. Optional.
               </para>
             </listitem>
@@ -7104,5 +7414,5 @@
               <para>
                 Specifies the absolute path of the host file system
-                destination directory. Mandatory. e.g.
+                destination directory. Mandatory. For example:
                 <computeroutput>C:\Temp</computeroutput>.
               </para>
@@ -7118,8 +7428,8 @@
             <listitem>
               <para>
-                Specifies the absolute path(s) of guest file system
-                file(s) to be copied. Mandatory. e.g.
+                Specifies the absolute paths of guest file system files
+                to be copied. Mandatory. For example:
                 <computeroutput>C:\Windows\System32\calc.exe</computeroutput>.
-                Wildcards can be used in the expression(s), e.g.
+                Wildcards can be used in the expressions. For example:
                 <computeroutput>C:\Windows\System*\*.dll</computeroutput>.
               </para>
@@ -7132,7 +7442,7 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>copyto</computeroutput></emphasis>
-          Copies files from the host to the guest file system. (Note -
-          only with Guest Additions 4.0 or later installed).
+          <computeroutput>copyto</computeroutput>: Copies files from the
+          host to the guest file system. Only available with Guest
+          Additions 4.0 or later installed.
         </para>
 
@@ -7143,5 +7453,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7180,6 +7490,6 @@
             <listitem>
               <para>
-                Enables recursive copying of files/directories from the
-                specified host file system directory(ies). Optional.
+                Enables recursive copying of files and directories from
+                the specified host file system directory. Optional.
               </para>
             </listitem>
@@ -7195,5 +7505,5 @@
               <para>
                 Specifies the absolute path of the guest file system
-                destination directory. Mandatory. e.g.
+                destination directory. Mandatory. For example:
                 <computeroutput>C:\Temp</computeroutput>.
               </para>
@@ -7209,8 +7519,8 @@
             <listitem>
               <para>
-                Specifies the absolute path(s) of host file system
-                file(s) to be copied. Mandatory. e.g.
+                Specifies the absolute paths of host file system files
+                to be copied. Mandatory. For example:
                 <computeroutput>C:\Windows\System32\calc.exe</computeroutput>.
-                Wildcards can be used in the expression(s), e.g.
+                Wildcards can be used in the expressions. For example:
                 <computeroutput>C:\Windows\System*\*.dll</computeroutput>.
               </para>
@@ -7223,7 +7533,7 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>md|mkdir|createdir|createdirectory</computeroutput></emphasis>
-          Creates one or more directory(ies) on the guest file system.
-          (Note - only with Guest Additions 4.0 or later installed).
+          <computeroutput>md|mkdir|createdir|createdirectory</computeroutput>:
+          Creates one or more directories on the guest file system. Only
+          available with Guest Additions 4.0 or later installed.
         </para>
 
@@ -7233,5 +7543,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7257,10 +7567,10 @@
             <listitem>
               <para>
-                Creates any absent parent directory(ies) of the
-                specified directory. Optional.
-              </para>
-
-              <para>
-                e.g. If specified directory is
+                Creates any absent parent directories of the specified
+                directory. Optional.
+              </para>
+
+              <para>
+                For example: If specified directory is
                 <computeroutput>D:\Foo\Bar</computeroutput> and
                 <computeroutput>D:\Foo</computeroutput> is absent, it
@@ -7280,9 +7590,8 @@
               <para>
                 Specifies the permission mode on the specified
-                directory(ies) (and any parents, where
-                <computeroutput>--parents</computeroutput> option used).
-                Currently octal modes (e.g.
-                <computeroutput>0755</computeroutput>) only are
-                supported.
+                directories, and any parents, if the
+                <computeroutput>--parents</computeroutput> option is
+                used. Currently octal modes only, such as.
+                <computeroutput>0755</computeroutput>, are supported.
               </para>
             </listitem>
@@ -7297,16 +7606,16 @@
             <listitem>
               <para>
-                Specifies list of absolute path(s) of directory(ies) to
-                be created on guest file system. Mandatory. e.g.
+                Specifies a list of absolute paths of directories to be
+                created on guest file system. Mandatory. For example:
                 <computeroutput>D:\Foo\Bar</computeroutput>.
               </para>
 
               <para>
-                All parent directories must already exist unless switch
-                <computeroutput>--parents</computeroutput> used. (e.g.
-                in the above example
-                <computeroutput>D:\Foo</computeroutput>). The specified
+                All parent directories must already exist unless the
+                switch <computeroutput>--parents</computeroutput> is
+                used. For example, in the above example
+                <computeroutput>D:\Foo</computeroutput>. The specified
                 user must have sufficient rights to create the specified
-                directory(ies), and any parents that need to be created.
+                directories, and any parents that need to be created.
               </para>
             </listitem>
@@ -7318,7 +7627,7 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>rmdir|removedir|removedirectory</computeroutput></emphasis>
-          Deletes specified guest file system directories. (Only with
-          installed Guest Additions 4.3.2 and later).
+          <computeroutput>rmdir|removedir|removedirectory</computeroutput>:
+          Deletes specified guest file system directories. Only
+          available with installed Guest Additions 4.3.2 and later.
         </para>
 
@@ -7329,5 +7638,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7366,10 +7675,10 @@
             <listitem>
               <para>
-                Specifies list of the absolute path(s) of directory(ies)
-                to be deleted on guest file system. Mandatory. Wildcards
-                are allowed. e.g.
+                Specifies a list of the absolute paths of directories to
+                be deleted on guest file system. Mandatory. Wildcards
+                are allowed. For example:
                 <computeroutput>D:\Foo\*Bar</computeroutput>. The
                 specified user must have sufficient rights to delete the
-                specified directory(ies).
+                specified directories.
               </para>
             </listitem>
@@ -7381,7 +7690,7 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>rm|removefile</computeroutput></emphasis>
-          Deletes specified files on the guest file system. (Only with
-          installed Guest Additions 4.3.2 and later).
+          <computeroutput>rm|removefile</computeroutput>: Deletes
+          specified files on the guest file system. Only available with
+          installed Guest Additions 4.3.2 and later.
         </para>
 
@@ -7391,5 +7700,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7415,6 +7724,6 @@
             <listitem>
               <para>
-                Enforce operation (override any requests for
-                confirmations). Optional.
+                Enforce operation and override any requests for
+                confirmations. Optional.
               </para>
             </listitem>
@@ -7429,10 +7738,10 @@
             <listitem>
               <para>
-                Specifies list of absolute path(s) of file(s) to be
+                Specifies a list of absolute paths of files to be
                 deleted on guest file system. Mandatory. Wildcards are
-                allowed. e.g.
+                allowed. For example:
                 <computeroutput>D:\Foo\Bar\text*.txt</computeroutput>.
                 The specified user should have sufficient rights to
-                delete the specified file(s).
+                delete the specified files.
               </para>
             </listitem>
@@ -7444,8 +7753,7 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>mv|move|ren|rename</computeroutput></emphasis>
-          This subcommand renames file(s) and/or directory(ies) on the
-          guest file system. (Only with installed Guest Additions 4.3.2
-          and later).
+          <computeroutput>mv|move|ren|rename</computeroutput>: Renames
+          files and/or directories on the guest file system. Only
+          available with installed Guest Additions 4.3.2 and later.
         </para>
 
@@ -7454,5 +7762,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7479,9 +7787,9 @@
             <listitem>
               <para>
-                Specifies absolute path(s) of file(s) and/or single
-                directory to be moved/renamed on guest file system.
-                Mandatory. Wildcards are allowed in file names(s). The
-                specified user should have sufficient rights to access
-                the specified file(s).
+                Specifies absolute paths of files or a single directory
+                to be moved and renamed on guest file system. Mandatory.
+                Wildcards are allowed in file names. The specified user
+                should have sufficient rights to access the specified
+                files.
               </para>
             </listitem>
@@ -7495,10 +7803,10 @@
             <listitem>
               <para>
-                Specifies the absolute path of the destination
-                file/directory to which the file(s) are to be moved.
-                Mandatory. If only one file to be moved, &lt;dest&gt;
-                can be file or directory, else it must be a directory.
-                The specified user must have sufficient rights to access
-                the destination file/directory.
+                Specifies the absolute path of the destination file or
+                directory to which the files are to be moved. Mandatory.
+                If only one file to be moved, &lt;dest&gt; can be file
+                or directory, else it must be a directory. The specified
+                user must have sufficient rights to access the
+                destination file or directory.
               </para>
             </listitem>
@@ -7510,11 +7818,11 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>mktemp|createtemp|createtemporary</computeroutput></emphasis>
-          Creates a temporary file/directory on the guest file system,
-          to assist subsequent copying of files from the host to the
-          guest file systems. By default, the file/directory is created
-          in the guest's platform specific temp directory. Not currently
-          supported. (Only with installed Guest Additions 4.2 and
-          later).
+          <computeroutput>mktemp|createtemp|createtemporary</computeroutput>:
+          Creates a temporary file or directory on the guest file
+          system, to assist subsequent copying of files from the host to
+          the guest file systems. By default, the file or directory is
+          created in the guest's platform specific temp directory. Not
+          currently supported. Only available with installed Guest
+          Additions 4.2 and later.
         </para>
 
@@ -7525,5 +7833,5 @@
 
         <para>
-          The parameters are:
+          The parameters are as follows:
         </para>
 
@@ -7562,6 +7870,6 @@
             <listitem>
               <para>
-                Enforces secure file/directory creation. Optional. The
-                permission mode is set to
+                Enforces secure file and directory creation. Optional.
+                The permission mode is set to
                 <computeroutput>0755</computeroutput>. Operation fails
                 if it cannot be performed securely.
@@ -7578,6 +7886,6 @@
               <para>
                 Specifies the permission mode of the specified
-                directory. Optional. Currently only octal modes (e.g.
-                <computeroutput>0755</computeroutput>) are supported.
+                directory. Optional. Currently only octal modes, such as
+                <computeroutput>0755</computeroutput>, are supported.
               </para>
             </listitem>
@@ -7593,7 +7901,7 @@
               <para>
                 Specifies the absolute path of the directory on the
-                guest file system into which the file/directory
-                specified in will be created. Optional. If unspecified,
-                the platform-specific temp directory is used.
+                guest file system where the file or directory specified
+                will be created. Optional. If unspecified, the
+                platform-specific temp directory is used.
               </para>
             </listitem>
@@ -7608,6 +7916,6 @@
               <para>
                 Specifies a file name without a directory path,
-                containing at least one sequence comprising three
-                consecutive 'X' characters, or ending in 'X'. Mandatory.
+                containing at least one sequence of three consecutive X
+                characters, or ending in X. Mandatory.
               </para>
             </listitem>
@@ -7619,6 +7927,6 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>stat</computeroutput></emphasis>
-          Displays file or file system status(es) on the guest.
+          <computeroutput>stat</computeroutput>: Displays file or file
+          system statuses on the guest.
         </para>
 
@@ -7627,5 +7935,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7652,9 +7960,9 @@
             <listitem>
               <para>
-                Specifies absolute path(s) of file(s) and/or file
-                system(s) on guest file system. Mandatory. e.g.
+                Specifies absolute paths of files or file systems on the
+                guest file system. Mandatory. For example:
                 <computeroutput>/home/foo/a.out</computeroutput>. The
                 specified user should have sufficient rights to access
-                the specified file(s)/file system(s).
+                the specified files or file systems.
               </para>
             </listitem>
@@ -7675,5 +7983,5 @@
 
     <para>
-      The "common-options" are:
+      The common options are as follows:
     </para>
 
@@ -7683,6 +7991,6 @@
 
     <para>
-      Where details of the common options for the second set of
-      subcommands are:
+      Details of the common options for the second set of subcommands
+      are as follows:
     </para>
 
@@ -7696,5 +8004,5 @@
         <listitem>
           <para>
-            Makes the sub-command execution more verbose. Optional.
+            Makes the subcommand execution more verbose. Optional.
           </para>
         </listitem>
@@ -7708,5 +8016,5 @@
         <listitem>
           <para>
-            Makes the sub-command execution quieter. Optional.
+            Makes the subcommand execution quieter. Optional.
           </para>
         </listitem>
@@ -7716,5 +8024,5 @@
 
     <para>
-      The second set of subcommands:
+      The second set of subcommands are as follows:
     </para>
 
@@ -7723,7 +8031,7 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>list</computeroutput></emphasis>
-          Lists guest control configuration and status data, e.g. open
-          guest sessions, guest processes and files.
+          <computeroutput>list</computeroutput>: Lists guest control
+          configuration and status data. For example: open guest
+          sessions, guest processes, and files.
         </para>
 
@@ -7732,5 +8040,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7767,7 +8075,7 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>closeprocess</computeroutput></emphasis>
-          Terminates guest processes specified by PID(s))running in
-          guest session(s), specified by the session ID or name(s).
+          <computeroutput>closeprocess</computeroutput>: Terminates
+          guest processes specified by PIDs running in a guest session,
+          specified by the session ID or name.
         </para>
 
@@ -7777,5 +8085,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7839,7 +8147,7 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>closesession</computeroutput></emphasis>
-          Closes specified guest sessions, specified either by session
-          ID or name.
+          <computeroutput>closesession</computeroutput>: Closes
+          specified guest sessions, specified either by session ID or
+          name.
         </para>
 
@@ -7848,5 +8156,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7910,10 +8218,10 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>updatega|updateadditions|updateguestadditions</computeroutput></emphasis>
-          Ugrades Guest Additions already installed on the guest. (Only
-          already installed Guest Additions 4.0 and later).
-        </para>
-
-<screen>VBoxManage guestcontrol &lt;uuid|vmname&gt; updatega|updateadditions|updateguestadditions
+          <computeroutput>updatega|updateadditions|updateguestadditions</computeroutput>:
+          Ugrades Guest Additions already installed on the guest. Only
+          available for already installed Guest Additions 4.0 and later.
+        </para>
+
+<screen>VBoxManage guestcontrol &lt;uuid|vmname&gt; updatega|updateadditions|updateguestadditions 
            [common-options]
            [--source &lt;New .ISO path&gt;]
@@ -7922,5 +8230,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -7947,6 +8255,6 @@
             <listitem>
               <para>
-                Specifies the absolute path on guest file system of the
-                .ISO file for Guest Additions update. Mandatory.
+                Specifies the absolute path on the guest file system of
+                the .ISO file for the Guest Additions update. Mandatory.
               </para>
             </listitem>
@@ -7960,16 +8268,18 @@
             <listitem>
               <para>
-                Indicates that VBoxManage starts the usual updating
-                process on the guest and then waits until the actual
-                Guest Additions updating begins, at which point
-                VBoxManage self-terminates. Optional.
-              </para>
-
-              <para>
-                Default behavior is that VBoxManage waits for completion
-                of the Guest Additions update before terminating. Use of
-                this option is sometimes necessary, as a running
-                VBoxManage can affect the interaction between the
-                installer and the guest OS.
+                Indicates that <command>VBoxManage</command> starts the
+                usual updating process on the guest and then waits until
+                the actual Guest Additions updating begins, at which
+                point <command>VBoxManage</command> self-terminates.
+                Optional.
+              </para>
+
+              <para>
+                Default behavior is that <command>VBoxManage</command>
+                waits for completion of the Guest Additions update
+                before terminating. Use of this option is sometimes
+                necessary, as a running <command>VBoxManage</command>
+                can affect the interaction between the installer and the
+                guest OS.
               </para>
             </listitem>
@@ -8001,6 +8311,6 @@
       <listitem>
         <para>
-          <emphasis role="bold"><computeroutput>watch</computeroutput></emphasis>
-          This subcommand prints current guest control activity.
+          <computeroutput>watch</computeroutput>: Prints current guest
+          control activity.
         </para>
 
@@ -8009,5 +8319,5 @@
 
         <para>
-          Where the parameters are:
+          Where the parameters are as follows:
         </para>
 
@@ -8047,20 +8357,20 @@
 
     <para>
-      Metric data is collected and retained internally; it may be
-      retrieved at any time with the <computeroutput>VBoxManage metrics
-      query</computeroutput> subcommand. The data is available as long
-      as the background <computeroutput>VBoxSVC</computeroutput> process
-      is alive. That process terminates shortly after all VMs and
-      frontends have been closed.
+      Metric data is collected and retained internally. It may be
+      retrieved at any time with the <command>VBoxManage metrics
+      query</command> subcommand. The data is available as long as the
+      background <computeroutput>VBoxSVC</computeroutput> process is
+      alive. That process terminates shortly after all VMs and frontends
+      have been closed.
     </para>
 
     <para>
       By default no metrics are collected at all. Metrics collection
-      does not start until <computeroutput>VBoxManage metrics
-      setup</computeroutput> is invoked with a proper sampling interval
-      and the number of metrics to be retained. The interval is measured
-      in seconds. For example, to enable collecting the host processor
-      and memory usage metrics every second and keeping the 5 most
-      current samples, the following command can be used:
+      does not start until <command>VBoxManage metrics setup</command>
+      is invoked with a proper sampling interval and the number of
+      metrics to be retained. The interval is measured in seconds. For
+      example, to enable collecting the host processor and memory usage
+      metrics every second and keeping the five most current samples,
+      the following command can be used:
     </para>
 
@@ -8070,34 +8380,33 @@
       Metric collection can only be enabled for started VMs. Collected
       data and collection settings for a particular VM will disappear as
-      soon as it shuts down. Use <computeroutput>VBoxManage metrics list
-      </computeroutput> subcommand to see which metrics are currently
-      available. You can also use
-      <computeroutput>--list</computeroutput> option with any subcommand
-      that modifies metric settings to find out which metrics were
-      affected.
-    </para>
-
-    <para>
-      Note that the <computeroutput>VBoxManage metrics
-      setup</computeroutput> subcommand discards all samples that may
-      have been previously collected for the specified set of objects
-      and metrics.
+      soon as it shuts down. Use <command>VBoxManage metrics list
+      </command> subcommand to see which metrics are currently
+      available. You can also use <option>--list</option> option with
+      any subcommand that modifies metric settings to find out which
+      metrics were affected.
+    </para>
+
+    <para>
+      Note that the <command>VBoxManage metrics setup</command>
+      subcommand discards all samples that may have been previously
+      collected for the specified set of objects and metrics.
     </para>
 
     <para>
       To enable or disable metrics collection without discarding the
-      data <computeroutput>VBoxManage metrics enable</computeroutput>
-      and <computeroutput>VBoxManage metrics disable</computeroutput>
-      subcommands can be used. Note that these subcommands expect
-      metrics, not submetrics, like <code>CPU/Load</code> or
-      <code>RAM/Usage</code> as parameters. In other words enabling
-      <code>CPU/Load/User</code> while disabling
-      <code>CPU/Load/Kernel</code> is not supported.
+      data, <command>VBoxManage metrics enable</command> and
+      <command>VBoxManage metrics disable</command> subcommands can be
+      used. Note that these subcommands expect metrics as parameters,
+      not submetrics such as <computeroutput>CPU/Load</computeroutput>
+      or <computeroutput>RAM/Usage</computeroutput>. In other words
+      enabling <computeroutput>CPU/Load/User</computeroutput> while
+      disabling <computeroutput>CPU/Load/Kernel</computeroutput> is not
+      supported.
     </para>
 
     <para>
       The host and VMs have different sets of associated metrics.
-      Available metrics can be listed with <computeroutput>VBoxManage
-      metrics list</computeroutput> subcommand.
+      Available metrics can be listed with <command>VBoxManage metrics
+      list</command> subcommand.
     </para>
 
@@ -8113,18 +8422,19 @@
     <para>
       Subcommands may apply to all objects and metrics or can be limited
-      to one object or/and a list of metrics. If no objects or metrics
-      are given in the parameters, the subcommands will apply to all
+      to one object and a list of metrics. If no objects or metrics are
+      given in the parameters, the subcommands will apply to all
       available metrics of all objects. You may use an asterisk
-      ("<computeroutput>*</computeroutput>") to explicitly specify that
+      "<computeroutput>*</computeroutput>" to explicitly specify that
       the command should be applied to all objects or metrics. Use
-      "host" as the object name to limit the scope of the command to
-      host-related metrics. To limit the scope to a subset of metrics,
-      use a metric list with names separated by commas.
+      <computeroutput>host</computeroutput> as the object name to limit
+      the scope of the command to host-related metrics. To limit the
+      scope to a subset of metrics, use a metric list with names
+      separated by commas.
     </para>
 
     <para>
       For example, to query metric data on the CPU time spent in user
-      and kernel modes by the virtual machine named "test", you can use
-      the following command:
+      and kernel modes by the virtual machine named
+      <computeroutput>test</computeroutput>, use the following command:
     </para>
 
@@ -8144,7 +8454,7 @@
         <listitem>
           <para>
-            This subcommand shows the parameters of the currently
-            existing metrics. Note that VM-specific metrics are only
-            available when a particular VM is running.
+            Shows the parameters of the currently existing metrics. Note
+            that VM-specific metrics are only available when a
+            particular VM is running.
           </para>
         </listitem>
@@ -8158,8 +8468,8 @@
         <listitem>
           <para>
-            This subcommand sets the interval between taking two samples
-            of metric data and the number of samples retained
-            internally. The retained data is available for displaying
-            with the <code>query</code> subcommand. The
+            Sets the interval between taking two samples of metric data
+            and the number of samples retained internally. The retained
+            data is available for displaying with the
+            <command>query</command> subcommand. The
             <computeroutput>--list </computeroutput> option shows which
             metrics have been modified as the result of the command
@@ -8176,10 +8486,9 @@
         <listitem>
           <para>
-            This subcommand "resumes" data collection after it has been
-            stopped with <code>disable</code> subcommand. Note that
-            specifying submetrics as parameters will not enable
-            underlying metrics. Use
-            <computeroutput>--list</computeroutput> to find out if the
-            command did what was expected.
+            Resumes data collection after it has been stopped with the
+            <command>disable</command> subcommand. Note that specifying
+            submetrics as parameters will not enable underlying metrics.
+            Use <computeroutput>--list</computeroutput> to find out if
+            the command worked as expected.
           </para>
         </listitem>
@@ -8193,10 +8502,9 @@
         <listitem>
           <para>
-            This subcommand "suspends" data collection without affecting
-            collection parameters or collected data. Note that
-            specifying submetrics as parameters will not disable
-            underlying metrics. Use
-            <computeroutput>--list</computeroutput> to find out if the
-            command did what was expected.
+            Suspends data collection without affecting collection
+            parameters or collected data. Note that specifying
+            submetrics as parameters will not disable underlying
+            metrics. Use <computeroutput>--list</computeroutput> to find
+            out if the command worked as expected.
           </para>
         </listitem>
@@ -8210,16 +8518,15 @@
         <listitem>
           <para>
-            This subcommand retrieves and displays the currently
-            retained metric data.
-
-            <note>
-              <para>
-                The <code>query</code> subcommand does not remove or
-                "flush" retained data. If you query often enough you
-                will see how old samples are gradually being "phased
-                out" by new samples.
-              </para>
-            </note>
-          </para>
+            Retrieves and displays the currently retained metric data.
+          </para>
+
+          <note>
+            <para>
+              The <command>query</command> subcommand does not remove or
+              flush retained data. If you query often enough you will
+              see how old samples are gradually being phased out by new
+              samples.
+            </para>
+          </note>
         </listitem>
       </varlistentry>
@@ -8232,14 +8539,14 @@
         <listitem>
           <para>
-            This subcommand sets the interval between taking two samples
-            of metric data and the number of samples retained
-            internally. The collected data is displayed periodically
-            until Ctrl-C is pressed unless the
-            <computeroutput>--detach</computeroutput> option is
-            specified. With the
+            Sets the interval between taking two samples of metric data
+            and the number of samples retained internally. The collected
+            data is displayed periodically until Ctrl+C is pressed,
+            unless the <computeroutput>--detach</computeroutput> option
+            is specified. With the
             <computeroutput>--detach</computeroutput> option, this
-            subcommand operates the same way as <code>setup</code> does.
-            The <computeroutput>--list</computeroutput> option shows
-            which metrics match the specified filter.
+            subcommand operates the same way as
+            <computeroutput>setup</computeroutput> does. The
+            <computeroutput>--list</computeroutput> option shows which
+            metrics match the specified filter.
           </para>
         </listitem>
@@ -8268,5 +8575,5 @@
       internal network is chosen when the NAT service is created, and
       the internal network will be created if it does not already exist.
-      An example command to create a NAT network:
+      The following is an example command to create a NAT network:
     </para>
 
@@ -8274,13 +8581,16 @@
 
     <para>
-      Here, "natnet1" is the name of the internal network to be used and
-      "192.168.15.0/24" is the network address and mask of the NAT
-      service interface. By default, in this static configuration the
-      gateway will be assigned the address 192.168.15.1, the address
-      after the interface address, though this is subject to change.
-    </para>
-
-    <para>
-      To add a DHCP server to the NAT network after creation:
+      Here, <computeroutput>natnet1</computeroutput> is the name of the
+      internal network to be used and
+      <computeroutput>192.168.15.0/24</computeroutput> is the network
+      address and mask of the NAT service interface. By default, in this
+      static configuration the gateway will be assigned the address
+      192.168.15.1, the address after the interface address, though this
+      is subject to change.
+    </para>
+
+    <para>
+      To add a DHCP server to the NAT network after creation, run the
+      following command:
     </para>
 
@@ -8288,7 +8598,6 @@
 
     <para>
-      Below are the subcommands for
-      <emphasis role="bold"><computeroutput>VBoxManage natnetwork
-      </computeroutput></emphasis>
+      The subcommands for <command>VBoxManage natnetwork</command> are
+      as follows:
     </para>
 
@@ -8305,9 +8614,8 @@
 
     <para>
-      <emphasis role="bold"><computeroutput>VBoxManage natnetwork
-      add</computeroutput></emphasis> Creates a new internal network
-      interface, and adds a NAT network service. This command is a
-      prerequisite for enabling attachment of VMs to the NAT network.
-      Parameters are as follows:
+      <command>VBoxManage natnetwork add</command>: Creates a new
+      internal network interface, and adds a NAT network service. This
+      command is a prerequisite for enabling attachment of VMs to the
+      NAT network. Parameters are as follows:
     </para>
 
@@ -8334,6 +8642,7 @@
         <listitem>
           <para>
-            Where &lt;network&gt; specifies the static(default)/DHCP
-            network address and mask of the NAT service interface.
+            Where &lt;network&gt; specifies the static or DHCP network
+            address and mask of the NAT service interface. The default
+            is a static network address.
           </para>
         </listitem>
@@ -8347,5 +8656,5 @@
         <listitem>
           <para>
-            Enables/disables the NAT network service.
+            Enables and disables the NAT network service.
           </para>
         </listitem>
@@ -8359,6 +8668,7 @@
         <listitem>
           <para>
-            Enables/disables DHCP server specified by --netname; its use
-            also indicates that it is a DHCP server.
+            Enables and disables a DHCP server specified by
+            <computeroutput>--netname</computeroutput>. Use of this
+            option also indicates that it is a DHCP server.
           </para>
         </listitem>
@@ -8372,5 +8682,5 @@
         <listitem>
           <para>
-            Enables IPv4 port forwarding, rule specified by
+            Enables IPv4 port forwarding, with a rule specified by
             &lt;rule&gt;.
           </para>
@@ -8385,5 +8695,31 @@
         <listitem>
           <para>
-            Enables IPv4 loopback interface, rule specified by
+            Enables the IPv4 loopback interface, with a rule specified
+            by &lt;rule&gt;.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <computeroutput>--ipv6 on|off</computeroutput>
+        </term>
+
+        <listitem>
+          <para>
+            Enables and disables IPv6. The default setting is IPv4,
+            disabling IPv6 enables IPv4.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <computeroutput>--port-forward-6 &lt;rule&gt;</computeroutput>
+        </term>
+
+        <listitem>
+          <para>
+            Enables IPv6 port forwarding, with a rule specified by
             &lt;rule&gt;.
           </para>
@@ -8393,30 +8729,4 @@
       <varlistentry>
         <term>
-          <computeroutput>--ipv6 on|off</computeroutput>
-        </term>
-
-        <listitem>
-          <para>
-            Enables/disables IPv6 (default is IPv4, disables gives
-            IPv4).
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <computeroutput>--port-forward-6 &lt;rule&gt;</computeroutput>
-        </term>
-
-        <listitem>
-          <para>
-            Enables IPv6 port forwarding, rule specified by
-            &lt;rule&gt;.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
           <computeroutput>--loopback-6 &lt;rule&gt;</computeroutput>
         </term>
@@ -8424,6 +8734,6 @@
         <listitem>
           <para>
-            Enables IPv6 loopback interface, rule specified by
-            &lt;rule&gt;.
+            Enables the IPv6 loopback interface, with a rule specified
+            by &lt;rule&gt;.
           </para>
         </listitem>
@@ -8435,7 +8745,6 @@
 
     <para>
-      <emphasis role="bold"><computeroutput>VBoxManage natnetwork
-      remove</computeroutput></emphasis> Removes a NAT network service.
-      Parameters are as follows:
+      <command>VBoxManage natnetwork remove</command>: Removes a NAT
+      network service. Parameters are as follows:
     </para>
 
@@ -8470,7 +8779,6 @@
 
     <para>
-      <emphasis role="bold"><computeroutput>VBoxManage natnetwork
-      modify</computeroutput></emphasis> Modifies an existing NAT
-      network service. Parameters are as follows:
+      <command>VBoxManage natnetwork modify</command>: Modifies an
+      existing NAT network service. Parameters are as follows:
     </para>
 
@@ -8497,6 +8805,7 @@
         <listitem>
           <para>
-            Where &lt;network&gt; specifies the new static(default)/DHCP
-            network address and mask of the NAT service interface.
+            Where &lt;network&gt; specifies the new static or DHCP
+            network address and mask of the NAT service interface. The
+            default is a static network address.
           </para>
         </listitem>
@@ -8510,5 +8819,5 @@
         <listitem>
           <para>
-            Enables/disables the NAT network service.
+            Enables and disables the NAT network service.
           </para>
         </listitem>
@@ -8522,5 +8831,6 @@
         <listitem>
           <para>
-            Enables (and if absent, adds)/disables (if any) DHCP server.
+            Enables and disables a DHCP server. If a DHCP server is not
+            present, using enable adds a new DHCP server.
           </para>
         </listitem>
@@ -8534,5 +8844,5 @@
         <listitem>
           <para>
-            Enables IPv4 port forwarding, rule specified by
+            Enables IPv4 port forwarding, with a rule specified by
             &lt;rule&gt;.
           </para>
@@ -8547,5 +8857,31 @@
         <listitem>
           <para>
-            Enables IPv4 loopback interface, rule specified by
+            Enables the IPv4 loopback interface, with a rule specified
+            by &lt;rule&gt;.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <computeroutput>--ipv6 on|off</computeroutput>
+        </term>
+
+        <listitem>
+          <para>
+            Enables and disables IPv6. The default setting is IPv4,
+            disabling IPv6 enables IPv4.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <computeroutput>--port-forward-6 &lt;rule&gt;</computeroutput>
+        </term>
+
+        <listitem>
+          <para>
+            Enables IPv6 port forwarding, with a rule specified by
             &lt;rule&gt;.
           </para>
@@ -8555,30 +8891,4 @@
       <varlistentry>
         <term>
-          <computeroutput>--ipv6 on|off</computeroutput>
-        </term>
-
-        <listitem>
-          <para>
-            Enables/disables IPv6 (default is IPv4, disables gives
-            IPv4).
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <computeroutput>--port-forward-6 &lt;rule&gt;</computeroutput>
-        </term>
-
-        <listitem>
-          <para>
-            Enables IPv6 port forwarding, rule specified by
-            &lt;rule&gt;.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
           <computeroutput>--loopback-6 &lt;rule&gt;</computeroutput>
         </term>
@@ -8586,5 +8896,5 @@
         <listitem>
           <para>
-            Enables IPv6 loopback interface, rule specified by
+            Enables IPv6 loopback interface, with a rule specified by
             &lt;rule&gt;.
           </para>
@@ -8598,7 +8908,7 @@
 
     <para>
-      <emphasis  role="bold"><computeroutput>VBoxManage natnetwork
-      start</computeroutput></emphasis> Starts specified NAT network
-      service and any associated DHCP server. Parameters are as follows:
+      <command>VBoxManage natnetwork start</command>: Starts the
+      specified NAT network service and any associated DHCP server.
+      Parameters are as follows:
     </para>
 
@@ -8624,7 +8934,7 @@
 
     <para>
-      <emphasis  role="bold"><computeroutput>VBoxManage natnetwork
-      stop</computeroutput></emphasis> Stops specified NAT network
-      service and any DHCP server. Parameters are as follows:
+      <command>VBoxManage natnetwork stop</command>: Stops the specified
+      NAT network service and any DHCP server. Parameters are as
+      follows:
     </para>
 
@@ -8649,7 +8959,7 @@
 
     <para>
-      <emphasis  role="bold"><computeroutput>VBoxManage natnetwork
-      list</computeroutput></emphasis> Lists all NAT network services
-      with optional filtering. Parameters are as follows:
+      <command>VBoxManage natnetwork list</command>: Lists all NAT
+      network services, with optional filtering. Parameters are as
+      follows:
     </para>
 
@@ -8663,5 +8973,5 @@
         <listitem>
           <para>
-            Where &lt;pattern&gt; is optional filtering pattern.
+            Where &lt;pattern&gt; is an optional filtering pattern.
           </para>
         </listitem>
@@ -8677,10 +8987,10 @@
 
     <para>
-      With "hostonlyif" you can change the IP configuration of a
-      host-only network interface. For a description of host-only
-      networking, see <xref linkend="network_hostonly" />. Each
-      host-only interface is identified by a name and can either use the
-      internal DHCP server or a manual IP configuration, both IP4 and
-      IP6.
+      The <command>hostonlyif</command> command enables you to change
+      the IP configuration of a host-only network interface. For a
+      description of host-only networking, see
+      <xref linkend="network_hostonly" />. Each host-only interface is
+      identified by a name and can either use the internal DHCP server
+      or a manual IP configuration, both IP4 and IP6.
     </para>
 
@@ -8698,5 +9008,5 @@
         <listitem>
           <para>
-            Configure a host-only interface
+            Configures a host-only interface.
           </para>
         </listitem>
@@ -8738,9 +9048,10 @@
 
     <para>
-      The "dhcpserver" commands allow you to control the DHCP server
-      that is built into VirtualBox. You may find this useful when using
-      internal or host-only networking. Theoretically, you can enable it
-      for a bridged network as well, but that will likely cause
-      conflicts with other DHCP servers in your physical network.
+      The <command>dhcpserver</command> commands enable you to control
+      the DHCP server that is built into &product-name;. You may find
+      this useful when using internal or host-only networking.
+      Theoretically, you can also enable it for a bridged network, but
+      that may cause conflicts with other DHCP servers in your physical
+      network.
     </para>
 
@@ -8778,9 +9089,8 @@
 
         <para>
-          Alternatively, you can also use the
-          <computeroutput>--netname</computeroutput> option as with
-          internal networks if you know the host-only network's name.
-          You can see the names with <computeroutput>VBoxManage list
-          hostonlyifs</computeroutput>. See
+          Alternatively, you can also use the <option>--netname</option>
+          option as with internal networks if you know the host-only
+          network's name. You can see the names with <command>VBoxManage
+          list hostonlyifs</command>. See
           <xref linkend="vboxmanage-list" />.
         </para>
@@ -8799,5 +9109,5 @@
         <para>
           With <computeroutput>--ip</computeroutput>, specify the IP
-          address of the DHCP server itself.
+          address of the DHCP server.
         </para>
       </listitem>
@@ -8814,38 +9124,54 @@
           With <computeroutput>--lowerip</computeroutput> and
           <computeroutput>--upperip</computeroutput>, you can specify
-          the lowest and highest IP address, respectively, that the DHCP
-          server will hand out to clients.
+          the lowest and highest IP address that the DHCP server will
+          assign to clients.
         </para>
       </listitem>
 
     </itemizedlist>
+
+    <para>
+      You can specify additional DHCP options with the
+      <computeroutput>--options</computeroutput> command option. Use
+      <computeroutput>--id</computeroutput> and
+      <computeroutput>--value</computeroutput> to configure a number and
+      string pair corresponding to the DHCP option. Use
+      <computeroutput>--remove</computeroutput> to remove a DHCP option.
+    </para>
+
+    <para>
+      The <computeroutput>--vm</computeroutput> and
+      <computeroutput>--nic</computeroutput> settings enable you to
+      configure DHCP options for a specific network adapter used by the
+      named VM.
+    </para>
 
     <para>
       Finally, you must specify
       <computeroutput>--enable</computeroutput> or the DHCP server will
-      be created in the disabled state, doing nothing.
-    </para>
-
-    <para>
-      After this, VirtualBox will automatically start the DHCP server
-      for given internal or host-only network as soon as the first
-      virtual machine which uses that network is started.
-    </para>
-
-    <para>
-      Reversely, use <computeroutput>VBoxManage dhcpserver
-      remove</computeroutput> with the given <computeroutput>--netname
-      &lt;network_name&gt;</computeroutput> or <computeroutput>--ifname
-      &lt;hostonly_if_name&gt;</computeroutput> to remove the DHCP
-      server again for the given internal or host-only network.
-    </para>
-
-    <para>
-      To modify the settings of a DHCP server created earlier with
-      <computeroutput>VBoxManage dhcpserver add</computeroutput>, you
-      can use <computeroutput>VBoxManage dhcpserver
-      modify</computeroutput> for a given network or host-only interface
-      name. This has the same parameters as <computeroutput>VBoxManage
-      dhcpserver add</computeroutput>.
+      be created in the disabled state and will not be running.
+    </para>
+
+    <para>
+      After this, &product-name; will automatically start the DHCP
+      server for the specified internal network or host-only network as
+      soon as the first virtual machine which uses that network is
+      started.
+    </para>
+
+    <para>
+      Use <command>VBoxManage dhcpserver remove</command> with the given
+      <computeroutput>--netname &lt;network_name&gt;</computeroutput> or
+      <computeroutput>--ifname &lt;hostonly_if_name&gt;</computeroutput>
+      to remove the DHCP server for the specified internal network or
+      host-only network.
+    </para>
+
+    <para>
+      To modify the settings of a DHCP server created using
+      <command>VBoxManage dhcpserver add</command>, you can use
+      <command>VBoxManage dhcpserver modify</command> for a given
+      network or host-only interface name. This has the same parameters
+      as <command>VBoxManage dhcpserver add</command>.
     </para>
 
@@ -8857,6 +9183,6 @@
 
     <para>
-      The "usbdevsource" commands enable you to add and remove USB
-      devices globally.
+      The <command>usbdevsource</command> commands enable you to add and
+      remove USB devices globally.
     </para>
 
@@ -8871,5 +9197,5 @@
 
     <para>
-      Where the command line options are:
+      Where the command line options are as follows:
     </para>
 
@@ -8878,20 +9204,21 @@
       <listitem>
         <para>
-          &lt;source name&gt; specifies the ID of the 'source' USB
-          device to be added. Mandatory.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          --backend &lt;backend&gt; specifies the USB proxy service
-          backend to use. Mandatory.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          --address &lt;address&gt; specifies the backend specific
-          address. Mandatory.
+          <computeroutput>&lt;source name&gt;</computeroutput>:
+          Specifies the ID of the source USB device to be added.
+          Mandatory.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput>--backend &lt;backend&gt;</computeroutput>:
+          Specifies the USB proxy service backend to use. Mandatory.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <computeroutput> --address &lt;address&gt;</computeroutput>:
+          Specifies the backend specific address. Mandatory.
         </para>
       </listitem>
@@ -8907,5 +9234,5 @@
 
     <para>
-      Where the command line options are:
+      Where the command line options are as follows:
     </para>
 
@@ -8914,6 +9241,7 @@
       <listitem>
         <para>
-          &lt;source name&gt; specifies the ID of the 'source' USB
-          device to be removed. Mandatory.
+          <computeroutput>&lt;source name&gt;</computeroutput>:
+          Specifies the ID of the source USB device to be removed.
+          Mandatory.
         </para>
       </listitem>
@@ -8923,11 +9251,11 @@
   </sect1>
 
-  <xi:include href="user_man_VBoxManage-mediumio.xml"   xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="user_man_VBoxManage-debugvm.xml"    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="user_man_VBoxManage-extpack.xml"    xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="user_man_VBoxManage-unattended.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="user_man_VBoxManage-mediumio.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="user_man_VBoxManage-debugvm.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="user_man_VBoxManage-extpack.xml"    xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="user_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
 </chapter>
Index: trunk/doc/manual/en_US/user_VirtualBoxAPI.xml
===================================================================
--- trunk/doc/manual/en_US/user_VirtualBoxAPI.xml	(revision 75946)
+++ trunk/doc/manual/en_US/user_VirtualBoxAPI.xml	(revision 76078)
@@ -7,12 +7,12 @@
 <chapter id="VirtualBoxAPI">
 
-  <title>VirtualBox Programming Interfaces</title>
+  <title>&product-name; Programming Interfaces</title>
 
   <para>
-    VirtualBox comes with comprehensive support for third-party
-    developers. The so-called "Main API" of VirtualBox exposes the
+    &product-name; comes with comprehensive support for third-party
+    developers. The so-called "Main API" of &product-name; exposes the
     entire feature set of the virtualization engine. It is completely
-    documented and available to anyone who wishes to control VirtualBox
-    programmatically.
+    documented and available to anyone who wishes to control
+    &product-name; programmatically.
   </para>
 
@@ -29,5 +29,5 @@
     Development Kit (SDK)</emphasis>. The SDK is available for download
     from
-    <ulink
+    <ulink 
   url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>.
     In particular, the SDK comes with a Programming Guide and Reference
