Index: /trunk/doc/manual/Config.kmk
===================================================================
--- /trunk/doc/manual/Config.kmk	(revision 82349)
+++ /trunk/doc/manual/Config.kmk	(revision 82350)
@@ -297,7 +297,7 @@
 		'<!ENTITY VBOX_PRODUCT '\''<trademark class="registered">Oracle</trademark> VM <trademark class="registered">VirtualBox</trademark>'\'' >' \
 		'' \
-		'<!-- Entities for OTN -->' \
-		'<!ENTITY otn-base-url "https://www.oracle.com/technetwork">' \
-		'<!ENTITY otn-doc-tab "&otn-base-url;/server-storage/virtualbox/documentation/index.html">'
+		'<!-- Entities for Oracle Help Center -->' \
+		'<!ENTITY ohc-base-url "https://docs.oracle.com/en">' \
+		'<!ENTITY ohc-doc-page "&ohc-base-url;/virtualization/virtualbox/index.html">'
 
 endif # VBOX_XML_ENTITIES
Index: /trunk/doc/manual/en_US/UserManual.xml
===================================================================
--- /trunk/doc/manual/en_US/UserManual.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/UserManual.xml	(revision 82350)
@@ -9,7 +9,7 @@
 <!-- VBox bookinfo section -->
 
-<bookinfo>
+  <bookinfo>
 
- <title>&VBOX_PRODUCT;</title>
+    <title>&VBOX_PRODUCT;</title>
 
     <subtitle>User Manual</subtitle>
Index: /trunk/doc/manual/en_US/user_AdvancedTopics.xml
===================================================================
--- /trunk/doc/manual/en_US/user_AdvancedTopics.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_AdvancedTopics.xml	(revision 82350)
@@ -30,13 +30,12 @@
 
       <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 &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.
+        Windows provides a modular system login subsystem, called
+        Winlogon, which can be customized and extended by means of
+        so-called GINA (Graphical Identification and Authentication)
+        modules. In Windows Vista and later releases, the GINA modules
+        were replaced with a new mechanism called 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>
 
@@ -44,7 +43,7 @@
         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.
+        switch <option>/with_autologon</option>. All the following
+        manual steps required for installing these modules will be then
+        done by the installer.
       </para>
 
@@ -52,9 +51,9 @@
         To manually install the &product-name; GINA module, extract the
         Guest Additions as shown in
-        <xref linkend="windows-guest-file-extraction" /> and copy the
-        file <computeroutput>VBoxGINA.dll</computeroutput> to the
-        Windows <computeroutput>SYSTEM32</computeroutput> directory.
-        Then, in the registry, create the following key with a value of
-        <computeroutput>VBoxGINA.dll</computeroutput>:
+        <xref linkend="windows-guest-file-extraction" />, and copy the
+        <filename>VBoxGINA.dll</filename> file to the Windows
+        <filename>SYSTEM32</filename> directory. In the registry, create
+        the following key with a value of
+        <filename>VBoxGINA.dll</filename>:
       </para>
 
@@ -64,7 +63,7 @@
         <para>
           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.
+          around the <filename>MSGINA.DLL</filename> standard Windows
+          GINA module. As a result, it might not work correctly with
+          third-party GINA modules.
         </para>
       </note>
@@ -73,9 +72,8 @@
         To manually install the &product-name; credential provider
         module, extract the Guest Additions as shown in
-        <xref
-      linkend="windows-guest-file-extraction" /> and copy
-        the file <computeroutput>VBoxCredProv.dll</computeroutput> to
-        the Windows <computeroutput>SYSTEM32</computeroutput> directory.
-        In the registry, create the following keys:
+        <xref linkend="windows-guest-file-extraction" /> and copy the
+        <filename>VBoxCredProv.dll</filename> file to the Windows
+        <filename>SYSTEM32</filename> directory. In the registry, create
+        the following keys:
       </para>
 
@@ -88,12 +86,11 @@
 
       <para>
-        All default values, the key named
-        <computeroutput>Default</computeroutput>, must be set to
-        <computeroutput>VBoxCredProv</computeroutput>.
-      </para>
-
-      <para>
-        Create a new string named as follows, with a value of
-        <computeroutput>Apartment</computeroutput>.
+        All default values, the key named <literal>Default</literal>,
+        must be set to <literal>VBoxCredProv</literal>.
+      </para>
+
+      <para>
+        Create the following string and assign it a value of
+        <literal>Apartment</literal>.
       </para>
 
@@ -105,5 +102,5 @@
       </para>
 
-<screen>VBoxManage controlvm "Windows XP" setcredentials "John Doe" "secretpassword" "DOMTEST"</screen>
+<screen>$ VBoxManage controlvm "Windows XP" setcredentials "John Doe" "secretpassword" "DOMTEST"</screen>
 
       <para>
@@ -127,6 +124,6 @@
 
       <para>
-        Depending on the particular variant of the Windows guest, the
-        following restrictions apply:
+        Depending on the Windows guest version, the following
+        restrictions apply:
       </para>
 
@@ -138,5 +135,5 @@
             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.
+            support the Windows XP-style welcome dialog.
           </para>
         </listitem>
@@ -147,11 +144,11 @@
             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
-            use the Secure Attention Sequence. Also, the user name given
-            is only compared to the true user name, not the user
-            friendly name. This means that when you rename a user, you
-            still have to supply the original user name as Windows never
-            renames user accounts internally.
+            <literal>Ctrl+Alt+Del</literal>. As a result, the guest's
+            group policy settings need to be changed to not use the
+            Secure Attention Sequence. Also, the user name given is only
+            compared to the true user name, not the user friendly name.
+            This means that when you rename a user, you still have to
+            supply the original user name as Windows never renames user
+            accounts internally.
           </para>
         </listitem>
@@ -163,6 +160,6 @@
             Service</emphasis>, formerly known as Terminal Services, is
             disabled by default. To enable it, create the following
-            registry key with a <computeroutput>DWORD</computeroutput>
-            value of <computeroutput>1</computeroutput>.
+            registry key with a <literal>DWORD</literal> value of
+            <literal>1</literal>.
           </para>
 
@@ -177,5 +174,5 @@
       </para>
 
-<screen>VBoxManage setextradata "Windows XP" VBoxInternal/Devices/VMMDev/0/Config/KeepCredentials 1</screen>
+<screen>$ VBoxManage setextradata "Windows XP" VBoxInternal/Devices/VMMDev/0/Config/KeepCredentials 1</screen>
 
       <para>
@@ -205,44 +202,42 @@
 
       <para>
-        The <computeroutput>pam_vbox.so</computeroutput> module itself
+        The <filename>pam_vbox.so</filename> module itself
         <emphasis>does not</emphasis> do an actual verification of the
         credentials passed to the guest OS. Instead it relies on other
-        modules such as <computeroutput>pam_unix.so</computeroutput> or
-        <computeroutput>pam_unix2.so</computeroutput> down in the PAM
-        stack to do the actual validation using the credentials
-        retrieved by <computeroutput>pam_vbox.so</computeroutput>.
-        Therefore <computeroutput>pam_vbox.so</computeroutput> has to be
-        on top of the authentication PAM service list.
+        modules such as <filename>pam_unix.so</filename> or
+        <filename>pam_unix2.so</filename> down in the PAM stack to do
+        the actual validation using the credentials retrieved by
+        <filename>pam_vbox.so</filename>. Therefore
+        <filename>pam_vbox.so</filename> has to be on top of the
+        authentication PAM service list.
       </para>
 
       <note>
         <para>
-          The <computeroutput>pam_vbox.so</computeroutput> module only
-          supports the <computeroutput>auth</computeroutput> primitive.
-          Other primitives such as
-          <computeroutput>account</computeroutput>,
-          <computeroutput>session</computeroutput>, or
-          <computeroutput>password</computeroutput> are not supported.
+          The <filename>pam_vbox.so</filename> module only supports the
+          <literal>auth</literal> primitive. Other primitives such as
+          <literal>account</literal>, <literal>session</literal>, or
+          <literal>password</literal> are not supported.
         </para>
       </note>
 
       <para>
-        The <computeroutput>pam_vbox.so</computeroutput> module is
-        shipped as part of the Guest Additions but it is not installed
-        and/or activated on the guest OS by default. In order to install
-        it, it has to be copied from
-        <computeroutput>/opt/VBoxGuestAdditions-&lt;version&gt;/other/</computeroutput>
+        The <filename>pam_vbox.so</filename> module is shipped as part
+        of the Guest Additions but it is not installed and/or activated
+        on the guest OS by default. In order to install it, it has to be
+        copied from
+        <filename>/opt/VBoxGuestAdditions-<replaceable>version</replaceable>/other/</filename>
         to the security modules directory. This is usually
-        <computeroutput>/lib/security/</computeroutput> on 32-bit Linux
-        guests or <computeroutput>/lib64/security/</computeroutput> on
-        64-bit Linux guests. Please refer to your guest OS documentation
-        for the correct PAM module directory.
-      </para>
-
-      <para>
-        For example, to use <computeroutput>pam_vbox.so</computeroutput>
-        with a Ubuntu Linux guest OS and the GNOME Desktop Manager (GDM)
-        to log in users automatically with the credentials passed by the
-        host, configure the guest OS as follows:
+        <filename>/lib/security/</filename> on 32-bit Linux guests or
+        <filename>/lib64/security/</filename> on 64-bit Linux guests.
+        Please refer to your guest OS documentation for the correct PAM
+        module directory.
+      </para>
+
+      <para>
+        For example, to use <filename>pam_vbox.so</filename> with a
+        Ubuntu Linux guest OS and the GNOME Desktop Manager (GDM) to log
+        in users automatically with the credentials passed by the host,
+        configure the guest OS as follows:
       </para>
 
@@ -251,7 +246,7 @@
         <listitem>
           <para>
-            Copy the <computeroutput>pam_vbox.so</computeroutput> module
-            to the security modules directory. In this case,
-            <computeroutput>/lib/security</computeroutput>.
+            Copy the <filename>pam_vbox.so</filename> module to the
+            security modules directory. In this case,
+            <filename>/lib/security</filename>.
           </para>
         </listitem>
@@ -260,12 +255,11 @@
           <para>
             Edit the PAM configuration file for GDM, found at
-            <computeroutput>/etc/pam.d/gdm</computeroutput>. Add the
-            line <computeroutput>auth requisite
-            pam_vbox.so</computeroutput> at the top. Additionally, in
-            most Linux distributions there is a file called
-            <computeroutput>/etc/pam.d/common-auth</computeroutput>.
-            This file is included in many other services, like the GDM
-            file mentioned above. There you also have to add the line
-            <computeroutput>auth requisite pam_vbox.so</computeroutput>.
+            <filename>/etc/pam.d/gdm</filename>. Add the line
+            <literal>auth requisite pam_vbox.so</literal> at the top.
+            Additionally, in most Linux distributions there is a file
+            called <filename>/etc/pam.d/common-auth</filename>. This
+            file is included in many other services, like the GDM file
+            mentioned above. There you also have to add the line
+            <literal>auth requisite pam_vbox.so</literal>.
           </para>
         </listitem>
@@ -274,19 +268,17 @@
           <para>
             If authentication against the shadow database using
-            <computeroutput>pam_unix.so</computeroutput> or
-            <computeroutput>pam_unix2.so</computeroutput> is desired,
-            the argument <computeroutput>try_first_pass</computeroutput>
-            for <computeroutput>pam_unix.so</computeroutput> or
-            <computeroutput>use_first_pass</computeroutput> for
-            <computeroutput>pam_unix2.so</computeroutput> is needed in
-            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 &product-name;
-            PAM module.
+            <filename>pam_unix.so</filename> or
+            <filename>pam_unix2.so</filename> is desired, the argument
+            <literal>try_first_pass</literal> for
+            <filename>pam_unix.so</filename> or
+            <literal>use_first_pass</literal> for
+            <filename>pam_unix2.so</filename> is needed in order to pass
+            the credentials from the &product-name; module to the shadow
+            database authentication module. For Ubuntu, this needs to be
+            added to <filename>/etc/pam.d/common-auth</filename>, to the
+            end of the line referencing
+            <filename>pam_unix.so</filename>. This argument tells the
+            PAM module to use credentials already present in the stack,
+            such as the ones provided by the &product-name; PAM module.
           </para>
         </listitem>
@@ -303,26 +295,26 @@
       <para>
         To make deployment easier, you can pass the argument
-        <computeroutput>debug</computeroutput> right after the
-        <computeroutput>pam_vbox.so</computeroutput> statement. Debug
-        log output will then be recorded using syslog.
+        <literal>debug</literal> right after the
+        <filename>pam_vbox.so</filename> statement. Debug log output
+        will then be recorded using syslog.
       </para>
 
       <note>
         <para>
-          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.
+          By default, <command>pam_vbox</command> does 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
+          <command>pam_vbox</command> 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>
-        <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
+        <command>pam_vbox</command> supports various guest property
+        parameters that are located in
+        <filename>/VirtualBox/GuestAdd/PAM/</filename>. These parameters
+        allow <command>pam_vbox</command> to wait for credentials to be
         provided by the host and optionally can show a message while
         waiting for those. The following guest properties can be set:
@@ -333,12 +325,13 @@
         <listitem>
           <para>
-            <computeroutput>CredsWait</computeroutput>: Set to 1 if
-            pam_vbox should start waiting until credentials arrive from
-            the host. Until then no other authentication methods such as
-            manually logging in will be available. If this property is
-            empty or gets deleted no waiting for credentials will be
-            performed and pam_vbox will act like before. This property
-            must be set read-only for the guest
-            (<computeroutput>RDONLYGUEST</computeroutput>).
+            <literal>CredsWait</literal>: Set to 1 if
+            <command>pam_vbox</command> should start waiting until
+            credentials arrive from the host. Until then no other
+            authentication methods such as manually logging in will be
+            available. If this property is empty or gets deleted no
+            waiting for credentials will be performed and
+            <command>pam_vbox</command> will act like before. This
+            property must be set read-only for the guest
+            (<literal>RDONLYGUEST</literal>).
           </para>
         </listitem>
@@ -346,7 +339,7 @@
         <listitem>
           <para>
-            <computeroutput>CredsWaitAbort</computeroutput>: Aborts
-            waiting for credentials when set to any value. Can be set
-            from host and the guest.
+            <literal>CredsWaitAbort</literal>: Aborts waiting for
+            credentials when set to any value. Can be set from host and
+            the guest.
           </para>
         </listitem>
@@ -354,13 +347,13 @@
         <listitem>
           <para>
-            <computeroutput>CredsWaitTimeout</computeroutput>: Timeout,
-            in seconds, to let pam_vbox wait for credentials to arrive.
-            When no credentials arrive within this timeout,
-            authentication of pam_vbox will be set to failed and the
-            next PAM module in chain will be asked. If this property is
-            not specified, set to 0 or an invalid value, an infinite
-            timeout will be used. This property must be set read-only
-            for the guest
-            (<computeroutput>RDONLYGUEST</computeroutput>).
+            <literal>CredsWaitTimeout</literal>: Timeout, in seconds, to
+            let <command>pam_vbox</command> wait for credentials to
+            arrive. When no credentials arrive within this timeout,
+            authentication of <command>pam_vbox</command> will be set to
+            failed and the next PAM module in chain will be asked. If
+            this property is not specified, set to 0 or an invalid
+            value, an infinite timeout will be used. This property must
+            be set read-only for the guest
+            (<literal>RDONLYGUEST</literal>).
           </para>
         </listitem>
@@ -369,6 +362,6 @@
 
       <para>
-        To customize pam_vbox further there are the following guest
-        properties:
+        To customize <command>pam_vbox</command> further there are the
+        following guest properties:
       </para>
 
@@ -377,8 +370,8 @@
         <listitem>
           <para>
-            <computeroutput>CredsMsgWaiting</computeroutput>: Custom
-            message showed while pam_vbox is waiting for credentials
-            from the host. This property must be set read-only for the
-            guest (<computeroutput>RDONLYGUEST</computeroutput>).
+            <literal>CredsMsgWaiting</literal>: Custom message showed
+            while pam_vbox is waiting for credentials from the host.
+            This property must be set read-only for the guest
+            (<literal>RDONLYGUEST</literal>).
           </para>
         </listitem>
@@ -386,9 +379,9 @@
         <listitem>
           <para>
-            <computeroutput>CredsMsgWaitTimeout</computeroutput>: Custom
-            message showed when waiting for credentials by pam_vbox has
-            timed out. For example, they did not arrive within time.
-            This property must be set read-only for the guest
-            (<computeroutput>RDONLYGUEST</computeroutput>).
+            <literal>CredsMsgWaitTimeout</literal>: Custom message
+            showed when waiting for credentials by
+            <command>pam_vbox</command> has timed out. For example, they
+            did not arrive within time. This property must be set
+            read-only for the guest (<literal>RDONLYGUEST</literal>).
           </para>
         </listitem>
@@ -398,11 +391,10 @@
       <note>
         <para>
-          If a pam_vbox guest property does not have the correct flag
-          set (<computeroutput>RDONLYGUEST</computeroutput>) the
+          If a <command>pam_vbox</command> guest property does not have
+          the correct flag set (<literal>RDONLYGUEST</literal>) the
           property is ignored and, depending on the property, a default
           value will be used. This can result in pam_vbox not waiting
           for credentials. Consult the appropriate syslog file for more
-          information and use the <computeroutput>debug</computeroutput>
-          option.
+          information and use the <literal>debug</literal> option.
         </para>
       </note>
@@ -413,28 +405,29 @@
 
         <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
+          &product-name; comes with a greeter module, named
+          <command>vbox-greeter</command>, that can be used with
+          LightDM. LightDM is the default display manager for Ubuntu
+          Linux and therefore can also 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:
+          <command>vbox-greeter</command> does not need the
+          <command>pam_vbox</command> module described in
+          <xref linkend="autologon_unix"/>in order to function. It comes
+          with its own authentication mechanism provided by LightDM.
+          However, to provide maximum flexibility both modules can be
+          used together on the same guest.
+        </para>
+
+        <para>
+          As with the <command>pam_vbox</command> module,
+          <command>vbox-greeter</command> is shipped as part of the
+          Guest Additions but it is not installed or activated on the
+          guest OS by default. To install
+          <command>vbox-greeter</command> automatically upon Guest
+          Additions installation, use the
+          <option>--with-autologon</option> option when starting the
+          <command>VBoxLinuxAdditions.run</command> file:
         </para>
 
@@ -442,22 +435,20 @@
 
         <para>
-          For manual or postponed installation, the
-          <computeroutput>vbox-greeter.desktop</computeroutput> file has
-          to be copied from
-          <computeroutput>/opt/VBoxGuestAdditions-&lt;version&gt;/other/</computeroutput>
-          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
+          For manual or postponed installation, copy the
+          <filename>vbox-greeter.desktop</filename> file from
+          <filename>/opt/VBoxGuestAdditions-&lt;version&gt;/other/</filename>
+          to the <filename>xgreeters</filename> directory, which is
+          usually <filename>/usr/share/xgreeters/</filename>. See your
+          guest OS documentation for the name of the correct LightDM
           greeter directory.
         </para>
 
         <para>
-          The vbox-greeter module itself already was installed by the
-          &product-name; Guest Additions installer and resides in
-          <computeroutput>/usr/sbin/</computeroutput>. To enable
-          vbox-greeter as the standard greeter module, the file
-          <computeroutput>/etc/lightdm/lightdm.conf</computeroutput>
-          needs to be edited:
+          The <command>vbox-greeter</command> module is installed by the
+          &product-name; Guest Additions installer and is located in
+          <filename>/usr/sbin/</filename>. To enable
+          <command>vbox-greeter</command> as the standard greeter
+          module, edit the file
+          <filename>/etc/lightdm/lightdm.conf</filename> as follows:
         </para>
 
@@ -470,8 +461,8 @@
             <listitem>
               <para>
-                The LightDM server needs to be fully restarted in order
-                for vbox-greeter to be used as the default greeter. As
-                root, run <computeroutput>service lightdm
-                --full-restart</computeroutput> on Ubuntu, or simply
+                The LightDM server must be fully restarted in order for
+                <command>vbox-greeter</command> to be used as the
+                default greeter. As <literal>root</literal> on Ubuntu,
+                run <command>service lightdm --full-restart</command> or
                 restart the guest.
               </para>
@@ -480,8 +471,9 @@
             <listitem>
               <para>
-                vbox-greeter is independent of the graphical session
-                chosen by the user, such as Gnome, KDE, or Unity.
-                However, it requires FLTK 1.3 for representing its own
-                user interface.
+                <command>vbox-greeter</command> is independent of the
+                graphical session you choose, such as Gnome, KDE, or
+                Unity. However, <command>vbox-greeter</command> does
+                require FLTK 1.3 or later to implement its own user
+                interface.
               </para>
             </listitem>
@@ -494,12 +486,14 @@
           further customize the login experience. For automatically
           logging in users, the same guest properties apply as for
-          pam_vbox. See <xref linkend="autologon_unix" />.
-        </para>
-
-        <para>
-          In addition to the above mentioned guest properties,
-          vbox-greeter allows further customization of its user
-          interface. These special guest properties all reside in
-          <computeroutput>/VirtualBox/GuestAdd/Greeter/</computeroutput>:
+          <command>pam_vbox</command>. See
+          <xref linkend="autologon_unix" />.
+        </para>
+
+        <para>
+          In addition to the previously mentioned guest properties,
+          <command>vbox-greeter</command> enables you to further
+          customize its user interface. The following guest properties
+          are located in the
+          <filename>/VirtualBox/GuestAdd/Greeter/</filename> directory:
         </para>
 
@@ -508,72 +502,70 @@
           <listitem>
             <para>
-              <computeroutput>HideRestart</computeroutput>: Set to 1 if
-              vbox-greeter should hide the button to restart the guest.
-              This property must be set read-only for the guest
-              (<computeroutput>RDONLYGUEST</computeroutput>).
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <computeroutput>HideShutdown</computeroutput>: Set to 1 if
-              vbox-greeter should hide the button to shutdown the guest.
-              This property must be set read-only for the guest
-              (<computeroutput>RDONLYGUEST</computeroutput>).
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <computeroutput>BannerPath</computeroutput>: Path to a
-              .PNG file for using it as a banner on the top. The image
-              size must be 460 x 90 pixels, any bit depth. This property
-              must be set read-only for the guest
-              (<computeroutput>RDONLYGUEST</computeroutput>).
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <computeroutput>UseTheming</computeroutput>: Set to 1 for
-              turning on the following theming options. This property
-              must be set read-only for the guest
-              (<computeroutput>RDONLYGUEST</computeroutput>).
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <computeroutput>Theme/BackgroundColor</computeroutput>:
-              Hexadecimal RRGGBB color for the background. This property
-              must be set read-only for the guest
-              (<computeroutput>RDONLYGUEST</computeroutput>).
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <computeroutput>Theme/LogonDialog/HeaderColor</computeroutput>:
+              <literal>HideRestart</literal>: Set to 1 if
+              <command>vbox-greeter</command> should hide the button to
+              restart the guest. This property must be set read-only for
+              the guest (<literal>RDONLYGUEST</literal>).
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>HideShutdown</literal>: Set to 1 if
+              <command>vbox-greeter</command> should hide the button to
+              shutdown the guest. This property must be set read-only
+              for the guest (<literal>RDONLYGUEST</literal>).
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>BannerPath</literal>: Path to a
+              <filename>.PNG</filename> file to use as a banner image on
+              the top of the greeter. The image size must be 460 x 90
+              pixels, any bit depth. This property must be set read-only
+              for the guest (<literal>RDONLYGUEST</literal>).
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>UseTheming</literal>: Set to 1 for turning on the
+              following theming options. This property must be set
+              read-only for the guest (<literal>RDONLYGUEST</literal>).
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>Theme/BackgroundColor</literal>: Hexadecimal
+              RRGGBB color for the background. This property must be set
+              read-only for the guest (<literal>RDONLYGUEST</literal>).
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>Theme/LogonDialog/HeaderColor</literal>:
               Hexadecimal RRGGBB foreground color for the header text.
               This property must be set read-only for the guest
-              (<computeroutput>RDONLYGUEST</computeroutput>).
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <computeroutput>Theme/LogonDialog/BackgroundColor</computeroutput>:
+              (<literal>RDONLYGUEST</literal>).
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>Theme/LogonDialog/BackgroundColor</literal>:
               Hexadecimal RRGGBB color for the login dialog background.
               This property must be set read-only for the guest
-              (<computeroutput>RDONLYGUEST</computeroutput>).
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <computeroutput>Theme/LogonDialog/ButtonColor</computeroutput>:
+              (<literal>RDONLYGUEST</literal>).
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>Theme/LogonDialog/ButtonColor</literal>:
               Hexadecimal RRGGBB background color for the login dialog
               button. This property must be set read-only for the guest
-              (<computeroutput>RDONLYGUEST</computeroutput>).
+              (<literal>RDONLYGUEST</literal>).
             </para>
           </listitem>
@@ -584,5 +576,6 @@
           <para>
             The same restrictions for the guest properties above apply
-            as for the ones specified in the pam_vbox section.
+            as for the ones specified in the <literal>pam_vbox</literal>
+            section.
           </para>
         </note>
@@ -603,13 +596,13 @@
 
       <para>
-        Beginning with Windows NT 4.0, Microsoft offers a system
-        preparation tool called Sysprep, to prepare a Windows system for
-        deployment or redistribution. Whereas Windows 2000 and XP ship
-        with Sysprep on the installation medium, the tool also is
-        available for download on the Microsoft web site. In a standard
-        installation of Windows Vista and 7, Sysprep is already
-        included. Sysprep mainly consists of an executable called
-        <computeroutput>sysprep.exe</computeroutput> which is invoked by
-        the user to put the Windows installation into preparation mode.
+        Microsoft offers a system preparation tool called Sysprep, to
+        prepare a Windows system for deployment or redistribution. Some
+        Windows releases include Sysprep on the installation medium, but
+        the tool is also available for download from the Microsoft web
+        site. In a standard For most Windows versions, Sysprep is
+        included in a default installation. Sysprep mainly consists of
+        an executable called <command>sysprep.exe</command> which is
+        invoked by the user to put the Windows installation into
+        preparation mode.
       </para>
 
@@ -620,17 +613,15 @@
         <xref linkend="guestadd-guestcontrol" /> for details of how to
         use this feature with the special identifier
-        <computeroutput>sysprep</computeroutput> as the program to
-        execute, along with the user name
-        <computeroutput>sysprep</computeroutput> and password
-        <computeroutput>sysprep</computeroutput> for the credentials.
-        Sysprep then gets launched with the required system rights.
+        <literal>sysprep</literal> as the program to execute, along with
+        the user name <literal>sysprep</literal> and password
+        <literal>sysprep</literal> for the credentials. Sysprep is then
+        started with the required system rights.
       </para>
 
       <note>
         <para>
-          Specifying the location of "sysprep.exe" is
-          <emphasis
-        role="bold">not possible</emphasis>. Instead
-          the following paths are used, based on the operating system:
+          Specifying the location of <command>sysprep.exe</command> is
+          <emphasis role="bold">not possible</emphasis>. Instead the
+          following paths are used, based on the Windows release:
         </para>
 
@@ -639,13 +630,13 @@
           <listitem>
             <para>
-              <computeroutput>C:\sysprep\sysprep.exe</computeroutput>
-              for Windows NT 4.0, 2000 and XP
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <computeroutput>%WINDIR%\System32\Sysprep\sysprep.exe</computeroutput>
-              for Windows Vista, 2008 Server and 7
+              <filename>C:\sysprep\sysprep.exe</filename> for Windows XP
+              and earlier
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <filename>%WINDIR%\System32\sysprep\sysprep.exe</filename>
+              for Windows Vista and later
             </para>
           </listitem>
@@ -673,46 +664,41 @@
       <para>
         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:
-      </para>
-
-<screen>  sh ./VBoxLinuxAdditions.run no_setup</screen>
-
-      <para>
-        After this, you will need to at least compile the kernel modules
-        by running the command as root:
-      </para>
-
-<screen>  rcvboxadd setup</screen>
-
-      <para>
-        You will need to replace <emphasis>lib</emphasis> by
-        <emphasis>lib64</emphasis> on some 64bit guests, and on older
-        guests without the udev service you will need to add the
-        <emphasis>vboxadd</emphasis> service to the default runlevel to
-        ensure that the modules get loaded.
-      </para>
-
-      <para>
-        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 following command:
-      </para>
-
-<screen>  rcvboxadd-x11 setup</screen>
-
-      <para>
-        You do not need to enable any services for this.
-      </para>
-
-      <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.
+        drivers. If you do not want to configure them all, use the
+        following command to install the Guest Additions:
+      </para>
+
+<screen>$ sh ./VBoxLinuxAdditions.run no_setup</screen>
+
+      <para>
+        After running this script, run the <command>rcvboxadd
+        setup</command> command as <literal>root</literal> to compile
+        the kernel modules.
+      </para>
+
+      <para>
+        On some 64-bit guests, you must replace <filename>lib</filename>
+        with <filename>lib64</filename>. On older guests that do not run
+        the <command>udev</command> service, you must add the
+        <command>vboxadd</command> service to the default runlevel to
+        ensure that the modules are loaded.
+      </para>
+
+      <para>
+        To set up the time synchronization service, add the
+        <command>vboxadd-service</command> service to the default
+        runlevel. To set up the X11 and OpenGL part of the Guest
+        Additions, run the <command>rcvboxadd-x11 setup</command>
+        command. Note that you do not need to enable additional
+        services.
+      </para>
+
+      <para>
+        Use the <command>rcvboxadd setup</command> to recompile the
+        guest kernel modules.
+      </para>
+
+      <para>
+        After compilation, reboot your guest to ensure that the new
+        modules are loaded.
       </para>
 
@@ -731,44 +717,10 @@
 
       <para>
-        The &product-name; Guest Additions include the following drivers
-        for X.Org versions:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            X11R6.8/X11R6.9 and XFree86 version 4.3 (vboxvideo_drv_68.o
-            and vboxmouse_drv_68.o)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            X11R7.0 (vboxvideo_drv_70.so and vboxmouse_drv_70.so)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            X11R7.1 (vboxvideo_drv_71.so and vboxmouse_drv_71.so)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            X.Org Server versions 1.3 and later (vboxvideo_drv_13.so
-            vboxmouse_drv_13.so, and later versions).
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      <para>
-        By default these drivers can be found in the folowing directory:
-      </para>
-
-      <para>
-        <computeroutput>/opt/VBoxGuestAdditions-&lt;version&gt;/other/</computeroutput>
+        The &product-name; Guest Additions includes drivers for X.Org.
+        By default these drivers are in the following directory:
+      </para>
+
+      <para>
+        <filename>/opt/VBoxGuestAdditions-<replaceable>version</replaceable>/other/</filename>
       </para>
 
@@ -780,16 +732,20 @@
       <para>
         For graphics integration to work correctly, the X server must
-        load the vboxvideo driver. Many recent X server versions look
-        for it automatically if they see that they are running in
-        &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
-        integration to work correctly, the guest kernel drivers must be
-        loaded and in addition, in X servers from X.Org X11R6.8 to
-        X11R7.1 and in XFree86 version 4.3 the right vboxmouse driver
-        must be loaded and associated with /dev/mouse or /dev/psaux. In
-        X.Org server 1.3 or later a driver for a PS/2 mouse must be
-        loaded and the right vboxmouse driver must be associated with
-        /dev/vboxguest.
+        load the <literal>vboxvideo</literal> driver. Many recent X
+        server versions look for it automatically if they see that they
+        are running in &product-name;. For an optimal user experience,
+        the guest kernel drivers must be loaded and the Guest Additions
+        tool <command>VBoxClient</command> must be running as a client
+        in the X session.
+      </para>
+
+      <para>
+        For mouse integration to work correctly, the guest kernel
+        drivers must be loaded. In addition, for legacy X servers the
+        correct <literal>vboxmouse</literal> driver must be loaded and
+        associated with <filename>/dev/mouse</filename> or
+        <filename>/dev/psaux</filename>. For most guests, a driver for a
+        PS/2 mouse must be loaded and the correct vboxmouse driver must
+        be associated with <filename>/dev/vboxguest</filename>.
       </para>
 
@@ -799,22 +755,21 @@
         virtual video memory allocated to the virtual machine, minus a
         small amount used by the guest driver, as described in
-        <xref
-      linkend="settings-display" />. The driver will offer
-        a range of standard modes at least up to the default guest
-        resolution for all active guest monitors. In X.Org Server 1.3
-        and later the default mode can be changed by setting the output
-        property VBOX_MODE to "&lt;width&gt;x&lt;height&gt;" for any
-        guest monitor. When VBoxClient and the kernel drivers are active
-        this is done automatically when the host requests a mode change.
-        The driver for older versions can only receive new modes by
-        querying the host for requests at regular intervals.
-      </para>
-
-      <para>
-        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:
+        <xref linkend="settings-display" />. The driver will offer a
+        range of standard modes at least up to the default guest
+        resolution for all active guest monitors. The default mode can
+        be changed by setting the output property VBOX_MODE to
+        "&lt;width&gt;x&lt;height&gt;" for any guest monitor. When
+        VBoxClient and the kernel drivers are active this is done
+        automatically when the host requests a mode change. The driver
+        for older versions can only receive new modes by querying the
+        host for requests at regular intervals.
+      </para>
+
+      <para>
+        With legacy X Servers before version 1.3, you can also add your
+        own modes to the X server configuration file. 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>
 
@@ -864,23 +819,22 @@
     </para>
 
-<screen>VBoxManage modifyvm "VM name" --cpuhotplug on</screen>
-
-    <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>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --cpuhotplug on</screen>
+
+    <para>
+      The <option>--cpus</option> option is used to specify the maximum
+      number of CPUs that the virtual machine can have:
+    </para>
+
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --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
+      the <command>VBoxManage modifyvm --plugcpu</command> and
+      <command>VBoxManage modifyvm --unplugcpu</command> commands, which
       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>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --plugcpu 3
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --unplugcpu 3</screen>
 
     <para>
@@ -890,16 +844,15 @@
     <para>
       While the VM is running, CPUs can be added and removed with the
-      <computeroutput>controlvm plugcpu</computeroutput> and
-      <computeroutput>unplugcpu</computeroutput> commands instead, as
-      follows:
-    </para>
-
-<screen>VBoxManage controlvm "VM name" plugcpu 3
-VBoxManage controlvm "VM name" unplugcpu 3</screen>
+      <command>VBoxManage controlvm plugcpu</command> and
+      <command>VBoxManage controlvm unplugcpu</command> commands
+      instead, as follows:
+    </para>
+
+<screen>$ VBoxManage controlvm <replaceable>VM-name</replaceable> plugcpu 3
+$ VBoxManage controlvm <replaceable>VM-name</replaceable> unplugcpu 3</screen>
 
     <para>
       See <xref linkend="vboxmanage-modifyvm" /> and
-      <xref
-    linkend="vboxmanage-controlvm" /> for details.
+      <xref linkend="vboxmanage-controlvm" /> for details.
     </para>
 
@@ -918,9 +871,9 @@
     </para>
 
-<screen>echo 1 &gt; /sys/devices/system/cpu/cpu&lt;id&gt;/online</screen>
+<screen>$ echo 1 &gt; /sys/devices/system/cpu/cpu&lt;id&gt;/online</screen>
 
   </sect1>
 
-  <sect1 id="pcipassthrough">
+<!--<sect1 id="pcipassthrough">
 
     <title>PCI Passthrough</title>
@@ -928,14 +881,13 @@
     <para>
       When running on Linux hosts with a kernel version later than
-      <computeroutput>2.6.31</computeroutput>, experimental host PCI
-      devices passthrough is available.
+      <literal>2.6.31</literal>, experimental host PCI devices
+      passthrough is available.
     </para>
 
     <note>
       <para>
-        The PCI passthrough module is shipped as a &product-name;
+        The PCI passthrough module is shipped as an &product-name;
         extension package, which must be installed separately. See
-        <xref
-      linkend="intro-installing" />.
+        <xref linkend="intro-installing" />.
       </para>
     </note>
@@ -954,13 +906,13 @@
     <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
-      performs DMA to the OS memory on its own, then an IOMMU is
-      required. Otherwise such DMA transactions may write to the wrong
-      physical memory address as the device DMA engine is programmed
-      using a device-specific protocol to perform memory transactions.
-      The IOMMU functions as translation unit mapping physical memory
-      access requests from the device using knowledge of the guest
-      physical address to host physical addresses translation rules.
+      depends upon an IOMMU hardware unit. If the device uses bus
+      mastering, for example it performs DMA to the OS memory on its
+      own, then an IOMMU is required. Otherwise such DMA transactions
+      may write to the wrong physical memory address as the device DMA
+      engine is programmed using a device-specific protocol to perform
+      memory transactions. The IOMMU functions as translation unit
+      mapping physical memory access requests from the device using
+      knowledge of the guest physical address to host physical addresses
+      translation rules.
     </para>
 
@@ -1010,9 +962,7 @@
         <para>
           Your Linux kernel was compiled with IOMMU support, including
-          DMA remapping. See the
-          <computeroutput>CONFIG_DMAR</computeroutput> kernel
+          DMA remapping. See the <literal>CONFIG_DMAR</literal> kernel
           compilation option. The PCI stub driver
-          (<computeroutput>CONFIG_PCI_STUB</computeroutput>) is required
-          as well.
+          (<literal>CONFIG_PCI_STUB</literal>) is required as well.
         </para>
       </listitem>
@@ -1021,7 +971,6 @@
         <para>
           Your Linux kernel recognizes and uses the IOMMU unit. The
-          <computeroutput>intel_iommu=on</computeroutput> boot option
-          could be needed. Search for DMAR and PCI-DMA in kernel boot
-          log.
+          <literal>intel_iommu=on</literal> boot option could be needed.
+          Search for DMAR and PCI-DMA in kernel boot log.
         </para>
       </listitem>
@@ -1046,12 +995,12 @@
     <para>
       The first column is a PCI address, in the format
-      <computeroutput>bus:device.function</computeroutput>. This address
-      could be used to identify the device for further operations. For
-      example, to attach a PCI network controller on the system listed
-      above to the second PCI bus in the guest, as device 5, function 0,
-      use the following command:
-    </para>
-
-<screen>VBoxManage modifyvm "VM name" --pciattach 02:00.0@01:05.0</screen>
+      <literal><replaceable>bus</replaceable>:<replaceable>device</replaceable>.<replaceable>function</replaceable></literal>.
+      This address could be used to identify the device for further
+      operations. For example, to attach a PCI network controller on the
+      system listed above to the second PCI bus in the guest, as device
+      5, function 0, use the following command:
+    </para>
+
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> -\-pciattach 02:00.0@01:05.0</screen>
 
     <para>
@@ -1059,5 +1008,5 @@
     </para>
 
-<screen>VBoxManage modifyvm "VM name" --pcidetach 02:00.0</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> -\-pcidetach 02:00.0</screen>
 
     <para>
@@ -1107,5 +1056,5 @@
     </itemizedlist>
 
-  </sect1>
+  </sect1>-->
 
   <sect1 id="webcam-passthrough">
@@ -1118,10 +1067,10 @@
 
       <para>
-        &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.
+        &product-name; includes a feature called <emphasis>webcam
+        passthrough</emphasis>, 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 legacy
+        releases. The webcam passthrough support can handle non-USB
+        video sources in theory, but this is completely untested.
       </para>
 
@@ -1130,6 +1079,5 @@
           The webcam passthrough module is shipped as part of the
           &product-name; extension pack, which must be installed
-          separately. See <xref
-        linkend="intro-installing" />.
+          separately. See <xref linkend="intro-installing" />.
         </para>
       </note>
@@ -1158,5 +1106,5 @@
           </para>
 
-<screen>VBoxManage list webcams</screen>
+<screen>$ VBoxManage list webcams</screen>
 
           <para>
@@ -1180,5 +1128,5 @@
           </para>
 
-<screen>VBoxManage controlvm "VM name" webcam attach [host_path|alias [settings]]</screen>
+<screen>VBoxManage controlvm <replaceable>VM name</replaceable> webcam attach [<replaceable>host_path</replaceable>|<replaceable>alias</replaceable> [<replaceable>settings</replaceable>]]</screen>
 
           <para>
@@ -1187,9 +1135,8 @@
 
           <para>
-            The <computeroutput>settings</computeroutput> parameter is a
-            string
-            <computeroutput>Setting1=Value1;Setting2=Value2</computeroutput>,
-            which enables you to configure the emulated webcam device.
-            The following settings are supported:
+            The <literal>settings</literal> parameter is a string
+            <literal>Setting1=Value1;Setting2=Value2</literal>, which
+            enables you to configure the emulated webcam device. The
+            following settings are supported:
           </para>
 
@@ -1198,10 +1145,10 @@
             <listitem>
               <para>
-                <computeroutput>MaxFramerate</computeroutput>: The
-                highest rate at which video frames are sent to the
-                guest. A higher frame rate requires more CPU power.
-                Therefore sometimes it is useful to set a lower limit.
-                Default is no limit and allow the guest to use all frame
-                rates supported by the host webcam.
+                <literal>MaxFramerate</literal>: The highest rate at
+                which video frames are sent to the guest. A higher frame
+                rate requires more CPU power. Therefore sometimes it is
+                useful to set a lower limit. Default is no limit and
+                allow the guest to use all frame rates supported by the
+                host webcam.
               </para>
             </listitem>
@@ -1209,12 +1156,11 @@
             <listitem>
               <para>
-                <computeroutput>MaxPayloadTransferSize</computeroutput>:
-                How many bytes the emulated webcam can send to the guest
-                at a time. Default value 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.
-                However, a high
-                <computeroutput>MaxPayloadTransferSize</computeroutput>
-                might be not supported by some guests.
+                <literal>MaxPayloadTransferSize</literal>: How many
+                bytes the emulated webcam can send to the guest at a
+                time. Default value 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. However, a high
+                <literal>MaxPayloadTransferSize</literal> might be not
+                supported by some guests.
               </para>
             </listitem>
@@ -1228,5 +1174,5 @@
           </para>
 
-<screen>VBoxManage controlvm "VM name" webcam detach [host_path|alias]</screen>
+<screen>VBoxManage controlvm <replaceable>VM-name</replaceable> webcam detach [<replaceable>host_path</replaceable>|<replaceable>alias</replaceable>]</screen>
         </listitem>
 
@@ -1236,5 +1182,5 @@
           </para>
 
-<screen>VBoxManage controlvm "VM name" webcam list</screen>
+<screen>VBoxManage controlvm <replaceable>VM-name</replaceable> webcam list</screen>
 
           <para>
@@ -1265,5 +1211,5 @@
 
       <para>
-        OS X version 10.9 or later is required.
+        Mac OS X version 10.9 or later is required.
       </para>
 
@@ -1271,6 +1217,7 @@
         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 <computeroutput>VBoxManage controlvm "VM
-        name" webcam detach</computeroutput> command.
+        detached using the <command>VBoxManage controlvm
+        <replaceable>VM-name</replaceable> webcam detach</command>
+        command.
       </para>
 
@@ -1285,14 +1232,14 @@
         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 <computeroutput>VBoxManage
-        controlvm "VM name" webcam detach</computeroutput> command.
-      </para>
-
-      <para>
-        Aliases <computeroutput>.0</computeroutput> and
-        <computeroutput>.1</computeroutput> are mapped to
-        <computeroutput>/dev/video0</computeroutput>, alias
-        <computeroutput>.2</computeroutput> is mapped to
-        <computeroutput>/dev/video1</computeroutput> and so forth.
+        should be manually detached using the <command>VBoxManage
+        controlvm <replaceable>VM-name</replaceable> webcam
+        detach</command> command.
+      </para>
+
+      <para>
+        Aliases <filename>.0</filename> and <filename>.1</filename> are
+        mapped to <filename>/dev/video0</filename>, alias
+        <filename>.2</filename> is mapped to
+        <filename>/dev/video1</filename> and so forth.
       </para>
 
@@ -1321,6 +1268,6 @@
         Additional video modes can be configured for each VM using the
         extra data facility. The extra data key is called
-        <computeroutput>CustomVideoMode&lt;x&gt;</computeroutput> with
-        <computeroutput>x</computeroutput> being a number from 1 to 16.
+        <literal>CustomVideoMode<replaceable>x</replaceable></literal>
+        with <replaceable>x</replaceable> 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
@@ -1329,11 +1276,11 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "CustomVideoMode1" "1400x1050x16"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "CustomVideoMode1" "1400x1050x16"</screen>
 
       <para>
         The VESA mode IDs for custom video modes start at
-        <computeroutput>0x160</computeroutput>. In order to use the
-        above defined custom video mode, the following command line has
-        to be supplied to Linux:
+        <literal>0x160</literal>. In order to use the above defined
+        custom video mode, the following command line has to be supplied
+        to Linux:
       </para>
 
@@ -1362,27 +1309,35 @@
         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>
+        will want, but if you have different needs, you can change it by
+        issuing one of the following commands from the command line:
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            Remove all limits on guest resolutions.
+          </para>
 
 <screen>VBoxManage setextradata global GUI/MaxGuestResolution any</screen>
-
-      <para>
-        will remove all limits on guest resolutions.
-      </para>
-
-<screen>VBoxManage setextradata global GUI/MaxGuestResolution &gt;width,height&lt;</screen>
-
-      <para>
-        manually specifies a maximum resolution.
-      </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Manually specify a maximum resolution.
+          </para>
+
+<screen>VBoxManage setextradata global GUI/MaxGuestResolution <replaceable>width</replaceable>x<replaceable>height</replaceable></screen>
+        </listitem>
+
+        <listitem>
+          <para>
+            Restore the default settings to all guest VMs.
+          </para>
 
 <screen>VBoxManage setextradata global GUI/MaxGuestResolution auto</screen>
-
-      <para>
-        restores the default settings. Note that these settings apply
-        globally to all guest systems, not just to a single machine.
-      </para>
+        </listitem>
+
+      </itemizedlist>
 
     </sect2>
@@ -1410,9 +1365,9 @@
         to access its virtual hard disk without going through the host
         OS file system. The actual performance difference for image
-        files vs. raw disk varies greatly depending on the overhead of
-        the host file system, whether dynamically growing images are
-        used, and on host OS caching strategies. The caching indirectly
-        also affects other aspects such as failure behavior. For
-        example, whether the virtual disk contains all data written
+        files compared to raw disk varies greatly depending on the
+        overhead of the host file system, whether dynamically growing
+        images are used, and on host OS caching strategies. The caching
+        indirectly also affects other aspects such as failure behavior.
+        For example, whether the virtual disk contains all data written
         before a host OS crash. Consult your host OS documentation for
         details on this.
@@ -1466,22 +1421,21 @@
         </para>
 
-<screen>VBoxManage internalcommands createrawvmdk -filename /path/to/file.vmdk
-  -rawdisk /dev/sda</screen>
-
-        <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 <computeroutput>/dev/sda</computeroutput>.
+<screen>$ VBoxManage internalcommands createrawvmdk -filename \
+/path/to/file.vmdk -rawdisk /dev/sda</screen>
+
+        <para>
+          This creates the
+          <filename>/<replaceable>path-to-file</replaceable>.vmdk</filename>
+          file image that must be an absolute path. All data is read and
+          written from <filename>/dev/sda</filename>.
         </para>
 
         <para>
           On a Windows host, instead of the above device specification,
-          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.
+          for example use <filename>\\.\PhysicalDrive0</filename>. On a
+          Mac OS X host, instead of the above device specification use
+          for example <filename>/dev/disk1</filename>. Note that on Mac
+          OS X you can only get access to an entire disk if no volume is
+          mounted from it.
         </para>
 
@@ -1490,6 +1444,6 @@
           device. Read/write access is also later needed when using the
           image from a virtual machine. On some host platforms, such as
-          Windows Vista and later, raw disk access may be restricted and
-          not permitted by the host OS in some situations.
+          Windows, raw disk access may be restricted and not permitted
+          by the host OS in some situations.
         </para>
 
@@ -1500,5 +1454,5 @@
         </para>
 
-<screen>VBoxManage storageattach WindowsXP --storagectl "IDE Controller"
+<screen>$ VBoxManage storageattach WindowsXP --storagectl "IDE Controller" \
  --port 0 --device 0 --type hdd --medium /path/to/file.vmdk</screen>
 
@@ -1534,16 +1488,15 @@
         </para>
 
-<screen>VBoxManage internalcommands createrawvmdk -filename /path/to/file.vmdk
- -rawdisk /dev/sda -partitions 1,5</screen>
+<screen>$ VBoxManage internalcommands createrawvmdk -filename \
+/path/to/file.vmdk -rawdisk /dev/sda -partitions 1,5</screen>
 
         <para>
           The command is identical to the one for full hard disk access,
-          except for the additional
-          <computeroutput>-partitions</computeroutput> parameter. This
-          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.
+          except for the additional <option>-partitions</option>
+          parameter. This example would create the image
+          <filename>/<replaceable>path-to-file</replaceable>.vmdk</filename>,
+          which must be absolute, and partitions 1 and 5 of
+          <filename>/dev/sda</filename> would be made accessible to the
+          guest.
         </para>
 
@@ -1557,11 +1510,10 @@
         <para>
           On a Windows host, instead of the above device specification,
-          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.
+          use for example <filename>\\.\PhysicalDrive0</filename>. On a
+          Mac OS X host, instead of the above device specification use
+          <filename>/dev/disk1</filename>, 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>
 
@@ -1571,5 +1523,5 @@
         </para>
 
-<screen>VBoxManage internalcommands listpartitions -rawdisk /dev/sda</screen>
+<screen>$ VBoxManage internalcommands listpartitions -rawdisk /dev/sda</screen>
 
         <para>
@@ -1596,16 +1548,16 @@
         </para>
 
-<screen>VBoxManage internalcommands createrawvmdk -filename /path/to/file.vmdk
- -rawdisk /dev/sda -partitions 1,5 -relative</screen>
+<screen>$ VBoxManage internalcommands createrawvmdk -filename \
+/path/to/file.vmdk -rawdisk /dev/sda -partitions 1,5 -relative</screen>
 
         <para>
           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, <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.
+          In this example, <filename>/dev/sda1</filename> and
+          <filename>/dev/sda5</filename>. 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>
 
@@ -1616,13 +1568,13 @@
           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>
-
-<screen>VBoxManage internalcommands createrawvmdk -filename /path/to/file.vmdk
- -rawdisk /dev/sda -partitions 1,5 -mbr winxp.mbr</screen>
+          this purpose the <option>-mbr</option> option 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>
+
+<screen>$ VBoxManage internalcommands createrawvmdk -filename
+/path/to/file.vmdk -rawdisk /dev/sda -partitions 1,5 -mbr winxp.mbr</screen>
 
         <para>
@@ -1651,10 +1603,10 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/ahci/0/Config/Port0/SerialNumber" "serial"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/ahci/0/Config/Port0/FirmwareRevision" "firmware"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/ahci/0/Config/Port0/ModelNumber" "model"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/ahci/0/Config/Port0/SerialNumber" "serial"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/ahci/0/Config/Port0/FirmwareRevision" "firmware"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/ahci/0/Config/Port0/ModelNumber" "model"</screen>
 
       <para>
@@ -1671,18 +1623,18 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/piix3ide/0/Config/PrimaryMaster/SerialNumber" "serial"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/piix3ide/0/Config/PrimaryMaster/FirmwareRevision" "firmware"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/piix3ide/0/Config/PrimaryMaster/ModelNumber" "model"</screen>
-
-      <para>
-        For hard disks it is also possible to mark the drive as having a
-        non-rotational medium with:
-      </para>
-
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/ahci/0/Config/Port0/NonRotational" "1"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/piix3ide/0/Config/PrimaryMaster/SerialNumber" "serial"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/piix3ide/0/Config/PrimaryMaster/FirmwareRevision" "firmware"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/piix3ide/0/Config/PrimaryMaster/ModelNumber" "model"</screen>
+
+      <para>
+        For hard disks, you can mark the drive as having a
+        non-rotational medium by using the following command:
+      </para>
+
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/ahci/0/Config/Port0/NonRotational" "1"</screen>
 
       <para>
@@ -1691,10 +1643,10 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/ahci/0/Config/Port0/ATAPIVendorId" "vendor"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/ahci/0/Config/Port0/ATAPIProductId" "product"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/ahci/0/Config/Port0/ATAPIRevision" "revision"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/ahci/0/Config/Port0/ATAPIVendorId" "vendor"
+VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/ahci/0/Config/Port0/ATAPIProductId" "product"
+VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/ahci/0/Config/Port0/ATAPIRevision" "revision"</screen>
 
       <para>
@@ -1731,21 +1683,29 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" VBoxInternal/Devices/IntNetIP/0/Trusted 1
-VBoxManage setextradata "VM name" VBoxInternal/Devices/IntNetIP/0/Config/MAC 08:00:27:01:02:0f
-VBoxManage setextradata "VM name" VBoxInternal/Devices/IntNetIP/0/Config/IP 10.0.9.1
-VBoxManage setextradata "VM name" VBoxInternal/Devices/IntNetIP/0/Config/Netmask 255.255.255.0
-VBoxManage setextradata "VM name" VBoxInternal/Devices/IntNetIP/0/LUN#0/Driver IntNet
-VBoxManage setextradata "VM name" VBoxInternal/Devices/IntNetIP/0/LUN#0/Config/Network MyIntNet
-VBoxManage setextradata "VM name" VBoxInternal/Devices/IntNetIP/0/LUN#0/Config/TrunkType 2
-VBoxManage setextradata "VM name" VBoxInternal/Devices/IntNetIP/0/LUN#0/Config/IsService 1</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/IntNetIP/0/Trusted 1
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/IntNetIP/0/Config/MAC 08:00:27:01:02:0f
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/IntNetIP/0/Config/IP 10.0.9.1
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/IntNetIP/0/Config/Netmask 255.255.255.0
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/IntNetIP/0/LUN#0/Driver IntNet
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/IntNetIP/0/LUN#0/Config/Network MyIntNet
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/IntNetIP/0/LUN#0/Config/TrunkType 2
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/IntNetIP/0/LUN#0/Config/IsService 1</screen>
 
       <para>
         Finally the iSCSI disk must be attached with the
-        <computeroutput>--intnet</computeroutput> option to tell the
-        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>
+        <option>--intnet</option> option to tell the 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>
@@ -1767,66 +1727,4 @@
   </sect1>
 
-  <sect1 id="serialports-legacy-cmds">
-
-    <title>Legacy Commands for Using Serial Ports</title>
-
-    <para>
-      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" />.
-    </para>
-
-    <note>
-      <para>
-        For backwards compatibility, the legacy
-        <computeroutput>setextradata</computeroutput> statements, whose
-        description is retained below from the old version of the
-        manual, take <emphasis>precedence</emphasis> over the new way of
-        configuring serial ports. As a result, if configuring serial
-        ports the new way does not work, make sure the VM in question
-        does not have old configuration data such as below still active.
-      </para>
-    </note>
-
-    <para>
-      The legacy sequence of configuring a serial port used the
-      following commands:
-    </para>
-
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/serial/0/Config/IRQ" 4
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/serial/0/Config/IOBase" 0x3f8
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/serial/0/LUN#0/Driver" Char
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/serial/0/LUN#0/AttachedDriver/Driver" NamedPipe
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/serial/0/LUN#0/AttachedDriver/Config/Location" "\\.\pipe\vboxCOM1"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/serial/0/LUN#0/AttachedDriver/Config/IsServer" 1</screen>
-
-    <para>
-      This sets up a serial port in the guest with the default settings
-      for COM1 (IRQ 4, I/O address 0x3f8) and the
-      <computeroutput>Location</computeroutput> setting assumes that
-      this configuration is used on a Windows host, because the Windows
-      named pipe syntax is used. Keep in mind that on Windows hosts a
-      named pipe must always start with
-      <computeroutput>\\.\pipe\</computeroutput>. On Linux the same
-      configuration settings apply, except that the path name for the
-      <computeroutput>Location</computeroutput> can be chosen more
-      freely. Local domain sockets can be placed anywhere, provided the
-      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>
-
-  </sect1>
-
   <sect1 id="changenat">
 
@@ -1839,13 +1737,12 @@
       <para>
         In NAT mode, the guest network interface is assigned to the IPv4
-        range <computeroutput>10.0.x.0/24</computeroutput> by default
-        where <computeroutput>x</computeroutput> corresponds to the
+        range <literal>10.0.<replaceable>x</replaceable>.0/24</literal>
+        by default where <replaceable>x</replaceable> corresponds to the
         instance of the NAT interface +2. So
-        <computeroutput>x</computeroutput> is 2 when there is only one
-        NAT instance active. In that case the guest is assigned to the
-        address <computeroutput>10.0.2.15</computeroutput>, the gateway
-        is set to <computeroutput>10.0.2.2</computeroutput> and the name
-        server can be found at
-        <computeroutput>10.0.2.3</computeroutput>.
+        <replaceable>x</replaceable> is 2 when there is only one NAT
+        instance active. In that case the guest is assigned to the
+        address <literal>10.0.2.15</literal>, the gateway is set to
+        <literal>10.0.2.2</literal> and the name server can be found at
+        <literal>10.0.2.3</literal>.
       </para>
 
@@ -1855,14 +1752,15 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --natnet1 "192.168/16"</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> \
+--natnet1 "192.168/16"</screen>
 
       <para>
         This command would reserve the network addresses from
-        <computeroutput>192.168.0.0</computeroutput> to
-        <computeroutput>192.168.254.254</computeroutput> for the first
-        NAT network instance of "VM name". The guest IP would be
-        assigned to <computeroutput>192.168.0.15</computeroutput> and
-        the default gateway could be found at
-        <computeroutput>192.168.0.2</computeroutput>.
+        <literal>192.168.0.0</literal> to
+        <literal>192.168.254.254</literal> for the first NAT network
+        instance of <replaceable>VM-name</replaceable> The guest IP
+        would be assigned to <literal>192.168.0.15</literal> and the
+        default gateway could be found at
+        <literal>192.168.0.2</literal>.
       </para>
 
@@ -1881,6 +1779,8 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --nattftpserver1 10.0.2.2
-VBoxManage modifyvm "VM name" --nattftpfile1 /srv/tftp/boot/MyPXEBoot.pxe</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> \
+--nattftpserver1 10.0.2.2
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> \
+--nattftpfile1 /srv/tftp/boot/MyPXEBoot.pxe</screen>
 
     </sect2>
@@ -1893,12 +1793,13 @@
         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>
+        several buffers, <literal>SO_RCVBUF</literal> and
+        <literal>SO_SNDBUF</literal>. 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 <replaceable>VM-name</replaceable> \
+--natsettings1 16000,128,128,0,0</screen>
 
       <para>
@@ -1932,5 +1833,6 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --natbindip1 "10.45.0.2"</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> \
+--natbindip1 "10.45.0.2"</screen>
 
       <para>
@@ -1956,5 +1858,5 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --natdnsproxy1 on</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --natdnsproxy1 on</screen>
 
     </sect2>
@@ -1973,5 +1875,5 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --natdnshostresolver1 on</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --natdnshostresolver1 on</screen>
 
       <para>
@@ -2000,10 +1902,11 @@
         </para>
 
-<screen>VBoxManage setextradata "VM name" \
-      "VBoxInternal/Devices/{pcnet,e1000}/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
-      &lt;unique rule name of interception rule&gt;/HostIP" &lt;IPv4&gt;
-VBoxManage setextradata "VM name" \
-      "VBoxInternal/Devices/{pcnet,e1000}/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
-      &lt;unique rule name&gt;/HostName" &lt;name of host&gt;</screen>
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/{pcnet,e1000}/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
+<replaceable>unique-rule-name-of-interception-rule</replaceable>/HostIP" <replaceable>IPv4</replaceable>
+
+VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/{pcnet,e1000}/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
+<replaceable>unique-rule-name</replaceable>/HostName" <replaceable>hostname</replaceable></screen>
 
         <para>
@@ -2012,14 +1915,16 @@
         </para>
 
-<screen>VBoxManage setextradata "VM name" \
-      "VBoxInternal/Devices/{pcnet,e1000}/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
-      &lt;unique rule name&gt;/HostIP" &lt;IPv4&gt;
-VBoxManage setextradata "VM name" \
-      "VBoxInternal/Devices/{pcnet,e1000}/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
-      &lt;unique rule name&gt;/HostNamePattern" &lt;hostpattern&gt;</screen>
-
-        <para>
-          The host pattern may include <computeroutput>"|", "?" and
-          "*"</computeroutput>.
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/{pcnet,e1000}/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
+<replaceable>unique-rule-name</replaceable>/HostIP" <replaceable>IPv4</replaceable>
+
+VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/{pcnet,e1000}/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
+<replaceable>unique-rule-name</replaceable>/HostNamePattern" <replaceable>hostpattern</replaceable></screen>
+
+        <para>
+          The host name pattern can include the following wildcard
+          characters: pipe (<literal>|</literal>), question mark
+          (<literal>?</literal>), and asterisk (<literal>*</literal>).
         </para>
 
@@ -2030,10 +1935,8 @@
         </para>
 
-<screen>VBoxManage setextradata "VM name" \
-      "VBoxInternal/Devices/e1000/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
-      all_blocked_site/HostIP" 127.0.0.1
-VBoxManage setextradata "VM name" \
-      "VBoxInternal/Devices/e1000/0/LUN#0/AttachedDriver/Config/HostResolverMappings/ \
-      all_blocked_site/HostNamePattern" "*.blocked-site.*|*.fb.org"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/e1000/0/LUN#0/AttachedDriver/Config/HostResolverMappings/all_blocked_site/HostIP" 127.0.0.1
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/e1000/0/LUN#0/AttachedDriver/Config/HostResolverMappings/all_blocked_site/HostNamePattern" "*.blocked-site.*|*.fb.org"</screen>
 
         <para>
@@ -2056,12 +1959,12 @@
         the most protocols like SSH, FTP and so on. Though some
         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 using the <command>VBoxManage</command>
-        frontend with the following commands:
-      </para>
-
-<screen>VBoxManage modifyvm "VM name" --nataliasmode1 proxyonly</screen>
-
-<screen>VBoxManage modifyvm "Linux Guest" --nataliasmode1 sameports</screen>
+        on the real port number the packet was sent from. You can change
+        the NAT mode by using the following commands:
+      </para>
+
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> \
+--nataliasmode1 proxyonly</screen>
+
+<screen>$ VBoxManage modifyvm "Linux Guest" --nataliasmode1 sameports</screen>
 
       <para>
@@ -2083,7 +1986,6 @@
       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
-      <computeroutput>pcbios</computeroutput> by
-      <computeroutput>efi</computeroutput> in the keys.
+      firmware you need to replace <literal>pcbios</literal> by
+      <literal>efi</literal> in the keys.
     </para>
 
@@ -2095,18 +1997,18 @@
         </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSVendor"        "BIOS Vendor"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSVersion"       "BIOS Version"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSReleaseDate"   "BIOS Release Date"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSReleaseMajor"  1
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSReleaseMinor"  2
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSFirmwareMajor" 3
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSFirmwareMinor" 4</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBIOSVendor"        "BIOS Vendor"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBIOSVersion"       "BIOS Version"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBIOSReleaseDate"   "BIOS Release Date"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBIOSReleaseMajor"  1
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBIOSReleaseMinor"  2
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBIOSFirmwareMajor" 3
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBIOSFirmwareMinor" 4</screen>
       </listitem>
 
@@ -2116,19 +2018,19 @@
         </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiSystemVendor"      "System Vendor"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiSystemProduct"     "System Product"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiSystemVersion"     "System Version"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiSystemSerial"      "System Serial"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiSystemSKU"         "System SKU"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiSystemFamily"      "System Family"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiSystemUuid"
-       "9852bf98-b83c-49db-a8de-182c42c7226b"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiSystemVendor"      "System Vendor"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiSystemProduct"     "System Product"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiSystemVersion"     "System Version"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiSystemSerial"      "System Serial"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiSystemSKU"         "System SKU"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiSystemFamily"      "System Family"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiSystemUuid" \
+"9852bf98-b83c-49db-a8de-182c42c7226b"</screen>
       </listitem>
 
@@ -2138,18 +2040,18 @@
         </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBoardVendor"       "Board Vendor"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBoardProduct"      "Board Product"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBoardVersion"      "Board Version"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBoardSerial"       "Board Serial"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBoardAssetTag"     "Board Tag"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBoardLocInChass"   "Board Location"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiBoardBoardType"    10</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBoardVendor"       "Board Vendor"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBoardProduct"      "Board Product"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBoardVersion"      "Board Version"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBoardSerial"       "Board Serial"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBoardAssetTag"     "Board Tag"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBoardLocInChass"   "Board Location"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiBoardBoardType"    10</screen>
       </listitem>
 
@@ -2159,14 +2061,14 @@
         </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiChassisVendor"     "Chassis Vendor"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiChassisType"       3
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiChassisVersion"    "Chassis Version"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiChassisSerial"     "Chassis Serial"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiChassisAssetTag"   "Chassis Tag"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiChassisVendor"     "Chassis Vendor"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiChassisType"       3
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiChassisVersion"    "Chassis Version"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiChassisSerial"     "Chassis Serial"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiChassisAssetTag"   "Chassis Tag"</screen>
       </listitem>
 
@@ -2176,8 +2078,8 @@
         </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiProcManufacturer"  "GenuineIntel"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiProcVersion"       "Pentium(R) III"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiProcManufacturer"  "GenuineIntel"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiProcVersion"       "Pentium(R) III"</screen>
       </listitem>
 
@@ -2187,8 +2089,8 @@
         </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiOEMVBoxVer"        "vboxVer_1.2.3"
-VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiOEMVBoxRev"        "vboxRev_12345"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiOEMVBoxVer"        "vboxVer_1.2.3"
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiOEMVBoxRev"        "vboxRev_12345"</screen>
       </listitem>
 
@@ -2198,5 +2100,5 @@
       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>.
+      <literal>"&lt;EMPTY&gt;"</literal>.
     </para>
 
@@ -2206,12 +2108,12 @@
       strings. If such a string is a valid number, the parameter is
       treated as number and the VM will most probably refuse to start
-      with an <computeroutput>VERR_CFGM_NOT_STRING</computeroutput>
-      error. In that case, use
-      <computeroutput>"string:&lt;value&gt;"</computeroutput>. For
+      with an <literal>VERR_CFGM_NOT_STRING</literal> error. In that
+      case, use
+      <literal>"string:<replaceable>value</replaceable>"</literal>. For
       example:
     </para>
 
-<screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/pcbios/0/Config/DmiSystemSerial"      "string:1234"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+"VBoxInternal/Devices/pcbios/0/Config/DmiSystemSerial"      "string:1234"</screen>
 
     <para>
@@ -2222,5 +2124,5 @@
     </para>
 
-<screen>dmidecode -t0</screen>
+<screen>$ dmidecode -t0</screen>
 
     <para>
@@ -2228,5 +2130,5 @@
     </para>
 
-<screen>dmidecode -t1</screen>
+<screen>$ dmidecode -t1</screen>
 
   </sect1>
@@ -2237,12 +2139,13 @@
 
     <para>
-      &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>
-
-<screen>VBoxManage setextradata "VM name"
+      You can configure &product-name; to present up to four custom ACPI
+      tables to the guest. Use a command such as the following to
+      configure custom ACPI tables. Note that
+      <literal>CustomTable1</literal>, <literal>CustomTable2</literal>,
+      and <literal>CustomTable3</literal> are available in addition to
+      <literal>CustomTable0</literal>.
+    </para>
+
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
 "VBoxInternal/Devices/acpi/0/Config/CustomTable0" "/path/to/table.bin"</screen>
 
@@ -2252,5 +2155,5 @@
       8 and later guests. On Linux hosts, one of the system's ACPI
       tables can be read from
-      <computeroutput>/sys/firmware/acpi/tables/</computeroutput>.
+      <filename>/sys/firmware/acpi/tables/</filename>.
     </para>
 
@@ -2283,5 +2186,5 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/TM/TSCTiedToExecution" 1</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/TM/TSCTiedToExecution" 1</screen>
 
       <para>
@@ -2289,5 +2192,5 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/TM/TSCTiedToExecution"</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/TM/TSCTiedToExecution"</screen>
 
       <para>
@@ -2311,5 +2214,5 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/TM/WarpDrivePercentage" 200</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/TM/WarpDrivePercentage" 200</screen>
 
       <para>
@@ -2317,5 +2220,5 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/TM/WarpDrivePercentage" 50</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/TM/WarpDrivePercentage" 50</screen>
 
       <para>
@@ -2347,9 +2250,8 @@
       </para>
 
-<screen>VBoxManage guestproperty set "VM name" "/VirtualBox/GuestAdd/VBoxService/PARAMETER" VALUE</screen>
-
-      <para>
-        where <computeroutput>PARAMETER</computeroutput> is one of the
-        following:
+<screen>$ VBoxManage guestproperty set <replaceable>VM-name</replaceable> "/VirtualBox/GuestAdd/VBoxService/<replaceable>property</replaceable>" <replaceable>value</replaceable></screen>
+
+      <para>
+        <replaceable>property</replaceable> is one of the following:
       </para>
 
@@ -2358,5 +2260,5 @@
         <varlistentry>
           <term>
-            <computeroutput>--timesync-interval</computeroutput>
+            <option>--timesync-interval</option>
           </term>
 
@@ -2371,5 +2273,5 @@
         <varlistentry>
           <term>
-            <computeroutput>--timesync-min-adjust</computeroutput>
+            <option>--timesync-min-adjust</option>
           </term>
 
@@ -2385,5 +2287,5 @@
         <varlistentry>
           <term>
-            <computeroutput>--timesync-latency-factor</computeroutput>
+            <option>--timesync-latency-factor</option>
           </term>
 
@@ -2408,5 +2310,5 @@
         <varlistentry>
           <term>
-            <computeroutput>--timesync-max-latency</computeroutput>
+            <option>--timesync-max-latency</option>
           </term>
 
@@ -2421,5 +2323,5 @@
         <varlistentry>
           <term>
-            <computeroutput>--timesync-set-threshold</computeroutput>
+            <option>--timesync-set-threshold</option>
           </term>
 
@@ -2435,5 +2337,5 @@
         <varlistentry>
           <term>
-            <computeroutput>--timesync-set-start</computeroutput>
+            <option>--timesync-set-start</option>
           </term>
 
@@ -2447,6 +2349,5 @@
         <varlistentry>
           <term>
-            <computeroutput>--timesync-set-on-restore
-            0|1</computeroutput>
+            <option>--timesync-set-on-restore 0|1</option>
           </term>
 
@@ -2481,5 +2382,5 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/Devices/VMMDev/0/Config/GetHostTimeDisabled" 1</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/Devices/VMMDev/0/Config/GetHostTimeDisabled" 1</screen>
 
     </sect2>
@@ -2490,11 +2391,11 @@
 
     <title>Installing the Alternate Bridged Networking Driver on Oracle Solaris 11
-      hosts</title>
+      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.
+      driver is installed for Oracle Solaris 11 hosts that have support
+      for it.
     </para>
 
@@ -2505,5 +2406,5 @@
     </para>
 
-<screen>touch /etc/vboxinst_vboxflt</screen>
+<screen>$ touch /etc/vboxinst_vboxflt</screen>
 
     <para>
@@ -2513,5 +2414,5 @@
     </para>
 
-<screen>touch /etc/vboxinst_vboxbow</screen>
+<screen>$ touch /etc/vboxinst_vboxbow</screen>
 
     <para>
@@ -2520,5 +2421,5 @@
     </para>
 
-<screen>modinfo | grep vbox</screen>
+<screen>$ modinfo | grep vbox</screen>
 
     <para>
@@ -2538,5 +2439,5 @@
       for configuring VMs over VLANs. An &product-name; VNIC template is
       a VNIC whose name starts with
-      <computeroutput>vboxvnic_template</computeroutput>. The string is
+      <filename>vboxvnic_template</filename>. The string is
       case-sensitive.
     </para>
@@ -2554,12 +2455,12 @@
     </para>
 
-<screen>dladm create-vnic -t -l nge0 -v 23 vboxvnic_template0</screen>
-
-    <para>
-      This will create a temporary VNIC template over interface "nge0"
-      with the VLAN ID 23. To create VNIC templates that are persistent
-      across host reboots, skip the <computeroutput>-t</computeroutput>
-      parameter in the above command. You may check the current state of
-      links using the following command:
+<screen># dladm create-vnic -t -l nge0 -v 23 vboxvnic_template0</screen>
+
+    <para>
+      This will create a temporary VNIC template over interface
+      <command>nge0</command> with the VLAN ID 23. To create VNIC
+      templates that are persistent across host reboots, skip the
+      <option>-t</option> parameter in the above command. You may check
+      the current state of links using the following command:
     </para>
 
@@ -2576,6 +2477,6 @@
     <para>
       Once the VNIC template is created, any VMs that need to be on VLAN
-      23 over the interface <computeroutput>nge0</computeroutput> can be
-      configured to bridge using this VNIC template.
+      23 over the interface <command>nge0</command> can be configured to
+      bridge using this VNIC template.
     </para>
 
@@ -2590,8 +2491,7 @@
     <para>
       VNIC templates can be created with additional properties such as
-      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.
+      bandwidth limits and CPU fanout. Refer to your Oracle Solaris
+      network documentation for details. The additional properties are
+      also applied to VMs which bridge using the VNIC template.
     </para>
 
@@ -2615,5 +2515,5 @@
     </para>
 
-<screen>ifconfig vboxnet0 unplumb</screen>
+<screen># ifconfig vboxnet0 unplumb</screen>
 
     <para>
@@ -2623,11 +2523,10 @@
     </para>
 
-<screen>rem_drv vboxnet</screen>
+<screen># rem_drv vboxnet</screen>
 
     <para>
       Edit the file
-      <computeroutput>/platform/i86pc/kernel/drv/vboxnet.conf</computeroutput>
-      and add a line for the new interface we want to add as shown
-      below:
+      <filename>/platform/i86pc/kernel/drv/vboxnet.conf</filename> and
+      add a line for the new interface we want to add as shown below:
     </para>
 
@@ -2645,5 +2544,5 @@
     </para>
 
-<screen>add_drv vboxnet</screen>
+<screen># add_drv vboxnet</screen>
 
     <para>
@@ -2653,5 +2552,5 @@
     </para>
 
-<screen>dladm show-phys
+<screen>$ dladm show-phys
 LINK              MEDIA                STATE      SPEED  DUPLEX    DEVICE
 net0              Ethernet             up         100    full      e1000g0
@@ -2665,13 +2564,13 @@
     </para>
 
-<screen>dladm rename-link net2 vboxnet1</screen>
-
-    <para>
-      Now plumb all the interfaces using <computeroutput>ifconfig
-      vboxnetX plumb</computeroutput>, where 'X' would be 1 in this
-      case. Once the interface is plumbed, it may be configured like any
-      other network interface. Refer to the
-      <computeroutput>ifconfig</computeroutput> documentation for
-      further details.
+<screen># dladm rename-link net2 vboxnet1</screen>
+
+    <para>
+      Now plumb all the interfaces using <command>ifconfig
+      vboxnet<replaceable>X</replaceable> plumb</command>, where
+      <replaceable>X</replaceable> would be 1 in this case. Once the
+      interface is plumbed, it may be configured like any other network
+      interface. Refer to the <command>ifconfig</command> documentation
+      for further details.
     </para>
 
@@ -2679,10 +2578,9 @@
       To make the settings for the newly added interfaces persistent
       across reboots, you will need to edit the files
-      <computeroutput>/etc/inet/netmasks</computeroutput>, and if you
-      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 &product-name; installer only
-      updates these configuration files for the one "vboxnet0" interface
-      it creates by default.
+      <filename>/etc/inet/netmasks</filename>, and if you are using NWAM
+      <filename>/etc/nwam/llp</filename> and add the appropriate entries
+      to set the netmask and static IP for each of those interfaces. The
+      &product-name; installer only updates these configuration files
+      for the one "vboxnet0" interface it creates by default.
     </para>
 
@@ -2704,5 +2602,5 @@
     </para>
 
-<screen>VBoxManage setextradata "VM name" VBoxInternal2/CoreDumpEnabled 1</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> VBoxInternal2/CoreDumpEnabled 1</screen>
 
     <para>
@@ -2711,5 +2609,5 @@
     </para>
 
-<screen>VBoxManage setextradata "VM name" VBoxInternal2/CoreDumpDir &lt;path-to-directory&gt;</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> VBoxInternal2/CoreDumpDir <replaceable>path-to-directory</replaceable></screen>
 
     <para>
@@ -2729,6 +2627,6 @@
     </para>
 
-<screen>VBoxManage setextradata "VM name" VBoxInternal2/CoreDumpReplaceSystemDump 1
-VBoxManage setextradata "VM name" VBoxInternal2/CoreDumpLive 1</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> VBoxInternal2/CoreDumpReplaceSystemDump 1
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> VBoxInternal2/CoreDumpLive 1</screen>
 
     <para>
@@ -2738,27 +2636,24 @@
 
     <para>
-      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 &product-name; CoreDumper would
-      produce the core file.
-    </para>
-
-    <para>
-      Setting <computeroutput>CoreDumpLive</computeroutput> sets up the
-      VM to produce cores whenever the VM process receives a
-      <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 the following
-      command:
-    </para>
-
-<screen>kill -s SIGUSR2 &lt;VM-process-id&gt;</screen>
-
-    <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
-      <computeroutput>core.vb.VBoxHeadless.11321</computeroutput>.
+      Setting <literal>CoreDumpReplaceSystemDump</literal> sets up the
+      VM to override the host's core dumping mechanism and in the event
+      of any crash only the &product-name; CoreDumper would produce the
+      core file.
+    </para>
+
+    <para>
+      Setting <literal>CoreDumpLive</literal> sets up the VM to produce
+      cores whenever the VM process receives a
+      <literal>SIGUSR2</literal> 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 the following command:
+    </para>
+
+<screen>$ kill -s SIGUSR2 <replaceable>VM-process-id</replaceable></screen>
+
+    <para>
+      The &product-name; CoreDumper creates core files of the form
+      <filename>core.vb.<replaceable>process-name</replaceable>.<replaceable>process-ID</replaceable></filename>
+      such as <filename>core.vb.VBoxHeadless.11321</filename>.
     </para>
 
@@ -2793,5 +2688,5 @@
     </para>
 
-<screen>VBoxManage setproperty hwvirtexclusive off</screen>
+<screen>$ VBoxManage setproperty hwvirtexclusive off</screen>
 
     <para>
@@ -2818,9 +2713,9 @@
       </para>
 
-<screen>VBoxManage setextradata global GUI/Customizations OPTION[,OPTION...]</screen>
-
-      <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+<screen>VBoxManage setextradata global GUI/Customizations <replaceable>property</replaceable>[,<replaceable>property</replaceable> ...]</screen>
+
+      <para>
+        <replaceable>property</replaceable> is one of the following
+        properties:
       </para>
 
@@ -2829,5 +2724,5 @@
         <varlistentry>
           <term>
-            <computeroutput>noSelector</computeroutput>
+            <literal>noSelector</literal>
           </term>
 
@@ -2843,5 +2738,5 @@
         <varlistentry>
           <term>
-            <computeroutput>noMenuBar</computeroutput>
+            <literal>noMenuBar</literal>
           </term>
 
@@ -2855,5 +2750,5 @@
         <varlistentry>
           <term>
-            <computeroutput>noStatusBar</computeroutput>
+            <literal>noStatusBar</literal>
           </term>
 
@@ -2872,5 +2767,5 @@
       </para>
 
-<screen>VBoxManage setextradata global GUI/Customizations</screen>
+<screen>$ VBoxManage setextradata global GUI/Customizations</screen>
 
     </sect2>
@@ -2886,8 +2781,8 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" SETTING true</screen>
-
-      <para>
-        where <computeroutput>SETTING</computeroutput> can be:
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> <replaceable>property</replaceable> true</screen>
+
+      <para>
+        <replaceable>property</replaceable> can be any of the following:
       </para>
 
@@ -2896,5 +2791,5 @@
         <varlistentry>
           <term>
-            <computeroutput>GUI/HideDetails</computeroutput>
+            <literal>GUI/HideDetails</literal>
           </term>
 
@@ -2910,5 +2805,5 @@
         <varlistentry>
           <term>
-            <computeroutput>GUI/PreventReconfiguration</computeroutput>
+            <literal>GUI/PreventReconfiguration</literal>
           </term>
 
@@ -2924,5 +2819,5 @@
         <varlistentry>
           <term>
-            <computeroutput>GUI/PreventSnapshotOperations</computeroutput>
+            <literal>GUI/PreventSnapshotOperations</literal>
           </term>
 
@@ -2937,5 +2832,5 @@
         <varlistentry>
           <term>
-            <computeroutput>GUI/HideFromManager</computeroutput>
+            <literal>GUI/HideFromManager</literal>
           </term>
 
@@ -2949,5 +2844,5 @@
         <varlistentry>
           <term>
-            <computeroutput>GUI/PreventApplicationUpdate</computeroutput>
+            <literal>GUI/PreventApplicationUpdate</literal>
           </term>
 
@@ -2963,7 +2858,7 @@
 
       <para>
-        Please note that these settings would not prevent the user from
-        reconfiguring the VM by using <command>VBoxManage
-        modifyvm</command>.
+        Note that these settings do not prevent the user from
+        reconfiguring the VM by using the <command>VBoxManage
+        modifyvm</command> command.
       </para>
 
@@ -2979,9 +2874,8 @@
       </para>
 
-<screen>VBoxManage setextradata global GUI/RestrictedGlobalSettingsPages OPTION[,OPTION...]</screen>
-
-      <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+<screen>$ VBoxManage setextradata global GUI/RestrictedGlobalSettingsPages <replaceable>property</replaceable>[,<replaceable>property</replaceable>...]</screen>
+
+      <para>
+        <replaceable>property</replaceable> is one of the following:
       </para>
 
@@ -2990,5 +2884,5 @@
         <varlistentry>
           <term>
-            <computeroutput>General</computeroutput>
+            <literal>General</literal>
           </term>
 
@@ -3003,5 +2897,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Input</computeroutput>
+            <literal>Input</literal>
           </term>
 
@@ -3016,5 +2910,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Update</computeroutput>
+            <literal>Update</literal>
           </term>
 
@@ -3029,5 +2923,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Language</computeroutput>
+            <literal>Language</literal>
           </term>
 
@@ -3042,5 +2936,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Display</computeroutput>
+            <literal>Display</literal>
           </term>
 
@@ -3055,5 +2949,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Network</computeroutput>
+            <literal>Network</literal>
           </term>
 
@@ -3068,5 +2962,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Extensions</computeroutput>
+            <literal>Extensions</literal>
           </term>
 
@@ -3081,5 +2975,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Proxy</computeroutput>
+            <literal>Proxy</literal>
           </term>
 
@@ -3095,9 +2989,10 @@
 
       <para>
-        This is a global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
-      </para>
-
-<screen>VBoxManage setextradata global GUI/RestrictedGlobalSettingsPages</screen>
+        This is a global setting. You can specify any combination of
+        properties. To restore the default behavior, use the following
+        command:
+      </para>
+
+<screen>$ VBoxManage setextradata global GUI/RestrictedGlobalSettingsPages</screen>
 
     </sect2>
@@ -3115,6 +3010,6 @@
 
       <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+        where <literal>OPTION</literal> is one of the following
+        keywords:
       </para>
 
@@ -3123,5 +3018,5 @@
         <varlistentry>
           <term>
-            <computeroutput>All</computeroutput>
+            <literal>All</literal>
           </term>
 
@@ -3135,17 +3030,19 @@
         <varlistentry>
           <term>
-            <computeroutput>Application</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-               Do not show <emphasis role="bold">Application/File</emphasis> menu in the VM window.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>Machine</computeroutput>
+            <literal>Application</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show
+              <emphasis role="bold">Application/File</emphasis> menu in
+              the VM window.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Machine</literal>
           </term>
 
@@ -3160,5 +3057,5 @@
         <varlistentry>
           <term>
-            <computeroutput>View</computeroutput>
+            <literal>View</literal>
           </term>
 
@@ -3173,17 +3070,18 @@
         <varlistentry>
           <term>
-            <computeroutput>Input</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-               Do not show <emphasis role="bold">Input</emphasis> menu in the VM window.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>Devices</computeroutput>
+            <literal>Input</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show <emphasis role="bold">Input</emphasis> menu in
+              the VM window.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Devices</literal>
           </term>
 
@@ -3198,5 +3096,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Help</computeroutput>
+            <literal>Help</literal>
           </term>
 
@@ -3211,5 +3109,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Debug</computeroutput>
+            <literal>Debug</literal>
           </term>
 
@@ -3227,6 +3125,7 @@
 
       <para>
-        This is a per-VM or global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
+        This is a per-VM or global setting. Any combination of the above
+        is allowed. To restore the default behavior, use the following
+        command:
       </para>
 
@@ -3243,6 +3142,6 @@
 
       <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+        where <literal>OPTION</literal> is one of the following
+        keywords:
       </para>
 
@@ -3251,5 +3150,5 @@
         <varlistentry>
           <term>
-            <computeroutput>All</computeroutput>
+            <literal>All</literal>
           </term>
 
@@ -3263,5 +3162,5 @@
         <varlistentry>
           <term>
-            <computeroutput>About</computeroutput>
+            <literal>About</literal>
           </term>
 
@@ -3276,44 +3175,45 @@
         <varlistentry>
           <term>
-            <computeroutput>Preferences</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">Preferences</emphasis>
-              menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>NetworkAccessManager</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">Network Operations Manager</emphasis>
-              menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>ResetWarnings</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">Reset All Warnings</emphasis>
-              menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>Close</computeroutput>
+            <literal>Preferences</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the
+              <emphasis role="bold">Preferences</emphasis> menu item in
+              this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>NetworkAccessManager</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Network Operations
+              Manager</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>ResetWarnings</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Reset All
+              Warnings</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Close</literal>
           </term>
 
@@ -3329,6 +3229,7 @@
 
       <para>
-        This is a per-VM or global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
+        This is a per-VM or global setting. Any combination of the above
+        is allowed. To restore the default behavior, use the following
+        command:
       </para>
 
@@ -3343,6 +3244,6 @@
 
       <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+        where <literal>OPTION</literal> is one of the following
+        keywords:
       </para>
 
@@ -3351,5 +3252,5 @@
         <varlistentry>
           <term>
-            <computeroutput>All</computeroutput>
+            <literal>All</literal>
           </term>
 
@@ -3363,5 +3264,5 @@
         <varlistentry>
           <term>
-            <computeroutput>SettingsDialog</computeroutput>
+            <literal>SettingsDialog</literal>
           </term>
 
@@ -3376,5 +3277,5 @@
         <varlistentry>
           <term>
-            <computeroutput>TakeSnapshot</computeroutput>
+            <literal>TakeSnapshot</literal>
           </term>
 
@@ -3389,5 +3290,5 @@
         <varlistentry>
           <term>
-            <computeroutput>InformationDialog</computeroutput>
+            <literal>InformationDialog</literal>
           </term>
 
@@ -3402,5 +3303,5 @@
         <varlistentry>
           <term>
-            <computeroutput>FileManagerDialog</computeroutput>
+            <literal>FileManagerDialog</literal>
           </term>
 
@@ -3413,33 +3314,33 @@
         </varlistentry>
 
-
-        <varlistentry>
-          <term>
-            <computeroutput>Pause</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">Pause</emphasis> menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>Reset</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">Reset</emphasis> menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-
-        <varlistentry>
-          <term>
-            <computeroutput>Shutdown</computeroutput>
+        <varlistentry>
+          <term>
+            <literal>Pause</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Pause</emphasis>
+              menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Reset</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Reset</emphasis>
+              menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Shutdown</literal>
           </term>
 
@@ -3455,6 +3356,6 @@
 
       <para>
-        This is a per-VM or global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
+        This is a per-VM or global setting. Any combination of the above
+        is allowed. To restore the default behavior, use
       </para>
 
@@ -3469,6 +3370,6 @@
 
       <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+        where <literal>OPTION</literal> is one of the following
+        keywords:
       </para>
 
@@ -3477,5 +3378,5 @@
         <varlistentry>
           <term>
-            <computeroutput>All</computeroutput>
+            <literal>All</literal>
           </term>
 
@@ -3489,17 +3390,18 @@
         <varlistentry>
           <term>
-            <computeroutput>Fullscreen</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">Full-screen Mode</emphasis> menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>Seamless</computeroutput>
+            <literal>Fullscreen</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Full-screen
+              Mode</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Seamless</literal>
           </term>
 
@@ -3514,5 +3416,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Scale</computeroutput>
+            <literal>Scale</literal>
           </term>
 
@@ -3527,5 +3429,5 @@
         <varlistentry>
           <term>
-            <computeroutput>GuestAutoresize</computeroutput>
+            <literal>GuestAutoresize</literal>
           </term>
 
@@ -3540,5 +3442,5 @@
         <varlistentry>
           <term>
-            <computeroutput>AdjustWindow</computeroutput>
+            <literal>AdjustWindow</literal>
           </term>
 
@@ -3553,96 +3455,89 @@
         <varlistentry>
           <term>
-            <computeroutput>TakeScreenshot</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the
-              <emphasis role="bold">Take Screenshot...</emphasis> menu item in
-              this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>Recording</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the
-              <emphasis role="bold">Recording</emphasis> menu item in
-              this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>VRDEServer</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the
-              <emphasis role="bold">Remote Display</emphasis> menu item in
-              this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>MenuBar</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the
-              <emphasis role="bold">Menu Bar</emphasis> menu item in
-              this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>MenuBarSettings</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the
-              <emphasis role="bold">Menu Bar Settings...</emphasis> menu item in
-              this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-              <computeroutput>StatusBar</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the
-              <emphasis role="bold">Status Bar</emphasis> menu item in
-              this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>StatusbarSettings</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the
-              <emphasis role="bold">Statusbar Settings...</emphasis> menu item in
-              this menu.
+            <literal>TakeScreenshot</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Take
+              Screenshot...</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Recording</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Recording</emphasis>
+              menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>VRDEServer</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Remote
+              Display</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>MenuBar</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Menu Bar</emphasis>
+              menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>MenuBarSettings</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Menu Bar
+              Settings...</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>StatusBar</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Status
+              Bar</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>StatusbarSettings</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Statusbar
+              Settings...</emphasis> menu item in this menu.
             </para>
           </listitem>
@@ -3652,11 +3547,11 @@
 
       <para>
-        This is a per-VM or global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
-      </para>
-
-      <screen>VBoxManage setextradata "VM name"|global GUI/RestrictedRuntimeViewMenuActions</screen>
-
-     <para>
+        This is a per-VM or global setting. Any combination of the above
+        is allowed. To restore the default behavior, use
+      </para>
+
+<screen>VBoxManage setextradata "VM name"|global GUI/RestrictedRuntimeViewMenuActions</screen>
+
+      <para>
         Use the following command to disable certain actions of the
         <emphasis role="bold">Input</emphasis> menu:
@@ -3666,6 +3561,6 @@
 
       <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+        where <literal>OPTION</literal> is one of the following
+        keywords:
       </para>
 
@@ -3674,5 +3569,5 @@
         <varlistentry>
           <term>
-            <computeroutput>All</computeroutput>
+            <literal>All</literal>
           </term>
 
@@ -3685,164 +3580,155 @@
 
         <varlistentry>
-            <term>
-                <computeroutput>Keyboard</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Keyboard</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>KeyboardSettings</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Keyboard Settings...</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>SoftKeyboard</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Soft Keyboard...</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>TypeCAD</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Insert Ctrl-Alt-Del</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>TypeCABS</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Insert Ctrl-Alt-Backspace</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>TypeCtrlBreak</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Insert Ctrl-Break</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>TypeInsert</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Insert Insert</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>TypePrintScreen</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Insert Print Screen</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>TypeAltPrintScreen</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Insert Alt Print Screen</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-      <varlistentry>
-            <term>
-                <computeroutput>TypeHostKeyCombo</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Insert Host Key Combo</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>MouseIntegration</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">MouseIntegration</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
+          <term>
+            <literal>Keyboard</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Keyboard</emphasis>
+              menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>KeyboardSettings</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Keyboard
+              Settings...</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>SoftKeyboard</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Soft
+              Keyboard...</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>TypeCAD</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Insert
+              Ctrl-Alt-Del</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>TypeCABS</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Insert
+              Ctrl-Alt-Backspace</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>TypeCtrlBreak</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Insert
+              Ctrl-Break</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>TypeInsert</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Insert
+              Insert</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>TypePrintScreen</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Insert Print
+              Screen</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>TypeAltPrintScreen</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Insert Alt Print
+              Screen</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>TypeHostKeyCombo</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Insert Host Key
+              Combo</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>MouseIntegration</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the
+              <emphasis role="bold">MouseIntegration</emphasis> menu
+              item in this menu.
+            </para>
+          </listitem>
         </varlistentry>
 
       </variablelist>
-      <para>
-        This is a per-VM or global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
-      </para>
-
-      <screen>VBoxManage setextradata "VM name"|global GUI/RestrictedRuntimeInputMenuActions</screen>
+
+      <para>
+        This is a per-VM or global setting. Any combination of the above
+        is allowed. To restore the default behavior, use
+      </para>
+
+<screen>VBoxManage setextradata "VM name"|global GUI/RestrictedRuntimeInputMenuActions</screen>
 
       <para>
@@ -3854,6 +3740,6 @@
 
       <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords to disable actions in the
+        where <literal>OPTION</literal> is one of the following keywords
+        to disable actions in the
         <emphasis role="bold">Devices</emphasis> menu:
       </para>
@@ -3863,5 +3749,5 @@
         <varlistentry>
           <term>
-            <computeroutput>All</computeroutput>
+            <literal>All</literal>
           </term>
 
@@ -3875,17 +3761,18 @@
         <varlistentry>
           <term>
-            <computeroutput>HardDrives</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">Hard Disks</emphasis> menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>OpticalDevices</computeroutput>
+            <literal>HardDrives</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Hard
+              Disks</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>OpticalDevices</literal>
           </term>
 
@@ -3900,5 +3787,5 @@
         <varlistentry>
           <term>
-            <computeroutput>FloppyDevices</computeroutput>
+            <literal>FloppyDevices</literal>
           </term>
 
@@ -3913,32 +3800,31 @@
         <varlistentry>
           <term>
-            <computeroutput>Audio</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-                Do not show the <emphasis role="bold">Audio</emphasis>
-                menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>Network</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-                Do not show the <emphasis role="bold">Network</emphasis>
-                menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-
-        <varlistentry>
-          <term>
-            <computeroutput>NetworkSettings</computeroutput>
+            <literal>Audio</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Audio</emphasis>
+              menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Network</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Network</emphasis>
+              menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>NetworkSettings</literal>
           </term>
 
@@ -3953,44 +3839,44 @@
         <varlistentry>
           <term>
-            <computeroutput>USBDevices</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">USB
-              </emphasis> menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>WebCams</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">WebCams
-              </emphasis> menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>SharedFolders</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-                Do not show the <emphasis role="bold">Shared Folders</emphasis>
-                menu item in this menu.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>SharedFoldersSettings</computeroutput>
+            <literal>USBDevices</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">USB </emphasis> menu
+              item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>WebCams</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">WebCams </emphasis>
+              menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>SharedFolders</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Shared
+              Folders</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>SharedFoldersSettings</literal>
           </term>
 
@@ -4005,5 +3891,5 @@
         <varlistentry>
           <term>
-            <computeroutput>SharedClipboard</computeroutput>
+            <literal>SharedClipboard</literal>
           </term>
 
@@ -4018,5 +3904,5 @@
         <varlistentry>
           <term>
-            <computeroutput>DragAndDrop</computeroutput>
+            <literal>DragAndDrop</literal>
           </term>
 
@@ -4031,5 +3917,5 @@
         <varlistentry>
           <term>
-            <computeroutput>InstallGuestTools</computeroutput>
+            <literal>InstallGuestTools</literal>
           </term>
 
@@ -4045,6 +3931,6 @@
 
       <para>
-        This is a per-VM or global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
+        This is a per-VM or global or global setting. Any combination of
+        the above is allowed. To restore the default behavior, use
       </para>
 
@@ -4059,8 +3945,7 @@
 
       <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords to disable actions in the
-        <emphasis>Debug</emphasis> menu, which is normally completely
-        disabled:
+        where <literal>OPTION</literal> is one of the following keywords
+        to disable actions in the <emphasis>Debug</emphasis> menu, which
+        is normally completely disabled:
       </para>
 
@@ -4069,5 +3954,5 @@
         <varlistentry>
           <term>
-            <computeroutput>All</computeroutput>
+            <literal>All</literal>
           </term>
 
@@ -4081,5 +3966,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Statistics</computeroutput>
+            <literal>Statistics</literal>
           </term>
 
@@ -4095,5 +3980,5 @@
         <varlistentry>
           <term>
-            <computeroutput>CommandLine</computeroutput>
+            <literal>CommandLine</literal>
           </term>
 
@@ -4108,5 +3993,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Logging</computeroutput>
+            <literal>Logging</literal>
           </term>
 
@@ -4122,5 +4007,5 @@
         <varlistentry>
           <term>
-            <computeroutput>LogDialog</computeroutput>
+            <literal>LogDialog</literal>
           </term>
 
@@ -4135,5 +4020,5 @@
         <varlistentry>
           <term>
-            <computeroutput>GuestControlConsole</computeroutput>
+            <literal>GuestControlConsole</literal>
           </term>
 
@@ -4149,6 +4034,6 @@
 
       <para>
-        This is a per-VM or global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
+        This is a per-VM or global setting. Any combination of the above
+        is allowed. To restore the default behavior, use
       </para>
 
@@ -4163,8 +4048,7 @@
 
       <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords to disable actions in the
-        <emphasis role="bold">Help</emphasis> menu, which is normally
-        completely disabled:
+        where <literal>OPTION</literal> is one of the following keywords
+        to disable actions in the <emphasis role="bold">Help</emphasis>
+        menu, which is normally completely disabled:
       </para>
 
@@ -4173,5 +4057,5 @@
         <varlistentry>
           <term>
-            <computeroutput>All</computeroutput>
+            <literal>All</literal>
           </term>
 
@@ -4185,5 +4069,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Contents</computeroutput>
+            <literal>Contents</literal>
           </term>
 
@@ -4199,5 +4083,5 @@
         <varlistentry>
           <term>
-            <computeroutput>WebSite</computeroutput>
+            <literal>WebSite</literal>
           </term>
 
@@ -4211,52 +4095,52 @@
 
         <varlistentry>
-            <term>
-                <computeroutput>BugTracker</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">VirtualBox Bug Tracker...</emphasis> menu item in
-                    this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>Forums</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">VirtualBox Forums...</emphasis> menu item in this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-            <term>
-                <computeroutput>Oracle</computeroutput>
-            </term>
-
-            <listitem>
-                <para>
-                    Do not show the
-                    <emphasis role="bold">Oracle Web Site...</emphasis> menu item in this menu.
-                </para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>About</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Do not show the <emphasis role="bold">About VirtualBox...</emphasis>
-              menu item in this menu. Only for non-Mac OS X hosts.
+          <term>
+            <literal>BugTracker</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">VirtualBox Bug
+              Tracker...</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Forums</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">VirtualBox
+              Forums...</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>Oracle</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">Oracle Web
+              Site...</emphasis> menu item in this menu.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>About</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Do not show the <emphasis role="bold">About
+              VirtualBox...</emphasis> menu item in this menu. Only for
+              non-Mac OS X hosts.
             </para>
           </listitem>
@@ -4266,6 +4150,6 @@
 
       <para>
-        This is a per-VM or global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
+        This is a per-VM or global setting. Any combination of the above
+        is allowed. To restore the default behavior, use
       </para>
 
@@ -4285,6 +4169,6 @@
 
       <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+        where <literal>OPTION</literal> is one of the following
+        keywords:
       </para>
 
@@ -4293,5 +4177,5 @@
         <varlistentry>
           <term>
-            <computeroutput>HardDisks</computeroutput>
+            <literal>HardDisks</literal>
           </term>
 
@@ -4307,5 +4191,5 @@
         <varlistentry>
           <term>
-            <computeroutput>OpticalDisks</computeroutput>
+            <literal>OpticalDisks</literal>
           </term>
 
@@ -4321,5 +4205,5 @@
         <varlistentry>
           <term>
-            <computeroutput>FloppyDisks</computeroutput>
+            <literal>FloppyDisks</literal>
           </term>
 
@@ -4335,5 +4219,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Network</computeroutput>
+            <literal>Network</literal>
           </term>
 
@@ -4350,5 +4234,5 @@
         <varlistentry>
           <term>
-            <computeroutput>USB</computeroutput>
+            <literal>USB</literal>
           </term>
 
@@ -4362,5 +4246,5 @@
         <varlistentry>
           <term>
-            <computeroutput>SharedFolders</computeroutput>
+            <literal>SharedFolders</literal>
           </term>
 
@@ -4374,5 +4258,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Capture</computeroutput>
+            <literal>Capture</literal>
           </term>
 
@@ -4386,5 +4270,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Features</computeroutput>
+            <literal>Features</literal>
           </term>
 
@@ -4398,5 +4282,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Mouse</computeroutput>
+            <literal>Mouse</literal>
           </term>
 
@@ -4410,5 +4294,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Keyboard</computeroutput>
+            <literal>Keyboard</literal>
           </term>
 
@@ -4423,7 +4307,7 @@
 
       <para>
-        This is a per-VM or global setting. Any combination of the above is
-        allowed. If all options are specified, no icons are displayed in
-        the status bar of the VM window. To restore the default
+        This is a per-VM or global setting. Any combination of the above
+        is allowed. If all options are specified, no icons are displayed
+        in the status bar of the VM window. To restore the default
         behavior, use
       </para>
@@ -4441,9 +4325,8 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" GUI/RestrictedVisualStates OPTION[,OPTION...]</screen>
-
-      <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> GUI/RestrictedVisualStates <replaceable>property</replaceable>[,<replaceable>property</replaceable>...]</screen>
+
+      <para>
+        <replaceable>property</replaceable> is one of the following:
       </para>
 
@@ -4452,5 +4335,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Fullscreen</computeroutput>
+            <literal>Fullscreen</literal>
           </term>
 
@@ -4464,5 +4347,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Seamless</computeroutput>
+            <literal>Seamless</literal>
           </term>
 
@@ -4476,5 +4359,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Scale</computeroutput>
+            <literal>Scale</literal>
           </term>
 
@@ -4489,9 +4372,10 @@
 
       <para>
-        This is a per-VM setting. Any combination of the above is
-        allowed. To restore the default behavior, use
-      </para>
-
-<screen>VBoxManage setextradata "VM name" GUI/RestrictedVisualStates</screen>
+        This is a per-VM setting. You can specify any combination of
+        properties. To restore the default behavior, use the following
+        command:
+      </para>
+
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> GUI/RestrictedVisualStates</screen>
 
     </sect2>
@@ -4512,5 +4396,5 @@
       </para>
 
-<screen>VBoxManage setextradata global GUI/Input/MachineShortcuts "FullscreenMode=F,...."</screen>
+<screen>$ VBoxManage setextradata global GUI/Input/MachineShortcuts "FullscreenMode=F,...."</screen>
 
       <para>
@@ -4539,5 +4423,5 @@
             <row>
               <entry><para>
-                  <computeroutput>TakeSnapshot</computeroutput>
+                  <literal>TakeSnapshot</literal>
                 </para></entry>
               <entry><para>
@@ -4550,5 +4434,5 @@
             <row>
               <entry><para>
-                  <computeroutput>TakeScreenshot</computeroutput>
+                  <literal>TakeScreenshot</literal>
                 </para></entry>
               <entry><para>
@@ -4561,5 +4445,5 @@
             <row>
               <entry><para>
-                  <computeroutput>MouseIntegration</computeroutput>
+                  <literal>MouseIntegration</literal>
                 </para></entry>
               <entry><para>
@@ -4572,5 +4456,5 @@
             <row>
               <entry><para>
-                  <computeroutput>TypeCAD</computeroutput>
+                  <literal>TypeCAD</literal>
                 </para></entry>
               <entry><para>
@@ -4583,5 +4467,5 @@
             <row>
               <entry><para>
-                  <computeroutput>TypeCABS</computeroutput>
+                  <literal>TypeCABS</literal>
                 </para></entry>
               <entry><para>
@@ -4594,5 +4478,5 @@
             <row>
               <entry><para>
-                  <computeroutput>Pause</computeroutput>
+                  <literal>Pause</literal>
                 </para></entry>
               <entry><para>
@@ -4605,5 +4489,5 @@
             <row>
               <entry><para>
-                  <computeroutput>Reset</computeroutput>
+                  <literal>Reset</literal>
                 </para></entry>
               <entry><para>
@@ -4614,5 +4498,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SaveState</computeroutput>
+                  <literal>SaveState</literal>
                 </para></entry>
               <entry><para></para></entry>
@@ -4623,5 +4507,5 @@
             <row>
               <entry><para>
-                  <computeroutput>Shutdown</computeroutput>
+                  <literal>Shutdown</literal>
                 </para></entry>
               <entry><para>
@@ -4634,5 +4518,5 @@
             <row>
               <entry><para>
-                  <computeroutput>PowerOff</computeroutput>
+                  <literal>PowerOff</literal>
                 </para></entry>
               <entry><para></para></entry>
@@ -4643,5 +4527,5 @@
             <row>
               <entry><para>
-                  <computeroutput>Close</computeroutput>
+                  <literal>Close</literal>
                 </para></entry>
               <entry><para>
@@ -4654,5 +4538,5 @@
             <row>
               <entry><para>
-                  <computeroutput>FullscreenMode</computeroutput>
+                  <literal>FullscreenMode</literal>
                 </para></entry>
               <entry><para>
@@ -4665,5 +4549,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SeamlessMode</computeroutput>
+                  <literal>SeamlessMode</literal>
                 </para></entry>
               <entry><para>
@@ -4676,5 +4560,5 @@
             <row>
               <entry><para>
-                  <computeroutput>ScaleMode</computeroutput>
+                  <literal>ScaleMode</literal>
                 </para></entry>
               <entry><para>
@@ -4687,5 +4571,5 @@
             <row>
               <entry><para>
-                  <computeroutput>GuestAutoResize</computeroutput>
+                  <literal>GuestAutoResize</literal>
                 </para></entry>
               <entry><para>
@@ -4698,5 +4582,5 @@
             <row>
               <entry><para>
-                  <computeroutput>WindowAdjust</computeroutput>
+                  <literal>WindowAdjust</literal>
                 </para></entry>
               <entry><para>
@@ -4709,5 +4593,5 @@
             <row>
               <entry><para>
-                  <computeroutput>PopupMenu</computeroutput>
+                  <literal>PopupMenu</literal>
                 </para></entry>
               <entry><para>
@@ -4721,5 +4605,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SettingsDialog</computeroutput>
+                  <literal>SettingsDialog</literal>
                 </para></entry>
               <entry><para>
@@ -4732,5 +4616,5 @@
             <row>
               <entry><para>
-                  <computeroutput>InformationDialog</computeroutput>
+                  <literal>InformationDialog</literal>
                 </para></entry>
               <entry><para>
@@ -4743,5 +4627,5 @@
             <row>
               <entry><para>
-                  <computeroutput>NetworkAdaptersDialog</computeroutput>
+                  <literal>NetworkAdaptersDialog</literal>
                 </para></entry>
               <entry><para></para></entry>
@@ -4752,5 +4636,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SharedFoldersDialog</computeroutput>
+                  <literal>SharedFoldersDialog</literal>
                 </para></entry>
               <entry><para></para></entry>
@@ -4761,5 +4645,5 @@
             <row>
               <entry><para>
-                  <computeroutput>InstallGuestAdditions</computeroutput>
+                  <literal>InstallGuestAdditions</literal>
                 </para></entry>
               <entry><para>
@@ -4779,5 +4663,5 @@
       </para>
 
-<screen>VBoxManage setextradata global GUI/Input/MachineShortcuts "FullscreenMode=None,SeamlessMode=None"</screen>
+<screen>$ VBoxManage setextradata global GUI/Input/MachineShortcuts "FullscreenMode=None,SeamlessMode=None"</screen>
 
     </sect2>
@@ -4792,9 +4676,8 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" GUI/RestrictedCloseActions OPTION[,OPTION...]</screen>
-
-      <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> GUI/RestrictedCloseActions <replaceable>property</replaceable>[,<replaceable>property</replaceable>...]</screen>
+
+      <para>
+        <replaceable>property</replaceable> is one of the following:
       </para>
 
@@ -4803,5 +4686,5 @@
         <varlistentry>
           <term>
-            <computeroutput>SaveState</computeroutput>
+            <literal>SaveState</literal>
           </term>
 
@@ -4816,5 +4699,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Shutdown</computeroutput>
+            <literal>Shutdown</literal>
           </term>
 
@@ -4829,5 +4712,5 @@
         <varlistentry>
           <term>
-            <computeroutput>PowerOff</computeroutput>
+            <literal>PowerOff</literal>
           </term>
 
@@ -4841,5 +4724,5 @@
         <varlistentry>
           <term>
-            <computeroutput>PowerOffRestoringSnapshot</computeroutput>
+            <literal>PowerOffRestoringSnapshot</literal>
           </term>
 
@@ -4854,5 +4737,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Detach</computeroutput>
+            <literal>Detach</literal>
           </term>
 
@@ -4868,7 +4751,7 @@
 
       <para>
-        This is a per-VM setting. Any combination of the above is
-        allowed. If all options are specified, the VM cannot be shut
-        down at all.
+        This is a per-VM setting. You can specify any combination of
+        properties. If all properties are specified, the VM cannot be
+        shut down.
       </para>
 
@@ -4886,9 +4769,8 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" GUI/DefaultCloseAction ACTION</screen>
-
-      <para>
-        where <computeroutput>ACTION</computeroutput> is one of the
-        following keywords:
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> GUI/DefaultCloseAction <replaceable>action</replaceable></screen>
+
+      <para>
+        <replaceable>action</replaceable> is one of the following:
       </para>
 
@@ -4897,5 +4779,5 @@
         <varlistentry>
           <term>
-            <computeroutput>SaveState</computeroutput>
+            <literal>SaveState</literal>
           </term>
 
@@ -4909,5 +4791,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Shutdown</computeroutput>
+            <literal>Shutdown</literal>
           </term>
 
@@ -4922,5 +4804,5 @@
         <varlistentry>
           <term>
-            <computeroutput>PowerOff</computeroutput>
+            <literal>PowerOff</literal>
           </term>
 
@@ -4934,5 +4816,5 @@
         <varlistentry>
           <term>
-            <computeroutput>PowerOffRestoringSnapshot</computeroutput>
+            <literal>PowerOffRestoringSnapshot</literal>
           </term>
 
@@ -4947,5 +4829,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Detach</computeroutput>
+            <literal>Detach</literal>
           </term>
 
@@ -4960,7 +4842,7 @@
 
       <para>
-        This is a per-VM setting. Any combination of the above is
-        allowed. If all options are specified, the VM cannot be shut
-        down at all.
+        This is a per-VM setting. You can specify any combination of
+        properties. If all properties are specified, the VM cannot be
+        shut down.
       </para>
 
@@ -4982,9 +4864,8 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" GUI/GuruMeditationHandler MODE</screen>
-
-      <para>
-        where <computeroutput>MODE</computeroutput> is one of the
-        following keywords:
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> GUI/GuruMeditationHandler <replaceable>mode</replaceable></screen>
+
+      <para>
+        <replaceable>mode</replaceable> is one of the following:
       </para>
 
@@ -4993,5 +4874,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Default</computeroutput>
+            <literal>Default</literal>
           </term>
 
@@ -5006,5 +4887,5 @@
         <varlistentry>
           <term>
-            <computeroutput>PowerOff</computeroutput>
+            <literal>PowerOff</literal>
           </term>
 
@@ -5020,5 +4901,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Ignore</computeroutput>
+            <literal>Ignore</literal>
           </term>
 
@@ -5062,9 +4943,8 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" GUI/MouseCapturePolicy MODE</screen>
-
-      <para>
-        where <computeroutput>MODE</computeroutput> is one of the
-        following keywords:
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable> GUI/MouseCapturePolicy <replaceable>mode</replaceable></screen>
+
+      <para>
+        <replaceable>mode</replaceable> is one of the following:
       </para>
 
@@ -5073,5 +4953,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Default</computeroutput>
+            <literal>Default</literal>
           </term>
 
@@ -5085,5 +4965,5 @@
         <varlistentry>
           <term>
-            <computeroutput>HostComboOnly</computeroutput>
+            <literal>HostComboOnly</literal>
           </term>
 
@@ -5097,5 +4977,5 @@
         <varlistentry>
           <term>
-            <computeroutput>Disabled</computeroutput>
+            <literal>Disabled</literal>
           </term>
 
@@ -5146,16 +5026,15 @@
     <sect2 id="restrict-network-attachments">
 
-      <title>Removing Certain Modes of Networking from the GUI</title>
-
-      <para>
-       It is possible to remove  networking modes from
-       &product-name; GUI. To achieve this:
-      </para>
-
-<screen>VBoxManage setextradata global GUI/RestrictedNetworkAttachmentTypes OPTION[,OPTION...]</screen>
-
-      <para>
-        where <computeroutput>OPTION</computeroutput> is one of the
-        following keywords:
+      <title>Removing Certain Modes of Networking From the GUI</title>
+
+      <para>
+        It is possible to remove networking modes from &product-name;
+        GUI. To do this, use the following command:
+      </para>
+
+<screen>VBoxManage setextradata global GUI/RestrictedNetworkAttachmentTypes <replaceable>property</replaceable>[,<replaceable>property</replaceable>...]</screen>
+
+      <para>
+        <replaceable>property</replaceable> is one of the following:
       </para>
 
@@ -5164,5 +5043,5 @@
         <varlistentry>
           <term>
-            <computeroutput>NAT</computeroutput>
+            <literal>NAT</literal>
           </term>
 
@@ -5177,63 +5056,63 @@
         <varlistentry>
           <term>
-            <computeroutput>NATNetwork</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Remove the <emphasis role="bold">NAT network</emphasis> option
-              from the GUI.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>BridgetAdapter</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Remove the <emphasis role="bold">Bridged networking</emphasis> option
-              from the GUI.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>InternalNetwork</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Remove the <emphasis role="bold">Internal networking</emphasis> option
-              from the GUI.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>HostOnlyAdapter</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Remove the <emphasis role="bold">Host Only networking</emphasis> option
-              from the GUI.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>
-            <computeroutput>GenericDriver</computeroutput>
-          </term>
-
-          <listitem>
-            <para>
-              Remove the <emphasis role="bold">Generic networking</emphasis> option
-              from the GUI.
+            <literal>NATNetwork</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Remove the <emphasis role="bold">NAT network</emphasis>
+              option from the GUI.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>BridgedAdapter</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Remove the <emphasis role="bold">Bridged
+              networking</emphasis> option from the GUI.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>InternalNetwork</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Remove the <emphasis role="bold">Internal
+              networking</emphasis> option from the GUI.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>HostOnlyAdapter</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Remove the <emphasis role="bold">Host Only
+              networking</emphasis> option from the GUI.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>
+            <literal>GenericDriver</literal>
+          </term>
+
+          <listitem>
+            <para>
+              Remove the <emphasis role="bold">Generic
+              networking</emphasis> option from the GUI.
             </para>
           </listitem>
@@ -5242,14 +5121,14 @@
       </variablelist>
 
-
-      <para>
-        This is a global setting. Any combination of the above is
-        allowed. To restore the default behavior, use
+      <para>
+        This is a global setting. You can specify any combination of
+        properties. To restore the default behavior, use the following
+        command:
       </para>
 
 <screen>VBoxManage setextradata global GUI/RestrictedNetworkAttachmentTypes</screen>
 
-
     </sect2>
+
   </sect1>
 
@@ -5259,13 +5138,12 @@
 
     <para>
-      The &product-name; web service,
-      <computeroutput>vboxwebsrv</computeroutput>, is used for
-      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 &product-name; web service is never started
-      automatically as a result of a standard installation.
+      The &product-name; web service, <command>vboxwebsrv</command>, is
+      used for controlling &product-name; remotely. It is documented in
+      detail in the &product-name; Software Development Kit (SDK). See
+      <xref linkend="VirtualBoxAPI" />. Web service start scripts are
+      available for supported host operating systems. The following
+      sections describe how to use the scripts. The &product-name; web
+      service is never started automatically as a result of a standard
+      installation.
     </para>
 
@@ -5277,12 +5155,11 @@
         On Linux, the web service can be automatically started during
         host boot by adding appropriate parameters to the file
-        <computeroutput>/etc/default/virtualbox</computeroutput>. There
-        is one mandatory parameter,
-        <computeroutput>VBOXWEB_USER</computeroutput>, which must be set
-        to the user which will later start the VMs. The parameters in
-        the following table all start with the
-        <computeroutput>VBOXWEB_</computeroutput> prefix string. For
-        example: <computeroutput>VBOXWEB_HOST</computeroutput> and
-        <computeroutput>VBOXWEB_PORT</computeroutput>.
+        <filename>/etc/default/virtualbox</filename>. There is one
+        mandatory parameter, <literal>VBOXWEB_USER</literal>, which must
+        be set to the user which will later start the VMs. The
+        parameters in the following table all start with the
+        <literal>VBOXWEB_</literal> prefix string. For example:
+        <literal>VBOXWEB_HOST</literal> and
+        <literal>VBOXWEB_PORT</literal>.
       </para>
 
@@ -5306,5 +5183,5 @@
             <row>
               <entry><para>
-                  <computeroutput>USER</computeroutput>
+                  <literal>USER</literal>
                 </para></entry>
               <entry><para>
@@ -5315,5 +5192,5 @@
             <row>
               <entry><para>
-                  <computeroutput>HOST</computeroutput>
+                  <literal>HOST</literal>
                 </para></entry>
               <entry><para>
@@ -5326,5 +5203,5 @@
             <row>
               <entry><para>
-                  <computeroutput>PORT</computeroutput>
+                  <literal>PORT</literal>
                 </para></entry>
               <entry><para>
@@ -5337,5 +5214,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SSL_KEYFILE</computeroutput>
+                  <literal>SSL_KEYFILE</literal>
                 </para></entry>
               <entry><para>
@@ -5346,5 +5223,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SSL_PASSWORDFILE</computeroutput>
+                  <literal>SSL_PASSWORDFILE</literal>
                 </para></entry>
               <entry><para>
@@ -5355,5 +5232,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SSL_CACERT</computeroutput>
+                  <literal>SSL_CACERT</literal>
                 </para></entry>
               <entry><para>
@@ -5364,5 +5241,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SSL_CAPATH</computeroutput>
+                  <literal>SSL_CAPATH</literal>
                 </para></entry>
               <entry><para>
@@ -5373,5 +5250,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SSL_DHFILE</computeroutput>
+                  <literal>SSL_DHFILE</literal>
                 </para></entry>
               <entry><para>
@@ -5382,5 +5259,5 @@
             <row>
               <entry><para>
-                  <computeroutput>SSL_RANDFILE</computeroutput>
+                  <literal>SSL_RANDFILE</literal>
                 </para></entry>
               <entry><para>
@@ -5391,5 +5268,5 @@
             <row>
               <entry><para>
-                  <computeroutput>TIMEOUT</computeroutput>
+                  <literal>TIMEOUT</literal>
                 </para></entry>
               <entry><para>
@@ -5402,5 +5279,5 @@
             <row>
               <entry><para>
-                  <computeroutput>CHECK_INTERVAL</computeroutput>
+                  <literal>CHECK_INTERVAL</literal>
                 </para></entry>
               <entry><para>
@@ -5413,5 +5290,5 @@
             <row>
               <entry><para>
-                  <computeroutput>THREADS</computeroutput>
+                  <literal>THREADS</literal>
                 </para></entry>
               <entry><para>
@@ -5424,5 +5301,5 @@
             <row>
               <entry><para>
-                  <computeroutput>KEEPALIVE</computeroutput>
+                  <literal>KEEPALIVE</literal>
                 </para></entry>
               <entry><para>
@@ -5436,5 +5313,5 @@
             <row>
               <entry><para>
-                  <computeroutput>ROTATE</computeroutput>
+                  <literal>ROTATE</literal>
                 </para></entry>
               <entry><para>
@@ -5447,5 +5324,5 @@
             <row>
               <entry><para>
-                  <computeroutput>LOGSIZE</computeroutput>
+                  <literal>LOGSIZE</literal>
                 </para></entry>
               <entry><para>
@@ -5458,5 +5335,5 @@
             <row>
               <entry><para>
-                  <computeroutput>LOGINTERVAL</computeroutput>
+                  <literal>LOGINTERVAL</literal>
                 </para></entry>
               <entry><para>
@@ -5473,8 +5350,8 @@
 
       <para>
-        Setting the parameter
-        <computeroutput>SSL_KEYFILE</computeroutput> enables the SSL/TLS
-        support. Using encryption is strongly encouraged, as otherwise
-        everything, including passwords, is transferred in clear text.
+        Setting the parameter <literal>SSL_KEYFILE</literal> enables the
+        SSL/TLS support. Using encryption is strongly encouraged, as
+        otherwise everything, including passwords, is transferred in
+        clear text.
       </para>
 
@@ -5497,12 +5374,12 @@
 
       <para>
-        <xref linkend="table-websrv-config-params"/> showing the
+        The table in <xref linkend="vboxwebsrv-linux"/> showing the
         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
-        <computeroutput>config/ssl_keyfile</computeroutput>. If you make
-        any change, do not forget to run the following command to put
-        the changes into effect immediately:
+        <literal>config/</literal> has to be added. For example:
+        <literal>config/user</literal> or
+        <literal>config/ssl_keyfile</literal>. If you make any change,
+        do not forget to run the following command to put the changes
+        into effect immediately:
       </para>
 
@@ -5538,10 +5415,8 @@
         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
-        <computeroutput>Disabled</computeroutput> key from
-        <computeroutput>true</computeroutput> to
-        <computeroutput>false</computeroutput>. To manually start the
-        service use the following command:
+        <filename>$HOME/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist</filename>.
+        It can be enabled by changing the <literal>Disabled</literal>
+        key from <literal>true</literal> to <literal>false</literal>. To
+        manually start the service use the following command:
       </para>
 
@@ -5555,5 +5430,5 @@
       <para>
         <ulink
-      url="https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPSystemStartup/Chapters/CreatingLaunchdJobs.html">https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPSystemStartup/Chapters/CreatingLaunchdJobs.html</ulink>.
+      url="https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPSystemStartup/Chapters/CreatingLaunchdJobs.html" />.
       </para>
 
@@ -5568,7 +5443,7 @@
     <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:
+      <command>VBoxBalloonCtrl</command>, was renamed to VBoxWatchdog.
+      This service now incorporates the following host services that are
+      meant to be run in a server environment:
     </para>
 
@@ -5767,5 +5642,5 @@
         <listitem>
           <para>
-            <computeroutput>none</computeroutput>. This has no effect.
+            <literal>none</literal>. This has no effect.
           </para>
         </listitem>
@@ -5773,6 +5648,5 @@
         <listitem>
           <para>
-            <computeroutput>pause</computeroutput>. Pauses the execution
-            of a VM.
+            <literal>pause</literal>. Pauses the execution of a VM.
           </para>
         </listitem>
@@ -5780,7 +5654,7 @@
         <listitem>
           <para>
-            <computeroutput>poweroff</computeroutput>. Shuts down the VM
-            by pressing the virtual power button. The VM will not have
-            the chance of saving any data or veto the shutdown process.
+            <literal>poweroff</literal>. Shuts down the VM by pressing
+            the virtual power button. The VM will not have the chance of
+            saving any data or veto the shutdown process.
           </para>
         </listitem>
@@ -5788,7 +5662,7 @@
         <listitem>
           <para>
-            <computeroutput>save</computeroutput>. Saves the current
-            machine state and powers off the VM afterwards. If saving
-            the machine state fails the VM will be paused.
+            <literal>save</literal>. Saves the current machine state and
+            powers off the VM afterwards. If saving the machine state
+            fails the VM will be paused.
           </para>
         </listitem>
@@ -5796,9 +5670,8 @@
         <listitem>
           <para>
-            <computeroutput>shutdown</computeroutput>. Shuts down the VM
-            in a gentle way by sending an
-            <computeroutput>ACPI</computeroutput> shutdown event to the
-            VM's operating system. The OS then has the chance of doing a
-            clean shutdown.
+            <literal>shutdown</literal>. Shuts down the VM in a gentle
+            way by sending an <literal>ACPI</literal> shutdown event to
+            the VM's operating system. The OS then has the chance of
+            doing a clean shutdown.
           </para>
         </listitem>
@@ -5815,5 +5688,5 @@
         For more advanced options and parameters like verbose logging
         check the built-in command line help accessible with
-        <computeroutput>--help</computeroutput>.
+        <option>--help</option>.
       </para>
 
@@ -5827,21 +5700,18 @@
         On Linux, the watchdog service can be automatically started
         during host boot by adding appropriate parameters to the file
-        <computeroutput>/etc/default/virtualbox</computeroutput>. There
-        is one mandatory parameter,
-        <computeroutput>VBOXWATCHDOG_USER</computeroutput>, which must
-        be set to the user which will later start the VMs. For backward
-        compatibility you can also specify
-        <computeroutput>VBOXBALLOONCTRL_USER</computeroutput>.
+        <filename>/etc/default/virtualbox</filename>. There is one
+        mandatory parameter, <literal>VBOXWATCHDOG_USER</literal>, which
+        must be set to the user which will later start the VMs. For
+        backward compatibility you can also specify
+        <literal>VBOXBALLOONCTRL_USER</literal>.
       </para>
 
       <para>
         The parameters in the following table all start with the
-        <computeroutput>VBOXWATCHDOG_</computeroutput> prefix string.
-        For example:
-        <computeroutput>VBOXWATCHDOG_BALLOON_INTERVAL</computeroutput>
-        and <computeroutput>VBOXWATCHDOG_LOGSIZE</computeroutput>.
-        Legacy parameters such as
-        <computeroutput>VBOXBALLOONCTRL_INTERVAL</computeroutput> can
-        still be used.
+        <literal>VBOXWATCHDOG_</literal> prefix string. For example:
+        <literal>VBOXWATCHDOG_BALLOON_INTERVAL</literal> and
+        <literal>VBOXWATCHDOG_LOGSIZE</literal>. Legacy parameters such
+        as <literal>VBOXBALLOONCTRL_INTERVAL</literal> can still be
+        used.
       </para>
 
@@ -5865,5 +5735,5 @@
             <row>
               <entry><para>
-                  <computeroutput>USER</computeroutput>
+                  <literal>USER</literal>
                 </para></entry>
               <entry><para>
@@ -5874,5 +5744,5 @@
             <row>
               <entry><para>
-                  <computeroutput>ROTATE</computeroutput>
+                  <literal>ROTATE</literal>
                 </para></entry>
               <entry><para>
@@ -5885,5 +5755,5 @@
             <row>
               <entry><para>
-                  <computeroutput>LOGSIZE</computeroutput>
+                  <literal>LOGSIZE</literal>
                 </para></entry>
               <entry><para>
@@ -5896,5 +5766,5 @@
             <row>
               <entry><para>
-                  <computeroutput>LOGINTERVAL</computeroutput>
+                  <literal>LOGINTERVAL</literal>
                 </para></entry>
               <entry><para>
@@ -5908,5 +5778,5 @@
             <row>
               <entry><para>
-                  <computeroutput>BALLOON_INTERVAL</computeroutput>
+                  <literal>BALLOON_INTERVAL</literal>
                 </para></entry>
               <entry><para>
@@ -5920,5 +5790,5 @@
             <row>
               <entry><para>
-                  <computeroutput>BALLOON_INCREMENT</computeroutput>
+                  <literal>BALLOON_INCREMENT</literal>
                 </para></entry>
               <entry><para>
@@ -5931,5 +5801,5 @@
             <row>
               <entry><para>
-                  <computeroutput>BALLOON_DECREMENT</computeroutput>
+                  <literal>BALLOON_DECREMENT</literal>
                 </para></entry>
               <entry><para>
@@ -5942,5 +5812,5 @@
             <row>
               <entry><para>
-                  <computeroutput>BALLOON_LOWERLIMIT</computeroutput>
+                  <literal>BALLOON_LOWERLIMIT</literal>
                 </para></entry>
               <entry><para>
@@ -5953,5 +5823,5 @@
             <row>
               <entry><para>
-                  <computeroutput>BALLOON_SAFETYMARGIN</computeroutput>
+                  <literal>BALLOON_SAFETYMARGIN</literal>
                 </para></entry>
               <entry><para>
@@ -5988,10 +5858,9 @@
         <xref linkend="table-vboxwatchdog-config-params"/> 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
-        <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:
+        lowercase and a prefix of <literal>config/</literal> has to be
+        added. For example: <literal>config/user</literal> or
+        <literal>config/balloon_safetymargin</literal>. If you made any
+        change, do not forget to run the following command to put the
+        changes into effect immediately:
       </para>
 
@@ -6061,5 +5930,5 @@
     </para>
 
-<screen>VBoxManage modifyvm "VM name" --vrdeproperty VNCPassword=secret</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty VNCPassword=secret</screen>
 
     <para>
@@ -6095,26 +5964,23 @@
       <para>
         On Linux, the autostart service is activated by setting two
-        variables in
-        <computeroutput>/etc/default/virtualbox</computeroutput>. The
-        first one is <computeroutput>VBOXAUTOSTART_DB</computeroutput>
-        which contains an absolute path to the autostart database
-        directory. The directory should have write access for every user
-        who should be able to start virtual machines automatically.
-        Furthermore the directory should have the sticky bit set. The
-        second variable is
-        <computeroutput>VBOXAUTOSTART_CONFIG</computeroutput> which
-        points the service to the autostart configuration file which is
-        used during boot to determine whether to allow individual users
-        to start a VM automatically and configure startup delays. The
-        configuration file can be placed in
-        <computeroutput>/etc/vbox</computeroutput> and contains several
-        options. One is <computeroutput>default_policy</computeroutput>
-        which controls whether the autostart service allows or denies to
-        start a VM for users which are not in the exception list. The
-        exception list starts with
-        <computeroutput>exception_list</computeroutput> and contains a
-        comma separated list with usernames. Furthermore a separate
-        startup delay can be configured for every user to avoid
-        overloading the host. A sample configuration is given below:
+        variables in <filename>/etc/default/virtualbox</filename>. The
+        first one is <literal>VBOXAUTOSTART_DB</literal> which contains
+        an absolute path to the autostart database directory. The
+        directory should have write access for every user who should be
+        able to start virtual machines automatically. Furthermore the
+        directory should have the sticky bit set. The second variable is
+        <literal>VBOXAUTOSTART_CONFIG</literal> which points the service
+        to the autostart configuration file which is used during boot to
+        determine whether to allow individual users to start a VM
+        automatically and configure startup delays. The configuration
+        file can be placed in <filename>/etc/vbox</filename> and
+        contains several options. One is
+        <literal>default_policy</literal> which controls whether the
+        autostart service allows or denies to start a VM for users which
+        are not in the exception list. The exception list starts with
+        <literal>exception_list</literal> and contains a comma separated
+        list with usernames. Furthermore a separate startup delay can be
+        configured for every user to avoid overloading the host. A
+        sample configuration is given below:
       </para>
 
@@ -6135,13 +6001,13 @@
     allow = false
 }
-      </screen>
-
-      <para>
-        Every user who wants to enable autostart for individual machines
-        has to set the path to the autostart database directory with the
+</screen>
+
+      <para>
+        Any user who wants to enable autostart for individual machines
+        must set the path to the autostart database directory with the
         following command:
       </para>
 
-<screen>VBoxManage setproperty autostartdbpath &lt;Autostart directory&gt;</screen>
+<screen>VBoxManage setproperty autostartdbpath <replaceable>autostart-directory</replaceable></screen>
 
     </sect2>
@@ -6153,11 +6019,11 @@
       <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 \
+        integrated into the SMF framework. To enable it you must 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>
 
@@ -6167,9 +6033,9 @@
       </para>
 
-<screen>svcadm enable svc:/application/virtualbox/autostart:default</screen>
-
-      <para>
-        For more information about SMF, please refer to the Oracle
-        Solaris documentation.
+<screen># svcadm enable svc:/application/virtualbox/autostart:default</screen>
+
+      <para>
+        For more information about SMF, see the Oracle Solaris
+        documentation.
       </para>
 
@@ -6183,12 +6049,11 @@
         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>.
+        <filename>/Applications/VirtualBox.app/Contents/MacOS/org.virtualbox.vboxautostart.plist</filename>.
         To enable the service copy the file to
-        <computeroutput>/Library/LaunchDaemons</computeroutput> and
-        change the <computeroutput>Disabled</computeroutput> key from
-        <computeroutput>true</computeroutput> to
-        <computeroutput>false</computeroutput>. Furthermore replace the
-        second parameter to an existing configuration file which has the
-        same format as on Linux, see <xref linkend="autostart-linux" />.
+        <filename>/Library/LaunchDaemons</filename> and change the
+        <literal>Disabled</literal> key from <literal>true</literal> to
+        <literal>false</literal>. Furthermore replace the second
+        parameter to an existing configuration file which has the same
+        format as on Linux, see <xref linkend="autostart-linux" />.
       </para>
 
@@ -6197,5 +6062,5 @@
       </para>
 
-<screen>launchctl load /Library/LaunchDaemons/org.virtualbox.vboxautostart.plist</screen>
+<screen># launchctl load /Library/LaunchDaemons/org.virtualbox.vboxautostart.plist</screen>
 
       <para>
@@ -6206,5 +6071,5 @@
       <para>
         <ulink
-      url="http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPSystemStartup/BPSystemStartup.html">http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPSystemStartup/BPSystemStartup.html</ulink>.
+      url="http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPSystemStartup/BPSystemStartup.html" />.
       </para>
 
@@ -6213,52 +6078,45 @@
     <sect2 id="autostart-windows">
 
-      <title>Windows: Starting the Autostart Service With windows service</title>
-
-      <para>
-        On Windows, the autostarting is implemented as Windows service.
-        The service is installed for every user with her/his own credentials.
-        Before installing any autostart services on a system you have to define
-        the <computeroutput>VBOXAUTOSTART_CONFIG</computeroutput> environment
-        variable in the system variables with the path to the config file.
-        The config file has the same format as on Linux,
-        see <xref linkend="autostart-linux" />, except the user name
-        can be specified using following formats: "user", "domain\user",
-        ".\user" and "user@domain".
-      </para>
-
-      <para>
-        To activate the autostart ability for particular user a member of
+      <title>Windows: Starting the Autostart Service With a Windows service</title>
+
+      <para>
+        On Windows, autostarting is implemented as a Windows service.
+        The service is installed for every user with their own
+        credentials. Before installing any autostart services on a
+        system you first have to define the
+        <literal>VBOXAUTOSTART_CONFIG</literal> environment variable in
+        the system variables with the path to the autostart
+        configuration file. The configuration file has the same format
+        as on Linux, see <xref linkend="autostart-linux" />, except the
+        user name can be specified using the following formats: "user",
+        "domain\user", ".\user" and "user@domain".
+      </para>
+
+      <para>
+        To enable autostarting for a particular user, a member of the
         administrators group must run the following command:
       </para>
 
-      <screen>VBoxAutostartSvc install --user=&lt;user&gt; [--password-file=&lt;password_file&gt;]</screen>
-
-      <para>
-        The password file should contain the password followed by a line break.
-        The rest of the file is ignored. The user will be asked for a password
-        if the password file is not specified.
-      </para>
-
-      <para>
-        To remove the autostart ability for particular user a member of
+<screen>VBoxAutostartSvc install --user=&lt;user&gt; [--password-file=&lt;password_file&gt;]</screen>
+
+      <para>
+        The password file should contain the password followed by a line
+        break. The rest of the file is ignored. The user will be asked
+        for a password if the password file is not specified.
+      </para>
+
+      <para>
+        To disable autostarting for particular user, a member of the
         administrators group must run the following command:
       </para>
 
-      <screen>VBoxAutostartSvc delete --user=&lt;user&gt;</screen>
-
-      <para>
-        The user can be specified for both commands using following formats:
-        "user", "domain\user", ".\user" and "user@domain"
-      </para>
-
-      <para>
-        Note:
-      </para>
-
-      <para>
-        If user has changed his password a member of administrators group
-        must either reinstall the service or change the service credentials
-        using windows service manager. The autostart service can not be
-        installed for users with empty passwords due to Windows security policies.
+<screen>VBoxAutostartSvc delete --user=&lt;user&gt;</screen>
+
+      <para>
+        If a user has changed their password then a member of the
+        administrators group must either reinstall the service or change
+        the service credentials using Windows Service Manager. Due to
+        Windows security policies, the autostart service cannot be
+        installed for users with empty passwords.
       </para>
 
@@ -6285,12 +6143,11 @@
     </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal2/SilentReconfigureWhilePaused" 1</screen>
-
-    <para>
-      Storage attachments can be reconfigured while the VM is paused
-      afterwards using:
-    </para>
-
-<screen>VBoxManage storageattach ...</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal2/SilentReconfigureWhilePaused" 1</screen>
+
+    <para>
+      You can reconfigure storage attachments later while the VM is
+      paused by using the <command>VBoxManage storageattach</command>
+      command.
+    </para>
 
   </sect1>
@@ -6353,5 +6210,5 @@
         </para>
 
-<screen>VBoxManage setextradata global "VBoxInternal2/SavestateOnBatteryLow" 0</screen>
+<screen>$ VBoxManage setextradata global "VBoxInternal2/SavestateOnBatteryLow" 0</screen>
 
         <para>
@@ -6362,6 +6219,6 @@
         </para>
 
-<screen>VBoxManage setextradata global "VBoxInternal2/SavestateOnBatteryLow" 1
-VBoxManage setextradata "foo" "VBoxInternal2/SavestateOnBatteryLow" 0</screen>
+<screen>$ VBoxManage setextradata global "VBoxInternal2/SavestateOnBatteryLow" 1
+$ VBoxManage setextradata "foo" "VBoxInternal2/SavestateOnBatteryLow" 0</screen>
 
         <para>
@@ -6386,6 +6243,8 @@
     </para>
 
-<screen>VBoxManage setextradata "VM name" VBoxInternal/CPUM/IsaExts/SSE4.1 0
-VBoxManage setextradata "VM name" VBoxInternal/CPUM/IsaExts/SSE4.2 0</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/CPUM/IsaExts/SSE4.1 0
+$ VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/CPUM/IsaExts/SSE4.2 0</screen>
 
     <para>
@@ -6407,8 +6266,8 @@
     </para>
 
-<screen>VBoxManage setextradata "VM name" GUI/HidLedsSync 0</screen>
-
-    <para>
-      This is a per-VM setting, which is enabled by default.
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> GUI/HidLedsSync 0</screen>
+
+    <para>
+      This is a per-VM setting that is enabled by default.
     </para>
 
@@ -6428,5 +6287,5 @@
     </para>
 
-<screen>VBoxManage controlvm "VM name" usbattach "device uuid|address" --capturefile "filename"</screen>
+<screen>VBoxManage controlvm <replaceable>VM-name</replaceable> usbattach <replaceable>device uuid</replaceable>|<replaceable>address</replaceable> --capturefile <replaceable>filename</replaceable></screen>
 
     <para>
@@ -6435,13 +6294,13 @@
     </para>
 
-<screen>VBoxManage setextradata "VM name" \
-  VBoxInternal/Devices/usb-ehci/0/LUN#0/Config/CaptureFilename "filename"</screen>
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/usb-ehci/0/LUN#0/Config/CaptureFilename <replaceable>filename</replaceable></screen>
 
     <para>
       The command above enables capturing on the root hub attached to
       the EHCI controller. To enable it for the OHCI or XHCI controller
-      replace <computeroutput>usb-ehci</computeroutput> with
-      <computeroutput>usb-ohci</computeroutput> or
-      <computeroutput>usb-xhci</computeroutput> respectively.
+      replace <literal>usb-ehci</literal> with
+      <literal>usb-ohci</literal> or <literal>usb-xhci</literal>,
+      respectively.
     </para>
 
@@ -6471,6 +6330,6 @@
     </para>
 
-<screen>VBoxManage setextradata "VM name"\
-  VBoxInternal/Devices/VMMDev/0/Config/HeartbeatInterval 2000000000</screen>
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/VMMDev/0/Config/HeartbeatInterval 2000000000</screen>
 
     <para>
@@ -6482,6 +6341,6 @@
     </para>
 
-<screen>VBoxManage setextradata "VM name" \
-  VBoxInternal/Devices/VMMDev/0/Config/HeartbeatTimeout 4000000000</screen>
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable> \
+VBoxInternal/Devices/VMMDev/0/Config/HeartbeatTimeout 4000000000</screen>
 
     <para>
@@ -6618,6 +6477,6 @@
       </para>
 
-<screen>VBoxManage encryptmedium "uuid|filename" \
-  --newpassword "file|-" --cipher "cipher id" --newpasswordid "id"</screen>
+<screen>VBoxManage encryptmedium <replaceable>uuid</replaceable>|<replaceable>filename</replaceable> \
+--newpassword <replaceable>filename</replaceable>|- --cipher <replaceable>cipher-ID</replaceable> --newpasswordid "<replaceable>ID</replaceable></screen>
 
       <para>
@@ -6630,10 +6489,9 @@
       <para>
         The cipher parameter specifies the cipher to use for encryption
-        and can be either
-        <computeroutput>AES-XTS128-PLAIN64</computeroutput> or
-        <computeroutput>AES-XTS256-PLAIN64</computeroutput>. The
-        specified password identifier can be freely chosen by the user
-        and is used for correct identification when supplying multiple
-        passwords during VM startup.
+        and can be either <literal>AES-XTS128-PLAIN64</literal> or
+        <literal>AES-XTS256-PLAIN64</literal>. The specified password
+        identifier can be freely chosen by the user and is used for
+        correct identification when supplying multiple passwords during
+        VM startup.
       </para>
 
@@ -6660,17 +6518,17 @@
       </para>
 
-<screen>VBoxManage controlvm "uuid|vmname" addencpassword "id" "password" [--removeonsuspend "yes|no"]</screen>
-
-      <para>
-        The <computeroutput>id</computeroutput> parameter must be the
-        same as the password identifier supplied when encrypting the
-        images. <computeroutput>password</computeroutput> is the
-        password used when encrypting the images. The user can
-        optionally specify <computeroutput>--removeonsuspend
-        "yes|no"</computeroutput> to specify whether to remove the
-        password from VM memory when the VM is suspended. Before the VM
-        can be resumed, the user needs to supply the passwords again.
-        This is useful when a VM is suspended by a host suspend event
-        and the user does not want the password to remain in memory.
+<screen>VBoxManage controlvm <replaceable>uuid</replaceable>|<replaceable>vmname</replaceable> addencpassword <replaceable>ID</replaceable> <replaceable>password</replaceable> [--removeonsuspend yes|no]</screen>
+
+      <para>
+        <replaceable>ID</replaceable> must be the same as the password
+        identifier supplied when encrypting the images.
+        <replaceable>password</replaceable> is the password used when
+        encrypting the images. Optionally, you can specify
+        <option>--removeonsuspend yes|no</option> to specify whether to
+        remove the password from VM memory when the VM is suspended.
+        Before the VM can be resumed, the user needs to supply the
+        passwords again. This is useful when a VM is suspended by a host
+        suspend event and the user does not want the password to remain
+        in memory.
       </para>
 
@@ -6688,5 +6546,5 @@
       </para>
 
-<screen>VBoxManage encryptmedium "uuid|filename" --oldpassword "file|-"</screen>
+<screen>VBoxManage encryptmedium <replaceable>uuid</replaceable>|<replaceable>filename</replaceable> --oldpassword <replaceable>file</replaceable>|-</screen>
 
       <para>
@@ -6705,6 +6563,6 @@
 
     <para>
-      In this section we cover debugging of guest operating systems
-      using interfaces supported by paravirtualization providers.
+      This section covers debugging of guest operating systems using
+      interfaces supported by paravirtualization providers.
     </para>
 
@@ -6738,21 +6596,19 @@
           <para>
             Key:
-            <emphasis role="bold"><computeroutput>enabled</computeroutput></emphasis>
+            <emphasis role="bold"><literal>enabled</literal></emphasis>
           </para>
 
           <para>
-            Value: <computeroutput>0</computeroutput> or
-            <computeroutput>1</computeroutput>
+            Value: <literal>0</literal> or <literal>1</literal>
           </para>
 
           <para>
-            Default: <computeroutput>0</computeroutput>
+            Default: <literal>0</literal>
           </para>
 
           <para>
-            Specify <computeroutput>1</computeroutput> to enable the
-            Hyper-V debug interface. If this key-value pair is not
-            specified or the value is not
-            <computeroutput>1</computeroutput>, the Hyper-V debug
+            Specify <literal>1</literal> to enable the Hyper-V debug
+            interface. If this key-value pair is not specified or the
+            value is not <literal>1</literal>, the Hyper-V debug
             interface is disabled regardless of other key-value pairs
             being present.
@@ -6763,5 +6619,5 @@
           <para>
             Key:
-            <emphasis role="bold"><computeroutput>address</computeroutput></emphasis>
+            <emphasis role="bold"><literal>address</literal></emphasis>
           </para>
 
@@ -6783,5 +6639,5 @@
           <para>
             Key:
-            <emphasis role="bold"><computeroutput>port</computeroutput></emphasis>
+            <emphasis role="bold"><literal>port</literal></emphasis>
           </para>
 
@@ -6803,5 +6659,5 @@
           <para>
             Key:
-            <emphasis role="bold"><computeroutput>vendor</computeroutput></emphasis>
+            <emphasis role="bold"><literal>vendor</literal></emphasis>
           </para>
 
@@ -6812,7 +6668,6 @@
 
           <para>
-            Default: When debugging is enabled:
-            <computeroutput>Microsoft Hv</computeroutput>, otherwise:
-            <computeroutput>VBoxVBoxVBox</computeroutput>
+            Default: When debugging is enabled: <literal>Microsoft
+            Hv</literal>, otherwise: <literal>VBoxVBoxVBox</literal>
           </para>
 
@@ -6827,15 +6682,14 @@
           <para>
             Key:
-            <emphasis role="bold"><computeroutput>hypercallinterface</computeroutput>
+            <emphasis role="bold"><literal>hypercallinterface</literal>
             </emphasis>
           </para>
 
           <para>
-            Value: <computeroutput>0</computeroutput> or
-            <computeroutput>1</computeroutput>
+            Value: <literal>0</literal> or <literal>1</literal>
           </para>
 
           <para>
-            Default: <computeroutput>0</computeroutput>
+            Default: <literal>0</literal>
           </para>
 
@@ -6849,18 +6703,15 @@
         <listitem>
           <para>
-            Key:
-            <emphasis role="bold"><computeroutput>vsinterface</computeroutput>
+            Key: <emphasis role="bold"><literal>vsinterface</literal>
             </emphasis>
           </para>
 
           <para>
-            Value: <computeroutput>0</computeroutput> or
-            <computeroutput>1</computeroutput>
+            Value: <literal>0</literal> or <literal>1</literal>
           </para>
 
           <para>
-            Default: When debugging is enabled,
-            <computeroutput>1</computeroutput>, otherwise
-            <computeroutput>0</computeroutput>
+            Default: When debugging is enabled, <literal>1</literal>,
+            otherwise <literal>0</literal>
           </para>
 
@@ -6913,5 +6764,5 @@
             </para>
 
-<screen>VBoxManage showvminfo "VM name"</screen>
+<screen>$ VBoxManage showvminfo <replaceable>VM-name</replaceable></screen>
           </listitem>
 
@@ -6929,17 +6780,16 @@
               debug support, Windows 7 and Vista do not. To use Hyper-V
               debugging with a Windows 7 or Vista guest, copy the file
-              <computeroutput>kdvm.dll</computeroutput> from a Windows
-              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.
-              Make sure you copy the 32-bit or 64-bit version of the DLL
-              which matches your guest OS.
+              <filename>kdvm.dll</filename> from a Windows 8.0
+              installation. This file is typically located in
+              <filename>C:\Windows\System32</filename>. Copy it to the
+              same location in your Windows 7/Vista guest. Make sure you
+              copy the 32-bit or 64-bit version of the DLL 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.
+                Only Windows 8.0 ships <filename>kdvm.dll</filename>.
+                Windows 8.1 and newer Windows versions do not.
               </para>
             </note>
@@ -6966,5 +6816,5 @@
             </para>
 
-<screen>VBoxManage modifyvm "VM name" --paravirtdebug "enabled=1"</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --paravirtdebug "enabled=1"</screen>
 
             <para>
@@ -6975,5 +6825,6 @@
             </para>
 
-<screen>VBoxManage modifyvm "VM name" --paravirtdebug "enabled=1,address=192.168.32.1,port=55000"</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> \
+--paravirtdebug "enabled=1,address=192.168.32.1,port=55000"</screen>
 
             <para>
@@ -7071,15 +6922,13 @@
               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
-              the UDP port is not blocked by a firewall or other
-              security software.
+              <literal>paravirtdebug</literal> options. If you did not
+              specify any, leave it as 50000. Ensure that the UDP port
+              is not blocked by a firewall or other security software.
             </para>
 
             <para>
               In the <emphasis role="bold">Key</emphasis> field, enter
-              <computeroutput>1.2.3.4</computeroutput> or the encryption
-              key from the <computeroutput>bcdedit</computeroutput>
-              command in your Windows guest.
+              <literal>1.2.3.4</literal> or the encryption key from the
+              <command>bcdedit</command> command in your Windows guest.
             </para>
 
@@ -7167,5 +7016,5 @@
               </para></entry>
             <entry><para>
-                <computeroutput>/dev/input/by-path/platform-pcspkr-event-spkr</computeroutput>
+                <filename>/dev/input/by-path/platform-pcspkr-event-spkr</filename>
               </para></entry>
             <entry><para>
@@ -7177,5 +7026,5 @@
                 2
               </para></entry>
-            <entry><computeroutput>/dev/tty</computeroutput></entry>
+            <entry><filename>/dev/tty</filename></entry>
             <entry><para>
                 Uses the terminal association of the VM process. VM
@@ -7188,11 +7037,10 @@
               </para></entry>
             <entry><para>
-                <computeroutput>/dev/tty0</computeroutput> or
-                <computeroutput>/dev/vc/0</computeroutput>
+                <filename>/dev/tty0</filename> or
+                <filename>/dev/vc/0</filename>
               </para></entry>
             <entry><para>
-                Can only be used by user
-                <computeroutput>root</computeroutput> or users with
-                <computeroutput>cap_sys_tty_config</computeroutput>
+                Can only be used by user <literal>root</literal> or
+                users with <literal>cap_sys_tty_config</literal>
                 capability.
               </para></entry>
@@ -7214,5 +7062,5 @@
               </para></entry>
             <entry><para>
-                <computeroutput>/dev/tty</computeroutput>
+                <filename>/dev/tty</filename>
               </para></entry>
             <entry><para>
@@ -7251,20 +7099,18 @@
     </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
-      take effect when the VM is started next. It is safe to enable PC
-      speaker passthrough on all host OSes. It will only have an effect
-      on Linux.
-    </para>
-
-    <para>
-      The VM log file, <computeroutput>VBox.log</computeroutput>, will
-      contain lines with the prefix <computeroutput>PIT:
-      speaker:</computeroutput> showing the PC speaker passthrough setup
-      activities. It gives hints which device it picked or why it
-      failed.
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/Devices/i8254/0/Config/PassthroughSpeaker" <replaceable>N</replaceable></screen>
+
+    <para>
+      Replace <replaceable>N</replaceable> with the code representing
+      the case you want to use. Changing this setting takes effect when
+      you next start the VM. It is safe to enable PC speaker passthrough
+      on all host OSes. It will only have an effect on Linux.
+    </para>
+
+    <para>
+      The VM log file, <filename>VBox.log</filename>, contains lines
+      with the prefix <literal>PIT: speaker:</literal> showing the PC
+      speaker passthrough setup activities. It gives hints which device
+      it picked or why it failed.
     </para>
 
@@ -7273,14 +7119,13 @@
       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, such as by referring to
-      your distribution's documentation. Since there are countless Linux
-      distribution variants, we can only give the general hints that
-      there is often a way to give the X11 session user access to
-      additional devices, or you need to find a working solution using a
-      udev configuration file. If everything fails you might try setting
-      the permissions using a script which is run late enough in the
-      host system startup.
+      most of them can only be accessed by user <literal>root</literal>.
+      You should follow the 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 there is often a way to give the X11
+      session user access to additional devices, or you need to find a
+      working solution using a udev configuration file. If everything
+      fails you might try setting the permissions using a script which
+      is run late enough in the host system startup.
     </para>
 
@@ -7322,10 +7167,10 @@
 
     <para>
-      To enable support for passing through USB/IP devices, the device
-      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>
+      To enable support for passing through USB/IP devices, use the
+      following command to add the device server that exports the
+      devices:
+    </para>
+
+<screen>VBoxManage usbdevsource add <replaceable>unique-name</replaceable> --backend <replaceable>USB-IP</replaceable> --address <replaceable>device-server</replaceable>[:<replaceable>port</replaceable>]</screen>
 
     <para>
@@ -7340,5 +7185,5 @@
     </para>
 
-<screen>VBoxManage usbdevsource remove "Unique name"</screen>
+<screen>$ VBoxManage usbdevsource remove <replaceable>unique-name</replaceable></screen>
 
     <sect2 id="usbip-setup-server">
@@ -7349,15 +7194,13 @@
         This section gives a brief overview on how to set up a Linux
         based system to act as a USB device server. The system on the
-        server requires that the
-        <computeroutput>usbip-core.ko</computeroutput> and
-        <computeroutput>usbip-host.ko</computeroutput> kernel drivers
-        are available, and that the USB/IP tools package is installed.
-        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
-        the required tools:
-      </para>
-
-<screen>apt-get install usbip-utils</screen>
+        server requires that the <filename>usbip-core.ko</filename> and
+        <filename>usbip-host.ko</filename> kernel drivers are available,
+        and that the USB/IP tools package is installed. The particular
+        installation method for the necessary tools depends on which
+        distribution is used. For example, for Debian based systems, use
+        the following command to install the required tools:
+      </para>
+
+<screen>$ apt-get install usbip-utils</screen>
 
       <para>
@@ -7385,12 +7228,11 @@
       <para>
         If everything is installed, the USB/IP server needs to be
-        started as <computeroutput>root</computeroutput> using the
-        following command:
-      </para>
-
-<screen>usbipd -D</screen>
-
-      <para>
-        Refer to the documentation for the installed distribution to
+        started as <literal>root</literal> using the following command:
+      </para>
+
+<screen># usbipd -D</screen>
+
+      <para>
+        See the documentation for the installed distribution to
         determine how to start the service when the system boots.
       </para>
@@ -7402,5 +7244,5 @@
       </para>
 
-<screen>usbip bind -b "bus identifier"</screen>
+<screen># usbip bind -b "bus identifier"</screen>
 
       <para>
@@ -7408,5 +7250,5 @@
       </para>
 
-<screen>usbip bind -b 4-2</screen>
+<screen># usbip bind -b 4-2</screen>
 
     </sect2>
@@ -7449,6 +7291,6 @@
     <note>
       <para>
-        When using this feature, you might experience significant
-        &product-name; performance degradation on some host systems.
+        When using this feature, some host systems might experience
+        significant &product-name; performance degradation.
       </para>
     </note>
@@ -7461,10 +7303,10 @@
 
     <para>
-      &product-name; supports <emphasis>nested virtualization</emphasis>.
-      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;, Oracle VM Server or KVM, on
-      a &product-name; guest. You can then create and run VMs within the
-      guest VM.
+      &product-name; supports <emphasis>nested
+      virtualization</emphasis>. 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;, Oracle VM
+      Server or KVM, on an &product-name; guest. You can then create and
+      run VMs within the guest VM.
     </para>
 
Index: /trunk/doc/manual/en_US/user_BasicConcepts.xml
===================================================================
--- /trunk/doc/manual/en_US/user_BasicConcepts.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_BasicConcepts.xml	(revision 82350)
@@ -458,45 +458,4 @@
 
       <title>64-bit Guests</title>
-
-      <para>
-        &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>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            You need a 64-bit processor that has hardware virtualization
-            support. See <xref linkend="hwvirt" />.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            You must enable hardware virtualization for the particular
-            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>
-
-      </itemizedlist>
 
       <warning>
@@ -515,7 +474,7 @@
       <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" />.
+        of the VirtualBox Manager, &product-name; automatically uses the
+        correct settings for each selected 64-bit OS type. See
+        <xref linkend="gui-createvm" />.
       </para>
 
@@ -868,8 +827,7 @@
       <listitem>
         <para>
-          <emphasis role="bold">Input devices.</emphasis> By default,
-          &product-name; emulates a standard PS/2 keyboard and mouse.
-          These devices are supported by almost all past and present
-          OSes.
+          <emphasis role="bold">Input devices.</emphasis> &product-name;
+          can emulate a standard PS/2 keyboard and mouse. These devices
+          are supported by most guest OSes.
         </para>
 
@@ -877,17 +835,20 @@
           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>
-      </listitem>
-
-      <listitem>
-        <para>
-          <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).
+          described in <xref linkend="keyb_mouse_normal" />.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Graphics.</emphasis> The default
+          &product-name; graphics device for Windows guests is an SVGA
+          device. For Linux guests, the default graphics device emulates
+          a VMware SVGA graphics device. See
+          <xref linkend="settings-screen"/>.
+        </para>
+
+        <para>
+          For legacy guest OSes, a VGA-compatible graphics device is
+          available.
         </para>
       </listitem>
@@ -896,14 +857,12 @@
         <para>
           <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 &product-name; by
-          itself, this multitude of storage adapters is required for
-          compatibility with other hypervisors. Windows is particularly
-          picky about its boot devices, and migrating VMs between
-          hypervisors is very difficult or impossible if the storage
-          controllers are different.
+          emulates the most common types of hard disk controllers. See
+          <xref linkend="harddiskcontrollers" />. Whereas supporting
+          only one of these controllers would be enough for
+          &product-name; by itself, this multitude of storage adapters
+          is required for compatibility with other hypervisors. Windows
+          is very selective about its boot devices, and migrating VMs
+          between hypervisors is very difficult or impossible if the
+          storage controllers are different.
         </para>
       </listitem>
@@ -912,6 +871,5 @@
         <para>
           <emphasis role="bold">Networking.</emphasis> See
-          <xref
-          linkend="nichardware" />.
+          <xref linkend="nichardware" />.
         </para>
       </listitem>
@@ -920,12 +878,13 @@
         <para>
           <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 OSes released
-          approximately after 2011 support xHCI. Note that for Windows 7
-          guests, 3rd party drivers must be installed for xHCI support.
-        </para>
-
-        <para>
-          Older OSes typically support OHCI and EHCI. The two
+          these types of USB host controllers: xHCI, EHCI, and OHCI.
+          While xHCI handles all USB transfer speeds, some legacy guest
+          OSes may not support xHCI. Note that for some legacy Windows
+          guests, third party drivers must be installed for xHCI
+          support.
+        </para>
+
+        <para>
+          Legacy guest OSes typically support OHCI and EHCI. These 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
@@ -935,7 +894,7 @@
         <para>
           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 enables the use of remote USB
-          devices.
+          devices on the host. Instead they communicate with a virtual
+          USB layer which abstracts the USB protocol and enables the use
+          of remote USB devices.
         </para>
       </listitem>
@@ -977,10 +936,11 @@
         <listitem>
           <para>
-            <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, &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 OS's file names.
+            <emphasis role="bold">Name:</emphasis> The name of the the
+            VM, as shown in the list of VMs in the main VirtualBox
+            Manager window. Using this name, &product-name; also saves
+            the VM's configuration files. If you change the name,
+            &product-name; renames these files as well. As a result, you
+            can only use characters which are allowed for file names on
+            your host OS.
           </para>
 
@@ -988,5 +948,5 @@
             Note that internally, &product-name; uses unique identifiers
             (UUIDs) to identify virtual machines. You can display these
-            with <command>VBoxManage</command>.
+            using the <command>VBoxManage</command> commands.
           </para>
         </listitem>
@@ -1077,6 +1037,6 @@
             enables support for drag and drop. Select an object, such as
             a file, from the host or guest and directly copy or open it
-            on the guest or host. Multiple per-VM drag and drop modes
-            allow restricting access in either direction.
+            on the guest or host. Multiple drag and drop modes for a VM
+            enable restricting of access in either direction.
           </para>
 
@@ -1148,6 +1108,6 @@
       <note>
         <para>
-          All files related to the virtual machine except disk images are
-          stored unencrypted.
+          All files related to the virtual machine except disk images
+          are stored unencrypted.
         </para>
       </note>
@@ -1234,17 +1194,16 @@
           <para>
             <emphasis role="bold">Chipset:</emphasis> You can select
-            which chipset will be presented to the virtual machine. In
-            legacy versions of &product-name;, PIIX3 was the only
-            available option. For modern guest OSes 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 OSes 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 OSes which do not
-            require it.
+            which chipset will be presented to the virtual machine.
+            PIIX3 is the default chipset for most guests. For some guest
+            OSes such as Mac OS X, the PIIX3 chipset is not well
+            supported. As a result, &product-name; supports an emulation
+            of the ICH9 chipset, which supports PCI express, three PCI
+            buses, PCI-to-PCI bridges and Message Signaled Interrupts
+            (MSI). This enables modern OSes 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,
+            compared to a maximum of eight network adapters with PIIX3.
+            Note that ICH9 support is experimental and not recommended
+            for guest OSes which do not require it.
           </para>
         </listitem>
@@ -1253,11 +1212,12 @@
           <para>
             <emphasis role="bold">Pointing Device:</emphasis> The
-            default virtual pointing devices for older guests is the
-            traditional PS/2 mouse. If set to <emphasis>USB
-            tablet</emphasis>, &product-name; reports to the virtual
+            default virtual pointing device for some guest OSes is the
+            traditional PS/2 mouse. If set to <emphasis role="bold">USB
+            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.
+            mouse events to the virtual machine through this device.
+            Another setting is <emphasis role="bold">USB Multi-Touch
+            Tablet</emphasis>, which is suitable for guests running
+            Windows 8 or later.
           </para>
 
@@ -1277,15 +1237,15 @@
           <para>
             <emphasis role="bold">Enable I/O APIC:</emphasis> Advanced
-            Programmable Interrupt Controllers (APICs) are a newer x86
-            hardware feature that have replaced old-style Programmable
-            Interrupt Controllers (PICs) in recent years. With an I/O
-            APIC, OSes can use more than 16 interrupt requests (IRQs)
-            and therefore avoid IRQ sharing for improved reliability.
+            Programmable Interrupt Controllers (APICs) are an x86
+            hardware feature that have replaced Programmable Interrupt
+            Controllers (PICs). With an I/O APIC, OSes can use more than
+            16 interrupt requests (IRQs) and therefore avoid IRQ sharing
+            for improved reliability.
           </para>
 
           <note>
             <para>
-              Enabling the I/O APIC is <emphasis>required</emphasis> for
-              64-bit guest OSes, especially Windows Vista. It is also
+              Enabling the I/O APIC is <emphasis>required</emphasis>,
+              especially for 64-bit Windows guest OSes. It is also
               required if you want to use more than one virtual CPU in a
               virtual machine.
@@ -1302,8 +1262,7 @@
           <warning>
             <para>
-              All Windows OSes starting with Windows 2000 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
+              All Windows OSes 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
               on after installation will have no effect however.
@@ -1343,17 +1302,17 @@
         ACPI is the current industry standard to allow OSes 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 &product-name;. ACPI can only be turned off using the
-        command line. See <xref linkend="vboxmanage-modifyvm" />.
+        power. As most computers contain this feature and Windows and
+        Linux support ACPI, it is also enabled by default in
+        &product-name;. ACPI can only be turned off using the command
+        line. See <xref linkend="vboxmanage-modifyvm" />.
       </para>
 
       <warning>
         <para>
-          All Windows OSes starting with Windows 2000 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.
+          All Windows OSes 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>
@@ -1460,5 +1419,5 @@
             accuracy and performance of guest OSes. The options
             available are documented under the
-            <computeroutput>paravirtprovider</computeroutput> option in
+            <option>--paravirtprovider</option> option in
             <xref linkend="vboxmanage-modifyvm" />. For further details
             on the paravirtualization providers, see
@@ -1470,18 +1429,9 @@
           <para>
             <emphasis role="bold">Hardware Virtualization:</emphasis>
-            You can select for each virtual machine individually whether
-            &product-name; should use software or hardware
-            virtualization.
+            You can configure hardware virtualization features for each
+            virtual machine.
           </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>
@@ -1502,6 +1452,5 @@
           <para>
             Advanced users may be interested in technical details about
-            software versus hardware virtualization. See
-            <xref linkend="hwvirt" />.
+            hardware virtualization. See <xref linkend="hwvirt" />.
           </para>
         </listitem>
@@ -1614,23 +1563,4 @@
         <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 guest VM.
@@ -1661,4 +1591,9 @@
                 default graphics controller for Windows versions before
                 Windows 7 and for Oracle Solaris.
+              </para>
+
+              <para>
+                3D acceleration is not supported for this graphics
+                controller.
               </para>
             </listitem>
@@ -1681,4 +1616,23 @@
 
           </itemizedlist>
+        </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>
 
@@ -1779,8 +1733,8 @@
         <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.
+            <emphasis role="bold">Video 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>
@@ -1825,10 +1779,10 @@
 
     <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.
+      In a real computer, 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>
 
@@ -1849,5 +1803,5 @@
     <figure id="fig-storage-settings">
       <title>Storage Settings for a Virtual Machine</title>
-      <mediaobject>
+     <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/vm-settings-harddisk.png"
@@ -1855,5 +1809,5 @@
         </imageobject>
       </mediaobject>
-    </figure>
+      </figure>
 
     <para>
@@ -1921,9 +1875,9 @@
           To <emphasis role="bold">add another virtual hard disk, or a
           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 the
+          controller to which it should be added (such as IDE, SATA,
+          SCSI, SAS, 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
-          CD/DVD Device</emphasis> or <emphasis role="bold">Add Hard
+          tree. You can then either select <emphasis role="bold">Optical
+          Drive</emphasis> or <emphasis role="bold">Hard
           Disk</emphasis>. If you clicked on a floppy controller, you
           can add a floppy drive instead. Alternatively, right-click on
@@ -1932,9 +1886,32 @@
 
         <para>
-          On the right part of the window, you can then set the
-          following:
-        </para>
-
-        <orderedlist>
+          A dialog is displayed, enabling you to select an existing disk
+          image file or to create a new disk image file. Depending on
+          the type of disk image, the dialog is called
+          <emphasis role="bold">Hard Disk Selector</emphasis>,
+          <emphasis role="bold">Optical Disk Selector</emphasis>, or
+          <emphasis role="bold">Floppy Disk Selector</emphasis>.
+        </para>
+
+        <para>
+          See <xref linkend="vdidetails"/> for information on the image
+          file types that are supported by &product-name;.
+        </para>
+
+        <para>
+          For virtual CD/DVD drives, the image files will typically be
+          in the standard ISO format instead. Most commonly, you will
+          select this option when installing an OS from an ISO file that
+          you have obtained from the Internet. For example, most Linux
+          distributions are available in this way.
+        </para>
+
+        <para>
+          Depending on the type of disk image, you can set the following
+          <emphasis role="bold">Attributes</emphasis> for the disk image
+          in the right part of the Storage settings page:
+        </para>
+
+        <itemizedlist>
 
           <listitem>
@@ -1952,87 +1929,27 @@
           <listitem>
             <para>
-              The <emphasis role="bold">image file</emphasis> to use.
-            </para>
-
-            <itemizedlist>
-
-              <listitem>
-                <para>
-                  For virtual hard disks, a button with a drop-down list
-                  appears on the right, offering you to either select a
-                  <emphasis role="bold">virtual hard disk
-                  file</emphasis> using a standard file dialog or to
-                  <emphasis role="bold">create a new hard
-                  disk</emphasis> (image file). The latter option
-                  displays the <emphasis role="bold">Create New
-                  Disk</emphasis> wizard, described in
-                  <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" />.
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
-                  For virtual CD/DVD drives, the image files will
-                  typically be in the standard ISO format instead. Most
-                  commonly, you will select this option when installing
-                  an OS from an ISO file that you have obtained from the
-                  Internet. For example, most Linux distributions are
-                  available in this way.
-                </para>
-
-                <para>
-                  For virtual CD/DVD drives, the following additional
-                  options are available:
-                </para>
-
-                <itemizedlist>
-
-                  <listitem>
-                    <para>
-                      If you select <emphasis role="bold">Host
-                      Drive</emphasis> from the list, then the physical
-                      device of the host computer is connected to the
-                      VM, so that the guest OS can read from and write
-                      to your physical device. This is, for instance,
-                      useful if you want to install Windows from a real
-                      installation CD. In this case, select your host
-                      drive from the drop-down list presented.
-                    </para>
-
-                    <para>
-                      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" />.
-                    </para>
-                  </listitem>
-
-                  <listitem>
-                    <para>
-                      If you select <emphasis role="bold">Remove Disk
-                      from Virtual Drive</emphasis>, &product-name; will
-                      present an empty CD/DVD drive to the guest into
-                      which no media has been inserted.
-                    </para>
-                  </listitem>
-
-                </itemizedlist>
-              </listitem>
-
-            </itemizedlist>
-          </listitem>
-
-        </orderedlist>
+              <emphasis role="bold">Solid-state Drive</emphasis>
+              presents a virtual disk to the guest as a solid-state
+              device.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <emphasis role="bold">Hot-pluggable</emphasis> presents a
+              virtual disk to the guest as a hot-pluggable device.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              For virtual CD/DVD drives, you can select
+              <emphasis role="bold">Live CD/DVD</emphasis>. This means
+              that the virtual optical disk is not removed from when the
+              guest system ejects it.
+            </para>
+          </listitem>
+
+        </itemizedlist>
       </listitem>
 
@@ -2199,7 +2116,7 @@
       <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.
+      for information on the <option>--uart</option>,
+      <option>--uartmode</option> and <option>--uarttype</option>
+      options.
     </para>
 
@@ -2250,10 +2167,4 @@
           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>
       </listitem>
 
@@ -2280,10 +2191,9 @@
               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.
+              <literal>COM1</literal>. On Linux or Oracle Solaris hosts,
+              it will be a device node like
+              <filename>/dev/ttyS0</filename>. &product-name; will then
+              simply redirect all data received from and sent to the
+              virtual serial port to the physical device.
             </para>
           </listitem>
@@ -2304,8 +2214,7 @@
                   through a named pipe. The pipe name must be in the
                   format
-                  <computeroutput>\\.\pipe\&lt;name&gt;</computeroutput>
-                  where <computeroutput>&lt;name&gt;</computeroutput>
-                  should identify the virtual machine but may be freely
-                  chosen.
+                  <filename>\\.\pipe\<replaceable>name</replaceable></filename>
+                  where <replaceable>name</replaceable> should identify
+                  the virtual machine but may be freely chosen.
                 </para>
               </listitem>
@@ -2313,10 +2222,10 @@
               <listitem>
                 <para>
-                  On a Mac, Linux, or Oracle Solaris host, a local
+                  On a Mac OS, 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.
+                  write to it. The <filename>/tmp</filename> directory
+                  is often a good candidate.
                 </para>
 
@@ -2324,7 +2233,6 @@
                   On Linux there are various tools which can connect to
                   a local domain socket or create one in server mode.
-                  The most flexible tool is
-                  <computeroutput>socat</computeroutput> and is
-                  available as part of many distributions.
+                  The most flexible tool is <command>socat</command> and
+                  is available as part of many distributions.
                 </para>
               </listitem>
@@ -2396,8 +2304,8 @@
                   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
+                  <literal><replaceable>hostname</replaceable>:<replaceable>port</replaceable></literal>
+                  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>
@@ -2567,7 +2475,6 @@
                 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.
+                <literal>046d:c016</literal> stands for Logitech as a
+                vendor, and the M-UV69a Optical Wheel Mouse product.
               </para>
 
@@ -2651,34 +2558,16 @@
         &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
+        virtual machine. System reboots are not necessary after
+        installing the driver. Also, you do not need to replug devices
+        for &product-name; to claim them.
+      </para>
+
+      <para>
+        On supported 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
-        that you are a member of this group.
-      </para>
-
-      <para>
-        On older Linux hosts, USB devices are accessed using the
-        <computeroutput>usbfs</computeroutput> file system. Therefore,
-        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
-        <computeroutput>usbfs</computeroutput>.
+        <literal>vboxusers</literal> system group. In order to be able
+        to access USB from guest systems, make sure that you are a
+        member of this group.
       </para>
 
@@ -2760,8 +2649,7 @@
     <para>
       &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.
+      Firmware Interface (EFI), which is an industry standard intended
+      to replace the legacy BIOS as the primary interface for
+      bootstrapping computers and certain system services later.
     </para>
 
@@ -3225,10 +3113,12 @@
       <para>
         It is currently not possible to manipulate EFI variables from
-        within a running guest. For example, setting the "boot-args"
-        variable by running the <computeroutput>nvram</computeroutput>
-        tool in a Mac OS X guest will not work. As an alternative way,
-        "VBoxInternal2/EfiBootArgs" extradata can be passed to a VM in
-        order to set the "boot-args" variable. To change the "boot-args"
-        EFI variable, use the following command:
+        within a running guest. For example, setting the
+        <literal>boot-args</literal> variable by running the
+        <command>nvram</command> tool in a Mac OS X guest will not work.
+        As an alternative method,
+        <literal>VBoxInternal2/EfiBootArgs</literal> extradata can be
+        passed to a VM in order to set the <literal>boot-args</literal>
+        variable. To change the <literal>boot-args</literal> EFI
+        variable, use the following command:
       </para>
 
Index: /trunk/doc/manual/en_US/user_ChangeLog.xml
===================================================================
--- /trunk/doc/manual/en_US/user_ChangeLog.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_ChangeLog.xml	(revision 82350)
@@ -41,5 +41,5 @@
 
     <para>
-      <ulink url="https://www.virtualbox.org/wiki/Changelog">https://www.virtualbox.org/wiki/Changelog</ulink>.
+      <ulink url="https://www.virtualbox.org/wiki/Changelog" />.
     </para>
 
Index: /trunk/doc/manual/en_US/user_Frontends.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Frontends.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_Frontends.xml	(revision 82350)
@@ -34,8 +34,5 @@
     <para>
       Oracle provides support for the VirtualBox Remote Display Protocol
-      (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.
+      (VRDP) in such an &product-name; extension package.
     </para>
 
@@ -55,15 +52,14 @@
     </para>
 
-<screen>VBoxManage modifyvm "VM name" --vrde on</screen>
-
-    <para>
-      By default, the VRDP server uses TCP port
-      <computeroutput>3389</computeroutput>. You will need to change the
-      default port if you run more than one VRDP server, since the port
-      can only be used by one server at a time. You might also need to
-      change it on Windows hosts since the default port might already be
-      used by the RDP server that is built into Windows itself. Ports
-      5000 through 5050 are typically not used and might be a good
-      choice.
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde on</screen>
+
+    <para>
+      By default, the VRDP server uses TCP port <literal>3389</literal>.
+      You will need to change the default port if you run more than one
+      VRDP server, since the port can only be used by one server at a
+      time. You might also need to change it on Windows hosts since the
+      default port might already be used by the RDP server that is built
+      into Windows itself. Ports 5000 through 5050 are typically not
+      used and might be a good choice.
     </para>
 
@@ -76,8 +72,9 @@
       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 specified list. For example, <command>VBoxManage modifyvm
+      <replaceable>VM-name</replaceable> --vrdeport
+      5000,5010-5012</command> configures the server to bind to one of
+      the ports 5000, 5010, 5011, or 5012. See
+      <xref linkend="vboxmanage-modifyvm" />.
     </para>
 
@@ -92,7 +89,7 @@
 
     <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.
+      &product-name; supports IPv6. If the host OS supports IPv6 the
+      VRDP server will automatically listen for IPv6 connections in
+      addition to IPv4.
     </para>
 
@@ -134,7 +131,7 @@
 
           <para>
-            Replace <computeroutput>1.2.3.4</computeroutput> with the
-            host IP address, and <computeroutput>3389</computeroutput>
-            with a different port, if necessary.
+            Replace <literal>1.2.3.4</literal> with the host IP address,
+            and <literal>3389</literal> with a different port, if
+            necessary.
           </para>
 
@@ -145,6 +142,6 @@
                 <para>
                   IPv6 addresses must be enclosed in square brackets to
-                  specify a port. For example: <computeroutput>mstsc
-                  [fe80::1:2:3:4]:3389</computeroutput>
+                  specify a port. For example: <literal>mstsc
+                  [fe80::1:2:3:4]:3389</literal>
                 </para>
               </listitem>
@@ -153,11 +150,8 @@
                 <para>
                   When connecting to localhost in order to test the
-                  connection, the addresses
-                  <computeroutput>localhost</computeroutput> and
-                  <computeroutput>127.0.0.1</computeroutput> might not
-                  work using <command>mstsc.exe</command>. Instead, the
-                  address
-                  <computeroutput>127.0.0.2[:3389]</computeroutput> has
-                  to be used.
+                  connection, the addresses <literal>localhost</literal>
+                  and <literal>127.0.0.1</literal> might not work using
+                  <command>mstsc.exe</command>. Instead, the address
+                  <literal>127.0.0.2[:3389]</literal> has to be used.
                 </para>
               </listitem>
@@ -181,16 +175,15 @@
           </para>
 
-<screen>rdesktop -a 16 -N 1.2.3.4:3389</screen>
-
-          <para>
-            Replace <computeroutput>1.2.3.4</computeroutput> with the
-            host IP address, and <computeroutput>3389</computeroutput>
-            with a different port, if necessary. The <computeroutput>-a
-            16</computeroutput> option requests a color depth of 16 bits
-            per pixel, which we recommend. For best performance, after
-            installation of the guest operating system, you should set
-            its display color depth to the same value. The
-            <computeroutput>-N</computeroutput> option enables use of
-            the NumPad keys.
+<screen>$ rdesktop -a 16 -N 1.2.3.4:3389</screen>
+
+          <para>
+            Replace <literal>1.2.3.4</literal> with the host IP address,
+            and <literal>3389</literal> with a different port, if
+            necessary. The <option>-a 16</option> option requests a
+            color depth of 16 bits per pixel, which we recommend. For
+            best performance, after installation of the guest operating
+            system, you should set its display color depth to the same
+            value. The <option>-N</option> option enables use of the
+            NumPad keys.
           </para>
         </listitem>
@@ -207,15 +200,15 @@
           <para>
             If you run the KDE desktop, you can use
-            <computeroutput>krdc</computeroutput>, the KDE RDP viewer. A
-            typical command line is as follows:
-          </para>
-
-<screen>krdc rdp://1.2.3.4:3389</screen>
-
-          <para>
-            Replace <computeroutput>1.2.3.4</computeroutput> with the
-            host IP address, and <computeroutput>3389</computeroutput>
-            with a different port, if necessary. The "rdp://" prefix is
-            required with krdc to switch it into RDP mode.
+            <command>krdc</command>, the KDE RDP viewer. A typical
+            command line is as follows:
+          </para>
+
+<screen>$ krdc rdp://1.2.3.4:3389</screen>
+
+          <para>
+            Replace <literal>1.2.3.4</literal> with the host IP address,
+            and <literal>3389</literal> with a different port, if
+            necessary. The <literal>rdp:// </literal> prefix is required
+            with <command>krdc</command> to switch it into RDP mode.
           </para>
         </listitem>
@@ -241,20 +234,20 @@
         While any VM started from the VirtualBox Manager is capable of
         running virtual machines remotely, it is not convenient to have
-        to run the full-fledged GUI if you never want to have VMs
-        displayed locally in the first place. In particular, if you are
-        running server hardware whose only purpose is to host VMs, and
-        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 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.
+        to run the full GUI if you never want to have VMs displayed
+        locally in the first place. In particular, if you are running
+        server hardware whose only purpose is to host VMs, and 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 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 optionally deliver
-        VRDP data. This front-end has no dependencies on the X Window system
+        <command>VBoxHeadless</command>, which produces no visible
+        output on the host at all, but still can optionally deliver VRDP
+        data. This front-end has no dependencies on the X Window system
         on Linux and Oracle Solaris hosts.
       </para>
@@ -262,15 +255,14 @@
       <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.
+          In legacy releases of &product-name;, the headless server was
+          called <command>VBoxVRDP</command>. For backwards
+          compatibility, the &product-name; installation still includes
+          an executable with that name.
         </para>
       </note>
 
       <para>
-        To start a virtual machine with
-        <computeroutput>VBoxHeadless</computeroutput>, you have the
-        following options:
+        To start a virtual machine with <command>VBoxHeadless</command>,
+        you have the following options:
       </para>
 
@@ -282,12 +274,10 @@
           </para>
 
-<screen>VBoxManage startvm "VM name" --type headless</screen>
-
-          <para>
-            The <computeroutput>--type</computeroutput> option causes
-            &product-name; to use
-            <computeroutput>VBoxHeadless</computeroutput> as the
-            front-end to the internal virtualization engine, instead of
-            the Qt front-end.
+<screen>$ VBoxManage startvm <replaceable>VM-name</replaceable> --type headless</screen>
+
+          <para>
+            The <option>--type</option> option causes &product-name; to
+            use <command>VBoxHeadless</command> as the front-end to the
+            internal virtualization engine, instead of the Qt front-end.
           </para>
         </listitem>
@@ -298,5 +288,5 @@
           </para>
 
-<screen>VBoxHeadless --startvm &lt;uuid|name&gt;</screen>
+<screen>VBoxHeadless --startvm <replaceable>uuid</replaceable>|<replaceable>vmname</replaceable></screen>
 
           <para>
@@ -309,15 +299,14 @@
             directly as a background process which has to be done
             explicitly when directly starting with
-            <computeroutput>VBoxHeadless</computeroutput>. The full
-            documentation of the command is in
-            <xref linkend="man_vboxheadless"/>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Start <computeroutput>VBoxHeadless</computeroutput> from the
-            VirtualBox Manager GUI, by pressing the Shift key when
-            starting a virtual machine or by selecting
+            <command>VBoxHeadless</command>. The full documentation of
+            the command is in <xref linkend="man_vboxheadless"/>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Start <command>VBoxHeadless</command> from the VirtualBox
+            Manager GUI, by pressing the Shift key when starting a
+            virtual machine or by selecting
             <emphasis role="bold">Headless Start</emphasis> from the
             <emphasis role="bold">Machine</emphasis> menu.
@@ -328,12 +317,12 @@
 
       <para>
-        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 as follows:
-      </para>
-
-<screen>VBoxHeadless --startvm &lt;uuid|name&gt; --vrde on</screen>
+        When you use the <command>VBoxHeadless</command> command to
+        start a VM, the VRDP server will be enabled according to the VM
+        configuration. You can override the VM's setting using
+        <option>--vrde</option> command line parameter. To enable the
+        VRDP server, start the VM as follows:
+      </para>
+
+<screen>VBoxHeadless --startvm <replaceable>uuid</replaceable>|<replaceable>vmname</replaceable> --vrde on</screen>
 
       <para>
@@ -341,5 +330,5 @@
       </para>
 
-<screen>VBoxHeadless --startvm &lt;uuid|name&gt; --vrde off</screen>
+<screen>VBoxHeadless --startvm <replaceable>uuid</replaceable>|<replaceable>vmname</replaceable> --vrde off</screen>
 
       <para>
@@ -348,5 +337,5 @@
       </para>
 
-<screen>VBoxHeadless --startvm &lt;uuid|name&gt; --vrde config</screen>
+<screen>VBoxHeadless --startvm <replaceable>uuid</replaceable>|<replaceable>vmname</replaceable> --vrde config</screen>
 
       <para>
@@ -354,5 +343,5 @@
       </para>
 
-<screen>VBoxHeadless --startvm &lt;uuid|name&gt;</screen>
+<screen>VBoxHeadless --startvm <replaceable>uuid</replaceable>|<replaceable>vmname</replaceable></screen>
 
       <para>
@@ -398,6 +387,5 @@
           <para>
             A terminal connection to that host through which you can
-            access a command line, such as
-            <computeroutput>ssh</computeroutput>.
+            access a command line, such as <command>ssh</command>.
           </para>
         </listitem>
@@ -428,14 +416,12 @@
 
           <para>
-            If you do not specify
-            <computeroutput>--register</computeroutput>, you will have
-            to manually use the <command>registervm</command> command
-            later.
-          </para>
-
-          <para>
-            You do not need to specify
-            <computeroutput>--ostype</computeroutput>, but doing so
-            selects some sensible default values for certain VM
+            If you do not specify <option>--register</option>, you will
+            have to manually use the <command>registervm</command>
+            command later.
+          </para>
+
+          <para>
+            You do not need to specify <option>--ostype</option>, but
+            doing so selects some sensible default values for certain VM
             parameters. For example, the RAM size and the type of the
             virtual network device. To get a complete list of supported
@@ -564,5 +550,5 @@
         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
+        called <command>rdesktop-vrdp</command>. Some versions of
         <command>uttsc</command>, a client tailored for the use with Sun
         Ray thin clients, also support accessing remote USB devices. RDP
@@ -628,7 +614,7 @@
               <para>
                 The default authentication library,
-                <computeroutput>VBoxAuth</computeroutput>, authenticates
-                against user credentials of the hosts. Depending on the
-                host platform, this means the following:
+                <command>VBoxAuth</command>, authenticates against user
+                credentials of the hosts. Depending on the host
+                platform, this means the following:
               </para>
 
@@ -637,6 +623,5 @@
                 <listitem>
                   <para>
-                    On Linux hosts,
-                    <computeroutput>VBoxAuth.so</computeroutput>
+                    On Linux hosts, <command>VBoxAuth.so</command>
                     authenticates users against the host's PAM system.
                   </para>
@@ -645,6 +630,5 @@
                 <listitem>
                   <para>
-                    On Windows hosts,
-                    <computeroutput>VBoxAuth.dll</computeroutput>
+                    On Windows hosts, <command>VBoxAuth.dll</command>
                     authenticates users against the host's WinLogon
                     system.
@@ -654,6 +638,5 @@
                 <listitem>
                   <para>
-                    On Mac OS X hosts,
-                    <computeroutput>VBoxAuth.dylib</computeroutput>
+                    On Mac OS X hosts, <command>VBoxAuth.dylib</command>
                     authenticates users against the host's directory
                     service.
@@ -675,10 +658,11 @@
               <para>
                 An additional library called
-                <computeroutput>VBoxAuthSimple</computeroutput> performs
+                <command>VBoxAuthSimple</command> performs
                 authentication against credentials configured in the
-                "extradata" section of a virtual machine's XML settings
-                file. This is probably the simplest way to get
-                authentication that does not depend on a running and
-                supported guest. The following steps are required:
+                <literal>extradata</literal> section of a virtual
+                machine's XML settings file. This is probably the
+                simplest way to get authentication that does not depend
+                on a running and supported guest. The following steps
+                are required:
               </para>
 
@@ -687,7 +671,6 @@
                 <listitem>
                   <para>
-                    Enable
-                    <computeroutput>VBoxAuthSimple</computeroutput> with
-                    the following command:
+                    Enable <command>VBoxAuthSimple</command> with the
+                    following command:
                   </para>
 
@@ -701,9 +684,9 @@
                   </para>
 
-<screen>VBoxManage modifyvm "VM name" --vrdeauthtype external</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeauthtype external</screen>
 
                   <para>
-                    Replace <computeroutput>&lt;vm&gt;</computeroutput>
-                    with the VM name or UUID.
+                    Replace <replaceable>VM-name</replaceable> with the
+                    VM name or UUID.
                   </para>
                 </listitem>
@@ -714,46 +697,36 @@
                     writing items into the machine's extradata. Since
                     the XML machine settings file, into whose
-                    <computeroutput>extradata</computeroutput> section
-                    the password needs to be written, is a plain text
-                    file, &product-name; uses hashes to encrypt
-                    passwords. The following command must be used:
+                    <literal>extradata</literal> section the password
+                    needs to be written, is a plain text file,
+                    &product-name; uses hashes to encrypt passwords. The
+                    following command must be used:
                   </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxAuthSimple/users/&lt;user&gt;" &lt;hash&gt;</screen>
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxAuthSimple/users/<replaceable>user</replaceable>" <replaceable>hash</replaceable></screen>
 
                   <para>
-                    Replace <computeroutput>&lt;vm&gt;</computeroutput>
-                    with the VM name or UUID,
-                    <computeroutput>&lt;user&gt;</computeroutput> with
-                    the user name who should be allowed to log in and
-                    <computeroutput>&lt;hash&gt;</computeroutput> with
-                    the encrypted password. As an example, to obtain the
-                    hash value for the password
-                    <computeroutput>secret</computeroutput>, you can use
-                    the following command:
+                    Replace <replaceable>VM-name</replaceable> with the
+                    VM name or UUID, <replaceable>user</replaceable>
+                    with the user name who should be allowed to log in
+                    and <replaceable>hash</replaceable> with the
+                    encrypted password. The following command example
+                    obtains the hash value for the password
+                    <literal>secret</literal>:
                   </para>
 
-<screen>VBoxManage internalcommands passwordhash "secret"</screen>
-
-                  <para>
-                    This command will generate output similar to the
-                    following:
-                  </para>
-
-<screen>2bb80d537b1da3e38bd30361aa855686bde0eacd7162fef6a25fe97bf527a25b</screen>
+<screen>$ VBoxManage internalcommands passwordhash "secret"
+2bb80d537b1da3e38bd30361aa855686bde0eacd7162fef6a25fe97bf527a25b</screen>
 
                   <para>
                     You then use <command>VBoxManage
                     setextradata</command> to store this value in the
-                    machine's <computeroutput>extradata</computeroutput>
-                    section.
+                    machine's <literal>extradata</literal> section.
                   </para>
 
                   <para>
                     As a combined example, to set the password for the
-                    user <computeroutput>john</computeroutput> and the
-                    machine <computeroutput>My VM</computeroutput> to
-                    <computeroutput>secret</computeroutput>, use this
-                    command:
+                    user <literal>john</literal> and the machine
+                    <literal>My VM</literal> to
+                    <literal>secret</literal>, use this command:
                   </para>
 
@@ -814,6 +787,6 @@
         <listitem>
           <para>
-            <emphasis role="bold">RDP4</emphasis> authentication was
-            used historically. With RDP4, the RDP client does not
+            <emphasis role="bold">RDP 4</emphasis> authentication was
+            used historically. With RDP 4, the RDP client does not
             perform any checks in order to verify the identity of the
             server it connects to. Since user credentials can be
@@ -825,9 +798,9 @@
         <listitem>
           <para>
-            <emphasis role="bold">RDP5.1</emphasis> authentication
+            <emphasis role="bold">RDP 5.1</emphasis> authentication
             employs a server certificate for which the client possesses
             the public key. This way it is guaranteed that the server
             possess the corresponding private key. However, as this
-            hard-coded private key became public some years ago, RDP5.1
+            hard-coded private key became public some years ago, RDP 5.1
             authentication is also insecure.
           </para>
@@ -836,16 +809,17 @@
         <listitem>
           <para>
-            <emphasis role="bold">RDP5.2</emphasis> authentication uses
-            Enhanced RDP Security, which means that an external security
-            protocol is used to secure the connection. RDP4 and RDP5.1
-            use Standard RDP Security. The VRDP server supports Enhanced
-            RDP Security with TLS protocol and, as a part of TLS
-            handshake, sends the server certificate to the client.
-          </para>
-
-          <para>
-            The <computeroutput>Security/Method</computeroutput> VRDE
-            property sets the desired security method, which is used for
-            a connection. Valid values are as follows:
+            <emphasis role="bold">RDP 5.2 or later</emphasis>
+            authentication uses Enhanced RDP Security, which means that
+            an external security protocol is used to secure the
+            connection. RDP 4 and RDP 5.1 use Standard RDP Security. The
+            VRDP server supports Enhanced RDP Security with TLS protocol
+            and, as a part of the TLS handshake, sends the server
+            certificate to the client.
+          </para>
+
+          <para>
+            The <literal>Security/Method</literal> VRDE property sets
+            the desired security method, which is used for a connection.
+            Valid values are as follows:
           </para>
 
@@ -875,10 +849,6 @@
 
               <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.
+                The version of OpenSSL used by &product-name; supports
+                TLS versions 1.0, 1.1, 1.2, and 1.3.
               </para>
             </listitem>
@@ -891,13 +861,13 @@
           </para>
 
-<screen>vboxmanage modifyvm "VM name" --vrdeproperty "Security/Method=negotiate"</screen>
-
-          <para>
-            If the <computeroutput>Security/Method</computeroutput>
-            property is set to either Negotiate or TLS, the TLS protocol
-            will be automatically used by the server, if the client
-            supports TLS. However, in order to use TLS the server must
-            possess the Server Certificate, the Server Private Key and
-            the Certificate Authority (CA) Certificate. The following
+<screen>vboxmanage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty "Security/Method=negotiate"</screen>
+
+          <para>
+            If the <literal>Security/Method</literal> property is set to
+            either Negotiate or TLS, the TLS protocol will be
+            automatically used by the server, if the client supports
+            TLS. However, in order to use TLS the server must possess
+            the Server Certificate, the Server Private Key and the
+            Certificate Authority (CA) Certificate. The following
             example shows how to generate a server certificate.
           </para>
@@ -939,11 +909,11 @@
           </para>
 
-<screen>vboxmanage modifyvm "VM name" \
+<screen>vboxmanage modifyvm <replaceable>VM-name</replaceable> \
   --vrdeproperty "Security/CACertificate=path/ca_cert.pem"</screen>
 
-<screen>vboxmanage modifyvm "VM name" \
+<screen>vboxmanage modifyvm <replaceable>VM-name</replaceable> \
   --vrdeproperty "Security/ServerCertificate=path/server_cert.pem"</screen>
 
-<screen>vboxmanage modifyvm "VM name" \
+<screen>vboxmanage modifyvm <replaceable>VM-name</replaceable> \
   --vrdeproperty "Security/ServerPrivateKey=path/server_key_private.pem"</screen>
         </listitem>
@@ -954,7 +924,6 @@
         As the client that connects to the server determines what type
         of encryption will be used, with <command>rdesktop</command>,
-        the Linux RDP viewer, use the
-        <computeroutput>-4</computeroutput> or
-        <computeroutput>-5</computeroutput> options.
+        the Linux RDP viewer, use the <option>-4</option> or
+        <option>-5</option> options.
       </para>
 
@@ -978,5 +947,5 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --vrdemulticon on</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdemulticon on</screen>
 
     </sect2>
@@ -994,23 +963,21 @@
       <para>
         The RDP client can select the virtual monitor number to connect
-        to using the <computeroutput>domain</computeroutput> login
-        parameter (<computeroutput>-d</computeroutput>). If the
-        parameter ends with <computeroutput>@</computeroutput> followed
-        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
-        is <computeroutput>@2</computeroutput>, and so on.
-      </para>
-
-      <para>
-        The Microsoft RDP6 client does not let you specify a separate
+        to using the <literal>domain</literal> login parameter
+        (<option>-d</option>). If the parameter ends with
+        <literal>@</literal> followed by a number, &product-name;
+        interprets this number as the screen index. The primary guest
+        screen is selected with <literal>@1</literal>, the first
+        secondary screen is <literal>@2</literal>, and so on.
+      </para>
+
+      <para>
+        The Microsoft RDP 6 client does not let you specify a separate
         domain name. Instead, enter
-        <computeroutput>domain\username</computeroutput> in the
-        <emphasis role="bold">Username</emphasis> field. For example,
-        <computeroutput>@2\name</computeroutput>.
-        <computeroutput>name</computeroutput> must be supplied, and must
-        be the name used to log in if the VRDP server is set up to
-        require credentials. If it is not, you may use any text as the
-        username.
+        <literal><replaceable>domain</replaceable>\<replaceable>username</replaceable></literal>
+        in the <emphasis role="bold">Username</emphasis> field. For
+        example, <literal>@2\<replaceable>name</replaceable></literal>.
+        <replaceable>name</replaceable> must be supplied, and must be
+        the name used to log in if the VRDP server is set up to require
+        credentials. If it is not, you may use any text as the username.
       </para>
 
@@ -1048,5 +1015,5 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --vrdevideochannel on</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdevideochannel on</screen>
 
       <para>
@@ -1057,5 +1024,5 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --vrdevideochannelquality 75</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdevideochannelquality 75</screen>
 
     </sect2>
@@ -1066,7 +1033,6 @@
 
       <para>
-        With &product-name; it is possible to disable display output,
-        mouse and keyboard input, audio, remote USB, or clipboard
-        individually in the VRDP server.
+        You can disable display output, mouse and keyboard input, audio,
+        remote USB, or clipboard individually in the VRDP server.
       </para>
 
@@ -1075,10 +1041,10 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --vrdeproperty Client/DisableDisplay=1
-VBoxManage modifyvm "VM name" --vrdeproperty Client/DisableInput=1
-VBoxManage modifyvm "VM name" --vrdeproperty Client/DisableUSB=1
-VBoxManage modifyvm "VM name" --vrdeproperty Client/DisableAudio=1
-VBoxManage modifyvm "VM name" --vrdeproperty Client/DisableClipboard=1
-VBoxManage modifyvm "VM name" --vrdeproperty Client/DisableUpstreamAudio=1</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableDisplay=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableInput=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableUSB=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableAudio=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableClipboard=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableUpstreamAudio=1</screen>
 
       <para>
@@ -1087,5 +1053,5 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --vrdeproperty Client/DisableDisplay=</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableDisplay=</screen>
 
     </sect2>
@@ -1174,13 +1140,12 @@
         </para>
 
-<screen>VBoxManage modifyvm &lt;targetvmname&gt; --teleporter on --teleporterport &lt;port&gt;</screen>
+<screen>VBoxManage modifyvm <replaceable>targetvmname</replaceable> --teleporter on --teleporterport <replaceable>port</replaceable></screen>
 
         <para>
-          where <computeroutput>&lt;targetvmname&gt;</computeroutput> is
-          the name of the virtual machine on the target host and
-          <computeroutput>&lt;port&gt;</computeroutput> is a TCP/IP port
-          number to be used on both the source and the target hosts. For
-          example, use 6000. See
-          <xref linkend="vboxmanage-modifyvm-teleport" />.
+          <replaceable>targetvmname</replaceable> is the name of the
+          virtual machine on the target host and
+          <replaceable>port</replaceable> is a TCP/IP port number to be
+          used on both the source and the target hosts. For example, use
+          6000. See <xref linkend="vboxmanage-modifyvm" />.
         </para>
       </listitem>
@@ -1201,16 +1166,15 @@
         </para>
 
-<screen>VBoxManage controlvm &lt;sourcevmname&gt; teleport --host &lt;targethost&gt; --port &lt;port&gt;</screen>
+<screen>VBoxManage controlvm <replaceable>sourcevmname</replaceable> teleport --host <replaceable>targethost</replaceable> --port <replaceable>port</replaceable></screen>
 
         <para>
-          where <computeroutput>&lt;sourcevmname&gt;</computeroutput> is
-          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
-          waiting for the teleport request, and
-          <computeroutput>&lt;port&gt;</computeroutput> must be the same
-          number as specified in the command on the target host. See
-          <xref linkend="vboxmanage-controlvm" />.
+          where <replaceable>sourcevmname</replaceable> is the name of
+          the virtual machine on the source host, which is the machine
+          that is currently running.
+          <replaceable>targethost</replaceable> is the host or IP name
+          of the target host on which the machine is waiting for the
+          teleport request, and <replaceable>port</replaceable> must be
+          the same number as specified in the command on the target
+          host. See <xref linkend="vboxmanage-controlvm" />.
         </para>
       </listitem>
@@ -1234,7 +1198,7 @@
         capabilities are presented to the guest operating system.
         Advanced users can attempt to restrict these virtual CPU
-        capabilities with the <computeroutput>VBoxManage modifyvm
-        --cpuid</computeroutput> command. See
-        <xref linkend="vboxmanage-modifyvm-teleport" />.
+        capabilities with the <command>VBoxManage modifyvm
+        --cpuid</command> command. See
+        <xref linkend="vboxmanage-modifyvm" />.
       </para>
     </note>
@@ -1244,4 +1208,3 @@
   <xi:include href="user_man_VBoxHeadless.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-
 </chapter>
Index: /trunk/doc/manual/en_US/user_Glossary.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Glossary.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_Glossary.xml	(revision 82350)
@@ -138,6 +138,6 @@
           application programming interfaces which can be accessed from
           various other programming languages and applications.
-          &product-name; makes use of COM both internally and externally to
-          provide a comprehensive API to 3rd party developers.
+          &product-name; makes use of COM both internally and externally
+          to provide a comprehensive API to 3rd party developers.
         </para>
 
@@ -221,7 +221,7 @@
           "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
-          <command>VBoxManage</command> interface.
+          <command>VirtualBox</command> program as the "GUI", to
+          differentiate it from the <command>VBoxManage</command>
+          interface.
         </para>
 
@@ -300,5 +300,5 @@
           card. It is typically written in hexadecimal notation where
           the bytes are separated by colons, such as
-          <computeroutput>00:17:3A:5E:CB:08</computeroutput>.
+          <literal>00:17:3A:5E:CB:08</literal>.
         </para>
 
@@ -339,6 +339,6 @@
           target IP addresses of network packets according to specific
           rules. Commonly employed by routers and firewalls to shield an
-          internal network from the Internet, &product-name; can use NAT to
-          easily share a host's physical networking hardware with its
+          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
         linkend="network_nat" />.
@@ -382,6 +382,5 @@
           Physical Address Extension. This enables access to more than 4
           GB of RAM, even in 32-bit environments. See
-          <xref
-        linkend="settings-general-advanced" />.
+          <xref linkend="settings-general-advanced" />.
         </para>
 
@@ -435,9 +434,9 @@
           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. An &product-name; extension
-          package by Oracle provides VRDP, an enhanced implementation of
-          the relevant standards which is largely compatible with
-          Microsoft's RDP implementation. See <xref linkend="vrde" />
-          for details.
+          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 Microsoft's RDP implementation. See
+          <xref linkend="vrde" /> for details.
         </para>
 
@@ -537,5 +536,5 @@
           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
+          an <filename>.ova</filename> file extension. See
           <xref
         linkend="ovf" />.
@@ -561,6 +560,6 @@
           and letters which can be computed dynamically and is
           guaranteed to be unique. Generally, it is used as a global
-          handle to identify entities. &product-name; makes use of UUIDs to
-          identify VMs, Virtual Disk Images (VDI files), and other
+          handle to identify entities. &product-name; makes use of UUIDs
+          to identify VMs, Virtual Disk Images (VDI files), and other
           entities.
         </para>
@@ -581,6 +580,6 @@
 
         <para>
-          Virtual Machine. A virtual computer that &product-name; enables
-          you to run on top of your actual hardware. See
+          Virtual Machine. A virtual computer that &product-name;
+          enables you to run on top of your actual hardware. See
           <xref
         linkend="virtintro" /> for details.
@@ -612,6 +611,6 @@
         <para>
           VirtualBox Remote Desktop Extension. This interface is built
-          into &product-name; to allow &product-name; extension packages to
-          supply remote access to virtual machines. An &product-name;
+          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" />.
@@ -689,7 +688,7 @@
           infrastructure developed by the Mozilla browser project which
           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.
+          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 82349)
+++ /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 82350)
@@ -36,9 +36,8 @@
       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.
+      is called <filename>VBoxGuestAdditions.iso</filename>. 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>
 
@@ -56,8 +55,9 @@
           you with seamless mouse support. You will only have one mouse
           pointer and pressing the Host key is no longer required to
-          "free" the mouse from being captured by the guest OS. To make
-          this work, a special mouse driver is installed in the guest
-          that communicates with the "real" mouse driver on your host
-          and moves the guest mouse pointer accordingly.
+          <emphasis>free</emphasis> the mouse from being captured by the
+          guest OS. To make this work, a special mouse driver is
+          installed in the guest that communicates with the physical
+          mouse driver on your host and moves the guest mouse pointer
+          accordingly.
         </para>
       </listitem>
@@ -71,7 +71,6 @@
           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
-          <xref
-            linkend="sharedfolders" />.
+          the guest actually has a network. See
+          <xref linkend="sharedfolders" />.
         </para>
       </listitem>
@@ -118,9 +117,9 @@
           <emphasis role="bold">Generic host/guest communication
           channels.</emphasis> The Guest Additions enable you to control
-          and monitor guest execution. The "guest properties" provide a
-          generic string-based mechanism to exchange data bits between a
-          guest and a host, some of which have special meanings for
-          controlling and monitoring the guest. See
-          <xref linkend="guestadd-guestprops" />.
+          and monitor guest execution. The <emphasis>guest
+          properties</emphasis> provide a generic string-based mechanism
+          to exchange data bits between a guest and a host, some of
+          which have special meanings for controlling and monitoring the
+          guest. See <xref linkend="guestadd-guestprops" />.
         </para>
 
@@ -148,5 +147,5 @@
           differs slightly, the time synchronization service attempts to
           gradually and smoothly adjust the guest time in small
-          increments to either "catch up" or "lose" time. When the
+          increments to either catch up or lose time. When the
           difference is too great, for example if a VM paused for hours
           or restored from saved state, the guest time is changed
@@ -199,6 +198,6 @@
       To disable this update check for the Guest Additions of a given
       virtual machine, set the value of its
-      <computeroutput>/VirtualBox/GuestAdd/CheckHostVersion</computeroutput>
-      guest property to <computeroutput>0</computeroutput>. See
+      <literal>/VirtualBox/GuestAdd/CheckHostVersion</literal> guest
+      property to <literal>0</literal>. See
       <xref
     linkend="guestadd-guestprops" />.
@@ -343,11 +342,10 @@
           <listitem>
             <para>
-              Select <emphasis role="bold">Mount CD/DVD-ROM</emphasis>
+              Select <emphasis role="bold">Optical Drives</emphasis>
               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" />.
+              <emphasis role="bold">Choose/Create a Disk
+              Image</emphasis>. This displays the Virtual Media Manager,
+              described in <xref linkend="vdis" />.
             </para>
           </listitem>
@@ -358,6 +356,5 @@
               <emphasis role="bold">Add</emphasis> and browse your host
               file system for the
-              <computeroutput>VBoxGuestAdditions.iso</computeroutput>
-              file.
+              <filename>VBoxGuestAdditions.iso</filename> file.
             </para>
 
@@ -368,6 +365,6 @@
                   On a Windows host, this file is in the &product-name;
                   installation directory, usually in
-                  <computeroutput>C:\Program
-                  files\Oracle\VirtualBox</computeroutput>.
+                  <filename>C:\Program
+                  files\Oracle\VirtualBox</filename>.
                 </para>
               </listitem>
@@ -380,6 +377,5 @@
                   <emphasis role="bold">Show Package
                   Contents</emphasis>. The file is located in the
-                  <computeroutput>Contents/MacOS</computeroutput>
-                  folder.
+                  <filename>Contents/MacOS</filename> folder.
                 </para>
               </listitem>
@@ -388,7 +384,7 @@
                 <para>
                   On a Linux host, this file is in the
-                  <computeroutput>additions</computeroutput> folder
-                  where you installed &product-name;, usually
-                  <computeroutput>/opt/VirtualBox/</computeroutput>.
+                  <filename>additions</filename> folder where you
+                  installed &product-name;, usually
+                  <filename>/opt/VirtualBox/</filename>.
                 </para>
               </listitem>
@@ -397,7 +393,7 @@
                 <para>
                   On Oracle Solaris hosts, this file is in the
-                  <computeroutput>additions</computeroutput> folder
-                  where you installed &product-name;, usually
-                  <computeroutput>/opt/VirtualBox</computeroutput>.
+                  <filename>additions</filename> folder where you
+                  installed &product-name;, usually
+                  <filename>/opt/VirtualBox</filename>.
                 </para>
               </listitem>
@@ -409,7 +405,7 @@
             <para>
               In the Virtual Media Manager, select the ISO file and
-              click <emphasis role="bold">Select</emphasis> button. This
-              mounts the ISO file and presents it to your Windows guest
-              as a CD-ROM.
+              click the <emphasis role="bold">Add</emphasis> button.
+              This mounts the ISO file and presents it to your Windows
+              guest as a CD-ROM.
             </para>
           </listitem>
@@ -422,6 +418,6 @@
           Additions installation program from the Additions ISO. If the
           Autostart feature has been turned off, choose
-          <computeroutput>VBoxWindowsAdditions.exe</computeroutput> from
-          the CD/DVD drive inside the guest to start the installer.
+          <filename>VBoxWindowsAdditions.exe</filename> from the CD/DVD
+          drive inside the guest to start the installer.
         </para>
 
@@ -461,5 +457,5 @@
         </para>
 
-        <orderedlist>
+        <itemizedlist>
 
           <listitem>
@@ -475,5 +471,5 @@
           </listitem>
 
-        </orderedlist>
+        </itemizedlist>
 
         <para>
@@ -510,7 +506,7 @@
           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.
+          <filename>VBoxCertUtil.exe</filename> utility from the
+          <filename>cert</filename> folder on the Guest Additions
+          installation CD.
         </para>
 
@@ -536,6 +532,6 @@
             <para>
               Open a command line window on the guest and change to the
-              <computeroutput>cert</computeroutput> folder on the
-              &product-name; Guest Additions CD.
+              <filename>cert</filename> folder on the &product-name;
+              Guest Additions CD.
             </para>
           </listitem>
@@ -577,7 +573,7 @@
             driver needs to be installed. To select this driver by
             default, add the command line parameter
-            <computeroutput>/with_wddm</computeroutput> when invoking
-            the Windows Guest Additions installer. This is only required
-            for Vista and Windows 7.
+            <literal>/with_wddm</literal> when invoking the Windows
+            Guest Additions installer. This is only required for Vista
+            and Windows 7.
           </para>
         </note>
@@ -616,8 +612,7 @@
           a 32-bit system, you must use the appropriate platform
           installer. Use
-          <computeroutput>VBoxWindowsAdditions-x86.exe</computeroutput>
-          or
-          <computeroutput>VBoxWindowsAdditions-amd64.exe</computeroutput>
-          with the <computeroutput>/extract</computeroutput> parameter.
+          <filename>VBoxWindowsAdditions-x86.exe</filename> or
+          <filename>VBoxWindowsAdditions-amd64.exe</filename> with the
+          <literal>/extract</literal> parameter.
         </para>
 
@@ -657,5 +652,5 @@
         <listitem>
           <para>
-            Redhat Enterprise Linux as of version 3
+            Red Hat Enterprise Linux as of version 3
           </para>
         </listitem>
@@ -744,6 +739,5 @@
           <listitem>
             <para>
-              Insert the
-              <computeroutput>VBoxGuestAdditions.iso</computeroutput> CD
+              Insert the <filename>VBoxGuestAdditions.iso</filename> CD
               file into your Linux guest's virtual CD-ROM drive, as
               described for a Windows guest in
@@ -830,6 +824,6 @@
           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, as follows:
+          <literal>uninstall</literal> parameter from the path that the
+          CD image is mounted on in the guest, as follows:
         </para>
 
@@ -853,5 +847,5 @@
         <para>
           Replace
-          <computeroutput>/opt/VBoxGuestAdditions-<replaceable>version</replaceable></computeroutput>
+          <filename>/opt/VBoxGuestAdditions-<replaceable>version</replaceable></filename>
           with the correct Guest Additions installation directory.
         </para>
@@ -917,7 +911,6 @@
           <listitem>
             <para>
-              Mount the
-              <computeroutput>VBoxGuestAdditions.iso</computeroutput>
-              file as your Oracle Solaris guest's virtual CD-ROM drive,
+              Mount the <filename>VBoxGuestAdditions.iso</filename> file
+              as your Oracle Solaris guest's virtual CD-ROM drive,
               exactly the same way as described for a Windows guest in
               <xref
@@ -1002,12 +995,12 @@
         those for the other platforms. Mount the ISO in OS/2 as
         described previously. The OS/2 Guest Additions are located in
-        the directory <computeroutput>\OS2</computeroutput>.
+        the directory <filename>\OS2</filename>.
       </para>
 
       <para>
         We do not provide an automatic installer at this time. See the
-        <computeroutput>readme.txt</computeroutput> file in the CD-ROM
-        directory, which describes how to install the OS/2 Guest
-        Additions manually.
+        <filename>readme.txt</filename> file in the CD-ROM directory,
+        which describes how to install the OS/2 Guest Additions
+        manually.
       </para>
 
@@ -1027,6 +1020,6 @@
       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.
+      Solaris guests. &product-name; includes experimental support for
+      Mac OS X and OS/2 guests.
     </para>
 
@@ -1104,6 +1097,6 @@
           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.
+          <option>--transient</option> option of the <command>VBoxManage
+          sharedfolder add</command> command.
         </para>
       </listitem>
@@ -1116,7 +1109,6 @@
       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.
+      VirtualBox Manager, or with the <option>--readonly</option> option
+      of the <command>VBoxManage sharedfolder add</command> command.
     </para>
 
@@ -1189,8 +1181,8 @@
 
           <para>
-            While <computeroutput>vboxsvr</computeroutput> is a fixed
-            name, note that <computeroutput>vboxsrv</computeroutput>
-            would also work, replace <replaceable>x:</replaceable> with
-            the drive letter that you want to use for the share, and
+            While <literal>vboxsvr</literal> is a fixed name, note that
+            <literal>vboxsrv</literal> would also work, replace
+            <replaceable>x:</replaceable> with the drive letter that you
+            want to use for the share, and
             <replaceable>sharename</replaceable> with the share name
             specified with <command>VBoxManage</command>.
@@ -1207,5 +1199,5 @@
           <para>
             To mount a shared folder during boot, add the following
-            entry to <computeroutput>/etc/fstab</computeroutput>:
+            entry to <filename>/etc/fstab</filename>:
           </para>
 
@@ -1223,10 +1215,10 @@
             Replace <replaceable>sharename</replaceable>, use a
             lowercase string, with the share name specified with
-            <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
-            does not exist yet.
+            <command>VBoxManage</command> or the VirtualBox Manager.
+            Replace <replaceable>mountpoint</replaceable> with the path
+            where you want the share to be mounted on the guest, such as
+            <filename>/mnt/share</filename>. The usual mount rules
+            apply. For example, create this directory first if it does
+            not exist yet.
           </para>
 
@@ -1256,9 +1248,8 @@
             This option sets the character set used for I/O operations.
             Note that on Linux guests, if the
-            <computeroutput>iocharset</computeroutput> option is not
-            specified, then the Guest Additions driver will attempt to
-            use the character set specified by the CONFIG_NLS_DEFAULT
-            kernel option. If this option is not set either, then UTF-8
-            is used.
+            <literal>iocharset</literal> option is not specified, then
+            the Guest Additions driver will attempt to use the character
+            set specified by the CONFIG_NLS_DEFAULT kernel option. If
+            this option is not set either, then UTF-8 is used.
           </para>
 
@@ -1272,11 +1263,10 @@
           <para>
             The generic mount options, documented in the
-            <computeroutput>mount</computeroutput> manual page, apply
-            also. Especially useful are the options
-            <computeroutput>uid</computeroutput>,
-            <computeroutput>gid</computeroutput> and
-            <computeroutput>mode</computeroutput>, as they can allow
-            access by normal users in read/write mode, depending on the
-            settings, even if root has mounted the filesystem.
+            <command>mount</command> manual page, apply also. Especially
+            useful are the options <literal>uid</literal>,
+            <literal>gid</literal> and <literal>mode</literal>, as they
+            can allow access by normal users in read/write mode,
+            depending on the settings, even if root has mounted the
+            filesystem.
           </para>
         </listitem>
@@ -1294,9 +1284,8 @@
           <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
-            <replaceable>sharename</replaceable>.
+            via UNC using <filename>\\VBoxSF\</filename>,
+            <filename>\\VBoxSvr\</filename> or
+            <filename>\\VBoxSrv\</filename> as the server name and the
+            shared folder name as <replaceable>sharename</replaceable>.
           </para>
         </listitem>
@@ -1332,6 +1321,6 @@
             <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.
+            <filename>Z:</filename>. If all drive letters are assigned,
+            the folder is not mounted.
           </para>
         </listitem>
@@ -1341,21 +1330,20 @@
             <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>.
+            <filename>/media</filename> directory. The folder name is
+            normalized (no spaces, slashes or colons) and is prefixed
+            with <filename>sf_</filename>.
           </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.
+            <filename>myfiles</filename>, it will appear as
+            <filename>/media/sf_myfiles</filename> in the guest.
           </para>
 
           <para>
             The guest properties
-            <computeroutput>/VirtualBox/GuestAdd/SharedFolders/MountDir</computeroutput>
+            <literal>/VirtualBox/GuestAdd/SharedFolders/MountDir</literal>
             and the more generic
-            <computeroutput>/VirtualBox/GuestAdd/SharedFolders/MountPrefix</computeroutput>
+            <literal>/VirtualBox/GuestAdd/SharedFolders/MountPrefix</literal>
             can be used to override the automatic mount directory and
             prefix. See <xref linkend="guestadd-guestprops" />.
@@ -1369,6 +1357,6 @@
         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.
+        the group <literal>vboxsf</literal> and the
+        <literal>root</literal> user.
       </para>
 
@@ -1383,6 +1371,6 @@
     <para>
       &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.
+      to the guest, and vice versa. For this to work the latest version
+      of the Guest Additions must be installed on the guest.
     </para>
 
@@ -1439,5 +1427,5 @@
     <figure id="fig-drag-drop-options">
       <title>Drag and Drop Menu Options</title>
-      <mediaobject>
+    <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/dnd-modes.png"
@@ -1617,7 +1605,7 @@
               <para>
                 3D acceleration with Windows guests requires Windows
-                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.
+                2000 or later. Apart from on Windows 2000 guests, both
+                OpenGL and Direct3D 8/9 are supported on an experimental
+                basis.
               </para>
             </listitem>
@@ -1692,5 +1680,5 @@
         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
+        default for Vista and Windows 7 guests and must be
         <emphasis>manually selected</emphasis> in the Guest Additions
         installer by clicking <emphasis role="bold">No</emphasis> in the
@@ -1701,48 +1689,21 @@
 
       <para>
-        The Aero theme is not enabled by default. To enable it, do the
-        following:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <emphasis role="bold">Windows Vista guests:</emphasis>
-            Right-click on the desktop and select
-            <emphasis role="bold">Personalize</emphasis>, then select
-            <emphasis role="bold">Windows Color and
-            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>
-
-        <listitem>
-          <para>
-            <emphasis role="bold">Windows 7 guests:</emphasis>
-            Right-click on the desktop and select
-            <emphasis role="bold">Personalize</emphasis>. Select any
-            Aero theme in the
-            <emphasis role="bold">Personalization</emphasis> window.
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      <para>
-        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
-        through the OpenGL or Direct3D programming interfaces, these are
-        sent to the host through a special communication tunnel
-        implemented by &product-name;, and then the
-        <emphasis>host</emphasis> performs the requested 3D operation
-        using the host's programming interfaces.
+        The Aero theme is not enabled by default on Windows. See your
+        Windows platform documentation for details of how to enable the
+        Aero theme.
+      </para>
+
+      <para>
+        Technically, &product-name; implements 3D acceleration by
+        installing an additional hardware 3D driver inside the 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 through the OpenGL or Direct3D programming
+        interfaces, these are sent to the host through a special
+        communication tunnel implemented by &product-name;. The
+        <emphasis>host</emphasis> then performs the requested 3D
+        operation using the host's programming interfaces.
       </para>
 
@@ -1806,5 +1767,5 @@
         through a special communication tunnel implemented by
         &product-name;. On the host side, OpenGL is then used to
-        implement color space transformation and scaling
+        implement color space transformation and scaling.
       </para>
 
@@ -1829,5 +1790,5 @@
       <listitem>
         <para>
-          Windows guests. Support was added in &product-name; 1.5.
+          Windows guests.
         </para>
       </listitem>
@@ -1836,5 +1797,5 @@
         <para>
           Supported Linux or Oracle Solaris guests running the X Window
-          System. Support was added with &product-name; 1.6.
+          System.
         </para>
       </listitem>
@@ -1851,5 +1812,5 @@
     <figure id="fig-seamless-windows">
       <title>Seamless Windows on a Host Desktop</title>
-      <mediaobject>
+    <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/seamless.png" width="14cm" />
@@ -1918,7 +1879,6 @@
       version of the Guest Additions, users that are currently logged
       into the guest OS, network statistics and more. These predefined
-      properties are all prefixed with
-      <computeroutput>/VirtualBox/</computeroutput> and organized into a
-      hierarchical tree of keys.
+      properties are all prefixed with <literal>/VirtualBox/</literal>
+      and organized into a hierarchical tree of keys.
     </para>
 
@@ -1940,5 +1900,5 @@
 <screen>$ VBoxManage guestproperty enumerate "Windows Vista III"
 VirtualBox Command Line Management Interface Version <replaceable>version-number</replaceable>
-(C) 2005-2018 Oracle Corporation
+(C) 2005-2019 Oracle Corporation
 All rights reserved.
 
@@ -1997,10 +1957,10 @@
     <para>
       To query the value of a single property, use the
-      <computeroutput>get</computeroutput> subcommand as follows:
+      <command>get</command> subcommand as follows:
     </para>
 
 <screen>$ VBoxManage guestproperty get "Windows Vista III" "/VirtualBox/GuestInfo/OS/Product"
 VirtualBox Command Line Management Interface Version <replaceable>version-number</replaceable>
-(C) 2005-2018 Oracle Corporation
+(C) 2005-2019 Oracle Corporation
 All rights reserved.
 
@@ -2009,13 +1969,12 @@
     <para>
       To add or change guest properties from the guest, use the tool
-      <computeroutput>VBoxControl</computeroutput>. This tool is
-      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:
+      <command>VBoxControl</command>. This tool is included in the Guest
+      Additions. When started from a Linux guest, this tool requires
+      root privileges for security reasons.
     </para>
 
 <screen>$ sudo VBoxControl guestproperty enumerate
 VirtualBox Guest Additions Command Line Management Interface Version <replaceable>version-number</replaceable>
-(C) 2005-2018 Oracle Corporation
+(C) 2005-2019 Oracle Corporation
 All rights reserved.
 
@@ -2036,10 +1995,9 @@
 
       <para>
-        The properties
-        <computeroutput>/VirtualBox/HostInfo/VBoxVer</computeroutput>,
-        <computeroutput>/VirtualBox/HostInfo/VBoxVerExt</computeroutput>
-        or <computeroutput>/VirtualBox/HostInfo/VBoxRev</computeroutput>
-        can be waited on to detect that the VM state was restored from
-        saved state or snapshot:
+        The properties <literal>/VirtualBox/HostInfo/VBoxVer</literal>,
+        <literal>/VirtualBox/HostInfo/VBoxVerExt</literal> or
+        <literal>/VirtualBox/HostInfo/VBoxRev</literal> can be waited on
+        to detect that the VM state was restored from saved state or
+        snapshot:
       </para>
 
@@ -2048,7 +2006,7 @@
       <para>
         Similarly the
-        <computeroutput>/VirtualBox/HostInfo/ResumeCounter</computeroutput>
-        can be used to detect that a VM was resumed from the paused
-        state or saved state.
+        <literal>/VirtualBox/HostInfo/ResumeCounter</literal> can be
+        used to detect that a VM was resumed from the paused state or
+        saved state.
       </para>
 
@@ -2070,5 +2028,5 @@
     <figure id="fig-guest-control-fm">
       <title>Guest Control File Manager</title>
-      <mediaobject>
+    <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/guest-fm.png"
@@ -2165,10 +2123,11 @@
 
     <para>
-      The Guest Additions enable starting of applications inside a VM
-      from the host system.
-    </para>
-
-    <para>
-      For this to work, the application needs to be installed inside the
+      The Guest Additions enable starting of applications inside a guest
+      VM from the host system. This feature can be used to automate
+      deployment of software within the guest.
+    </para>
+
+    <para>
+      For this to work, the application needs to be installed on the
       guest. No additional software needs to be installed on the host.
       Additionally, text mode output to stdout and stderr can be shown
@@ -2179,13 +2138,8 @@
 
     <para>
-      This feature can be used to automate deployment of software within
-      the guest.
-    </para>
-
-    <para>
       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.
+      applies for already installed Guest Additions versions. Also,
+      copying files from host to the guest as well as remotely creating
+      guest directories is available.
     </para>
 
@@ -2234,6 +2188,7 @@
               Memory ballooning does not work with large pages enabled.
               To turn off large pages support for a VM, run
-              <computeroutput>VBoxManage modifyvm &lt;VM name&gt;
-              --largepages off</computeroutput>
+              <command>VBoxManage modifyvm
+              <replaceable>vmname</replaceable> --largepages
+              off</command>
             </para>
           </listitem>
@@ -2303,7 +2258,7 @@
       <para>
         By default, no balloon memory is allocated. This is a VM
-        setting, like other <computeroutput>modifyvm</computeroutput>
-        settings, and therefore can only be set while the machine is
-        shut down. See <xref
+        setting, like other <command>modifyvm</command> settings, and
+        therefore can only be set while the machine is shut down. See
+        <xref
       linkend="vboxmanage-modifyvm" />.
       </para>
@@ -2341,14 +2296,13 @@
         efficiently Page Fusion can reduce the amount of host memory
         that is in use. It therefore works best if all VMs on a host run
-        identical operating systems, such as Windows XP Service Pack 2.
-        Instead of having a complete copy of each operating system in
-        each VM, Page Fusion identifies the identical memory pages in
-        use by these operating systems and eliminates the duplicates,
-        sharing host memory between several machines. This is called
-        <emphasis>deduplication</emphasis>. If a VM tries to modify a
-        page that has been shared with other VMs, a new page is
-        allocated again for that VM with a copy of the shared page. This
-        is called <emphasis>copy on write</emphasis>. All this is fully
-        transparent to the virtual machine.
+        identical operating systems. Instead of having a complete copy
+        of each operating system in each VM, Page Fusion identifies the
+        identical memory pages in use by these operating systems and
+        eliminates the duplicates, sharing host memory between several
+        machines. This is called <emphasis>deduplication</emphasis>. If
+        a VM tries to modify a page that has been shared with other VMs,
+        a new page is allocated again for that VM with a copy of the
+        shared page. This is called <emphasis>copy on write</emphasis>.
+        All this is fully transparent to the virtual machine.
       </para>
 
@@ -2411,11 +2365,10 @@
       <para>
         You can observe Page Fusion operation using some metrics.
-        <computeroutput>RAM/VMM/Shared</computeroutput> shows the total
-        amount of fused pages, whereas the per-VM metric
-        <computeroutput>Guest/RAM/Usage/Shared</computeroutput> will
-        return the amount of fused memory for a given VM. See
-        <xref
-        linkend="vboxmanage-metrics" /> for information on
-        how to query metrics.
+        <literal>RAM/VMM/Shared</literal> shows the total amount of
+        fused pages, whereas the per-VM metric
+        <literal>Guest/RAM/Usage/Shared</literal> will return the amount
+        of fused memory for a given VM. See
+        <xref linkend="vboxmanage-metrics" /> for information on how to
+        query metrics.
       </para>
 
Index: /trunk/doc/manual/en_US/user_Installation.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Installation.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_Installation.xml	(revision 82350)
@@ -26,12 +26,10 @@
         For the various versions of Windows that are supported as host
         operating systems, please refer to
-        <xref
-      linkend="hostossupport" />.
-      </para>
-
-      <para>
-        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.
+        <xref linkend="hostossupport" />.
+      </para>
+
+      <para>
+        In addition, Windows Installer must be present on your system.
+        This should be the case for all supported Windows platforms.
       </para>
 
@@ -51,6 +49,5 @@
         <listitem>
           <para>
-            By double-clicking on the executable file, which contains
-            both 32-bit and 64-bit architectures.
+            By double-clicking on the executable file.
           </para>
         </listitem>
@@ -64,10 +61,10 @@
 
           <para>
-            This will extract both installers into a temporary
-            directory, along with .MSI files. Run the following command
-            to to perform the installation:
-          </para>
-
-<screen>msiexec /i VirtualBox-&lt;version&gt;-&lt;revision&gt;-MultiArch_&lt;x86|amd64&gt;.msi</screen>
+            This will extract the installer into a temporary directory,
+            along with the .MSI file. Run the following command to
+            perform the installation:
+          </para>
+
+<screen>msiexec /i VirtualBox-&lt;version&gt;-&lt;revision&gt;-Win.msi</screen>
         </listitem>
 
@@ -114,12 +111,11 @@
           <para>
             See, for example:
-            <ulink
-              url="http://www.python.org/download/windows/">http://www.python.org/download/windows/</ulink>.
+            <ulink url="http://www.python.org/download/windows/" />.
           </para>
 
           <note>
             <para>
-              Python version at least 2.6 is required. Since
-              &product-name; 5.1, Python 3 is also supported.
+              Python version at least 2.6 is required. Python 3 is also
+              supported.
             </para>
           </note>
@@ -137,5 +133,5 @@
 
       <para>
-        The installer will create a &product-name; group in the Windows
+        The installer will create an &product-name; group in the Windows
         <emphasis role="bold">Start</emphasis> menu, which enables you
         to launch the application and access its documentation.
@@ -152,5 +148,5 @@
       <para>
         Then, run either of the following commands on the extracted .MSI
-        files. This will install &product-name; only for the current
+        file. This will install &product-name; only for the current
         user.
       </para>
@@ -158,11 +154,10 @@
 <screen>VirtualBox.exe -msiparams ALLUSERS=2</screen>
 
-<screen>msiexec /i VirtualBox-&lt;version&gt;-MultiArch_&lt;x86|amd64&gt;.msi ALLUSERS=2</screen>
+<screen>msiexec /i VirtualBox-&lt;version&gt;-Win.msi ALLUSERS=2</screen>
 
       <para>
         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 following
+        you can set the optional <literal>ADDLOCAL</literal> parameter
+        to explicitly name the features to be installed. The following
         features are available:
       </para>
@@ -248,11 +243,4 @@
               Python support
             </para>
-
-            <note>
-              <para>
-                Python version at least 2.6 is required. Since
-                &product-name; 5.1, Python 3 is also supported.
-              </para>
-            </note>
           </listitem>
         </varlistentry>
@@ -267,24 +255,26 @@
 <screen>VirtualBox.exe -msiparams ADDLOCAL=VBoxApplication,VBoxUSB</screen>
 
-<screen>msiexec /i VirtualBox-&lt;version&gt;-MultiArch_&lt;x86|amd64&gt;.msi ADDLOCAL=VBoxApplication,VBoxUSB</screen>
+<screen>msiexec /i VirtualBox-&lt;version&gt;-Win.msi ADDLOCAL=VBoxApplication,VBoxUSB</screen>
 
       <para>
         The user is able to choose between NDIS5 and NDIS6 host network
         filter drivers during the installation. This is done using a
-        command line parameter,
-        <computeroutput>NETWORKTYPE</computeroutput>. The NDIS6 driver
-        is default for Windows Vista and later. For older Windows
-        versions, the installer will automatically select the NDIS5
-        driver and this cannot be changed. For Windows Vista and later
-        the user can force an install of the legacy NDIS5 host network
-        filter driver by using
-        <computeroutput>NETWORKTYPE=NDIS5</computeroutput>. For example,
-        to install the NDIS5 driver on Windows 7 use either of the
-        following commands:
+        command line parameter, <literal>NETWORKTYPE</literal>. The
+        NDIS6 driver is the default for most supported Windows hosts.
+        For some legacy Windows versions, the installer will
+        automatically select the NDIS5 driver and this cannot be
+        changed.
+      </para>
+
+      <para>
+        You can force an install of the legacy NDIS5 host network filter
+        driver by specifying <literal>NETWORKTYPE=NDIS5</literal>. For
+        example, to install the NDIS5 driver on Windows 7 use either of
+        the following commands:
       </para>
 
 <screen>VirtualBox.exe -msiparams NETWORKTYPE=NDIS5</screen>
 
-<screen>msiexec /i VirtualBox-&lt;version&gt;-MultiArch_&lt;x86|amd64&gt;.msi NETWORKTYPE=NDIS5</screen>
+<screen>msiexec /i VirtualBox-&lt;version&gt;-Win;.msi NETWORKTYPE=NDIS5</screen>
 
     </sect2>
@@ -326,5 +316,5 @@
 <screen>VirtualBox.exe -msiparams NAME=VALUE [...]</screen>
 
-<screen>msiexec /i VirtualBox-&lt;version&gt;-MultiArch_&lt;x86|amd64&gt;.msi NAME=VALUE [...]</screen>
+<screen>msiexec /i VirtualBox-&lt;version&gt;-Win.msi NAME=VALUE [...]</screen>
 
       <para>
@@ -345,6 +335,6 @@
 
           <para>
-            Set to <computeroutput>1</computeroutput> to enable,
-            <computeroutput>0</computeroutput> to disable. Default is 1.
+            Set to <literal>1</literal> to enable, <literal>0</literal>
+            to disable. Default is 1.
           </para>
         </listitem>
@@ -361,6 +351,6 @@
 
           <para>
-            Set to <computeroutput>1</computeroutput> to enable,
-            <computeroutput>0</computeroutput> to disable. Default is 1.
+            Set to <literal>1</literal> to enable, <literal>0</literal>
+            to disable. Default is 1.
           </para>
         </listitem>
@@ -379,6 +369,6 @@
 
           <para>
-            Set to <computeroutput>1</computeroutput> to enable,
-            <computeroutput>0</computeroutput> to disable. Default is 1.
+            Set to <literal>1</literal> to enable, <literal>0</literal>
+            to disable. Default is 1.
           </para>
         </listitem>
@@ -395,6 +385,6 @@
 
           <para>
-            Set to <computeroutput>1</computeroutput> to enable,
-            <computeroutput>0</computeroutput> to disable. Default is 1.
+            Set to <literal>1</literal> to enable, <literal>0</literal>
+            to disable. Default is 1.
           </para>
         </listitem>
@@ -416,6 +406,6 @@
       <para>
         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:
+        <filename>dmg</filename> disk image file. Perform the following
+        steps to install on a Mac OS X host:
       </para>
 
@@ -424,6 +414,6 @@
         <listitem>
           <para>
-            Double-click on the <computeroutput>dmg</computeroutput>
-            file, to mount the contents.
+            Double-click on the <filename>dmg</filename> file, to mount
+            the contents.
           </para>
         </listitem>
@@ -432,13 +422,20 @@
           <para>
             A window opens, prompting you to double-click on the
-            <computeroutput>VirtualBox.pkg</computeroutput> installer
-            file displayed in that window.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            This will start the installer, which enables you to select
-            where to install &product-name;.
+            <filename>VirtualBox.pkg</filename> installer file displayed
+            in that window.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            This starts the installer, which enables you to select where
+            to install &product-name;.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            An &product-name; icon is added to the
+            <filename>Applications</filename> folder in the Finder.
           </para>
         </listitem>
@@ -446,9 +443,4 @@
       </orderedlist>
 
-      <para>
-        After installation, you can find an &product-name; icon in the
-        "Applications" folder in the Finder.
-      </para>
-
     </sect2>
 
@@ -459,6 +451,6 @@
       <para>
         To uninstall &product-name;, open the disk image
-        <computeroutput>dmg</computeroutput> file and double-click on
-        the uninstall icon shown.
+        <filename>dmg</filename> file and double-click on the uninstall
+        icon shown.
       </para>
 
@@ -475,7 +467,7 @@
 
       <para>
-        Mount the <computeroutput>dmg</computeroutput> disk image file,
-        as described in the installation procedure, or use the following
-        command line:
+        Mount the <filename>dmg</filename> disk image file, as described
+        in the installation procedure, or use the following command
+        line:
       </para>
 
@@ -502,10 +494,9 @@
       <para>
         For the various versions of Linux that are supported as host
-        operating systems, see <xref
-      linkend="hostossupport" />.
-      </para>
-
-      <para>
-        You will need to install the following packages on your Linux
+        operating systems, see <xref linkend="hostossupport" />.
+      </para>
+
+      <para>
+        You may 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 &product-name;.
@@ -523,5 +514,5 @@
           <para>
             SDL 1.2.7 or later. This graphics library is typically
-            called <computeroutput>libsdl</computeroutput> or similar.
+            called <filename>libsdl</filename> or similar.
           </para>
         </listitem>
@@ -533,7 +524,7 @@
           These packages are only required if you want to run the
           &product-name; graphical user interfaces. In particular,
-          <computeroutput>VirtualBox</computeroutput>, the graphical
-          VirtualBox Manager, requires both Qt and SDL. If you only want
-          to run <command>VBoxHeadless</command>, neither Qt nor SDL are
+          <command>VirtualBox</command>, the graphical VirtualBox
+          Manager, requires both Qt and SDL. If you only want to run
+          <command>VBoxHeadless</command>, neither Qt nor SDL are
           required.
         </para>
@@ -544,19 +535,21 @@
     <sect2 id="externalkernelmodules">
 
-      <title>The &product-name; Driver Modules</title>
+      <title>The &product-name; Kernel Modules</title>
 
       <para>
         In order to run other operating systems in virtual machines
         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>
-        which does a lot of that work into the system kernel, which is
-        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
-        they will not start. It also installs network drivers called
-        <computeroutput>vboxnetflt</computeroutput> and
-        <computeroutput>vboxnetadp</computeroutput> which enable virtual
-        machines to make more use of your computer's network
+        integrate very tightly with your system. To do this it installs
+        a driver module called <command>vboxdrv</command> into the
+        system kernel. The kernel is 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 they will not start.
+      </para>
+
+      <para>
+        Network drivers called <command>vboxnetflt</command> and
+        <command>vboxnetadp</command> are also installed. They enable
+        virtual machines to make more use of your computer's network
         capabilities and are needed for any virtual machine networking
         beyond the basic NAT mode.
@@ -565,21 +558,53 @@
       <para>
         Since distributing driver modules separately from the kernel is
-        not something which Linux supports well, the install process
-        creates the modules on the system where they will be used. This
-        usually means first installing software packages from the
-        distribution which are needed for the build process. Normally,
-        these will be the GNU compiler (GCC), GNU Make (make) and
-        packages containing header files for your kernel, as well as
-        making sure that all system updates are installed and that the
-        system is running the most up-to-date kernel included in the
-        distribution. <emphasis>The running kernel and the header files
-        must be updated to matching versions</emphasis>. The following
-        list includes some instructions for common distributions. For
-        most of them you may want to start by finding the version name
+        not something which Linux supports well, the &product-name;
+        install process creates the modules on the system where they
+        will be used. This means that you may need to install some
+        software packages from the distribution which are needed for the
+        build process. Required packages may include the following:
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            GNU compiler (GCC)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            GNU Make (make)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Kernel header files
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <para>
+        Also ensure that all system updates have been installed and that
+        your system is running the most up-to-date kernel for the
+        distribution.
+      </para>
+
+      <note>
+        <para>
+          The running kernel and the kernel header files must be updated
+          to matching versions.
+        </para>
+      </note>
+
+      <para>
+        The following list includes some details of the required files
+        for some common distributions. Start by finding the version name
         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.
+        a terminal. The list assumes that you have not changed too much
+        from the original installation, in particular that you have not
+        installed a different kernel type.
       </para>
 
@@ -590,36 +615,35 @@
             With Debian and Ubuntu-based distributions, you must install
             the correct version of the
-            <computeroutput>linux-headers</computeroutput>, usually
-            whichever of
-            <computeroutput>linux-headers-generic</computeroutput>,
-            <computeroutput>linux-headers-amd64</computeroutput>,
-            <computeroutput>linux-headers-i686</computeroutput> or
-            <computeroutput>linux-headers-i686-pae</computeroutput> best
-            matches the kernel version name. Also, the
-            <computeroutput>linux-kbuild</computeroutput> package if it
-            exists. Basic Ubuntu releases should have the correct
-            packages installed by default.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            On Fedora, Redhat, Oracle Linux and many other RPM-based
+            <filename>linux-headers</filename>, usually whichever of
+            <filename>linux-headers-generic</filename>,
+            <filename>linux-headers-amd64</filename>,
+            <filename>linux-headers-i686</filename> or
+            <filename>linux-headers-i686-pae</filename> best matches the
+            kernel version name. Also, the
+            <filename>linux-kbuild</filename> package if it exists.
+            Basic Ubuntu releases should have the correct packages
+            installed by default.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            On Fedora, Red Hat, Oracle Linux and many other RPM-based
             systems, the kernel version sometimes has a code of letters
             or a word close to the end of the version name. For example
-            "uek" for the Oracle Enterprise kernel or "default" or
-            "desktop" for the standard SUSE kernels. In this case, the
-            package name is
-            <computeroutput>kernel-uek-devel</computeroutput> or
-            equivalent. If there is no such code, it is usually
-            <computeroutput>kernel-devel</computeroutput>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            On older SUSE and openSUSE Linux, you must install the
-            <computeroutput>kernel-source</computeroutput> and
-            <computeroutput>kernel-syms</computeroutput> packages.
+            "uek" for the Oracle Unbreakable Enterprise Kernel or
+            "default" or "desktop" for the standard kernels. In this
+            case, the package name is
+            <filename>kernel-uek-devel</filename> or equivalent. If
+            there is no such code, it is usually
+            <filename>kernel-devel</filename>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            On some SUSE and openSUSE Linux versions, you may need to
+            install the <filename>kernel-source</filename> and
+            <filename>kernel-syms</filename> packages.
           </para>
         </listitem>
@@ -635,4 +659,49 @@
 <screen>rcvboxdrv setup</screen>
 
+      <sect3 id="kernel-modules-efi-secure-boot">
+
+        <title>Kernel Modules and UEFI Secure Boot</title>
+
+        <para>
+          If you are running on a system using UEFI (Unified Extensible
+          Firmware Interface) Secure Boot, you may need to sign the
+          following kernel modules before you can load them:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <command>vboxdrv</command>
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <command>vboxnetadp</command>
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <command>vboxnetflt</command>
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <command>vboxpci</command>
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+        <para>
+          See your system documentation for details of the kernel module
+          signing process.
+        </para>
+
+      </sect3>
+
     </sect2>
 
@@ -645,22 +714,20 @@
         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,
-        such as version 2.5, and other system libraries.
+        alternative generic installer (.run) which you can use on
+        supported Linux distributions.
       </para>
 
       <sect3 id="install-linux-debian-ubuntu">
 
-        <title>Installing &product-name; from a Debian/Ubuntu Package</title>
+        <title>Installing &product-name; from a Debian or Ubuntu Package</title>
 
         <para>
           Download the appropriate package for your distribution. The
-          following examples assume that you are installing to a 32-bit
-          Ubuntu Wily system. Use <computeroutput>dpkg</computeroutput>
-          to install the Debian package,as follows:
-        </para>
-
-<screen>sudo dpkg -i virtualbox-5.0_<replaceable>version-number</replaceable>_Ubuntu_wily_i386.deb</screen>
+          following example assumes that you are installing to a 64-bit
+          Ubuntu Xenial system. Use <command>dpkg</command> to install
+          the Debian package,as follows:
+        </para>
+
+<screen>sudo dpkg -i virtualbox-<replaceable>version-number</replaceable>_Ubuntu_xenial_amd64.deb</screen>
 
         <para>
@@ -669,10 +736,9 @@
           successful you will be shown a warning and the package will be
           left unconfigured. Look at
-          <computeroutput>/var/log/vbox-install.log</computeroutput> to
-          find out why the compilation failed. You may have to install
-          the appropriate Linux kernel headers, see
-          <xref
-        linkend="externalkernelmodules" />. After
-          correcting any problems, run the following command:
+          <filename>/var/log/vbox-install.log</filename> to find out why
+          the compilation failed. You may have to install the
+          appropriate Linux kernel headers, see
+          <xref linkend="externalkernelmodules" />. After correcting any
+          problems, run the following command:
         </para>
 
@@ -687,7 +753,6 @@
           module was successfully built, the installation script will
           attempt to load that module. If this fails, please see
-          <xref
-        linkend="ts_linux-kernelmodule-fails-to-load" />
-          for further information.
+          <xref linkend="ts_linux-kernelmodule-fails-to-load" /> for
+          further information.
         </para>
 
@@ -716,6 +781,6 @@
             <para>
               Unpacks the application files to the target directory
-              <computeroutput>/opt/VirtualBox/</computeroutput>, which
-              cannot be changed.
+              <filename>/opt/VirtualBox/</filename>, which cannot be
+              changed.
             </para>
           </listitem>
@@ -724,14 +789,13 @@
             <para>
               Builds and installs the &product-name; kernel modules:
-              <computeroutput>vboxdrv</computeroutput>,
-              <computeroutput>vboxnetflt</computeroutput>, and
-              <computeroutput>vboxnetadp</computeroutput>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Creates <computeroutput>/sbin/rcvboxdrv</computeroutput>,
-              an init script to start the &product-name; kernel module.
+              <command>vboxdrv</command>, <command>vboxnetflt</command>,
+              and <command>vboxnetadp</command>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Creates <filename>/sbin/rcvboxdrv</filename>, an init
+              script to start the &product-name; kernel module.
             </para>
           </listitem>
@@ -740,14 +804,12 @@
             <para>
               Creates a new system group called
-              <computeroutput>vboxusers</computeroutput>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              Creates symbolic links in
-              <computeroutput>/usr/bin</computeroutput> to a shell
-              script
-              <computeroutput>/opt/VirtualBox/VBox</computeroutput>
+              <literal>vboxusers</literal>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Creates symbolic links in <filename>/usr/bin</filename> to
+              a shell script <filename>/opt/VirtualBox/VBox</filename>
               which does some sanity checks and dispatches to the actual
               executables: <command>VirtualBox</command>,
@@ -761,8 +823,8 @@
             <para>
               Creates
-              <computeroutput>/etc/udev/rules.d/60-vboxdrv.rules</computeroutput>,
-              a description file for udev, if that is present, which
-              makes the USB devices accessible to all users in the
-              <computeroutput>vboxusers</computeroutput> group.
+              <filename>/etc/udev/rules.d/60-vboxdrv.rules</filename>, a
+              description file for udev, if that is present, which makes
+              the USB devices accessible to all users in the
+              <literal>vboxusers</literal> group.
             </para>
           </listitem>
@@ -771,5 +833,5 @@
             <para>
               Writes the installation directory to
-              <computeroutput>/etc/vbox/vbox.cfg</computeroutput>.
+              <filename>/etc/vbox/vbox.cfg</filename>.
             </para>
           </listitem>
@@ -779,7 +841,6 @@
         <para>
           The installer must be executed as root with either
-          <computeroutput>install</computeroutput> or
-          <computeroutput>uninstall</computeroutput> as the first
-          parameter. For example:
+          <literal>install</literal> or <literal>uninstall</literal> as
+          the first parameter. For example:
         </para>
 
@@ -795,7 +856,7 @@
         <para>
           Add every user who needs to access USB devices from a
-          VirtualBox guests to the group
-          <computeroutput>vboxusers</computeroutput>. Either use the GUI
-          user management tools or run the following command as root:
+          VirtualBox guests to the group <literal>vboxusers</literal>.
+          Either use the OS user management tools or run the following
+          command as root:
         </para>
 
@@ -811,7 +872,7 @@
             <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>.
+            <option>-G</option> option. For example: <command>usermod -G
+            <replaceable>group1</replaceable>,<replaceable>group2</replaceable>,vboxusers
+            <replaceable>username</replaceable></command>.
           </para>
         </note>
@@ -833,9 +894,8 @@
         <para>
           This will unpack all the files needed for installation in the
-          directory <computeroutput>install</computeroutput> under the
-          current directory. The &product-name; application files are
-          contained in
-          <computeroutput>VirtualBox.tar.bz2</computeroutput> which you
-          can unpack to any directory on your system. For example:
+          directory <literal>install</literal> under the current
+          directory. The &product-name; application files are contained
+          in <filename>VirtualBox.tar.bz2</filename> which you can
+          unpack to any directory on your system. For example:
         </para>
 
@@ -852,7 +912,6 @@
         <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 use the following
-          command:
+          the <filename>src</filename> directory. To build the module,
+          change to the directory and use the following command:
         </para>
 
@@ -878,8 +937,7 @@
           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>.
+          Linux setup with a <filename>/dev</filename> directory, a
+          system with the now deprecated <command>devfs</command> and a
+          modern Linux system with <command>udev</command>.
         </para>
 
@@ -893,7 +951,7 @@
 
         <para>
-          Note that the <computeroutput>/dev/vboxdrv</computeroutput>
-          kernel module device node must be owned by root:root and must
-          be read/writable only for the user.
+          Note that the <filename>/dev/vboxdrv</filename> kernel module
+          device node must be owned by root:root and must be
+          read/writable only for the user.
         </para>
 
@@ -908,5 +966,5 @@
         <para>
           This example assumes you installed &product-name; to the
-          <computeroutput>/opt/VirtualBox</computeroutput> directory.
+          <filename>/opt/VirtualBox</filename> directory.
         </para>
 
@@ -971,6 +1029,6 @@
           perform this task. To prevent any user interaction during
           installation, default values can be defined. A file
-          <computeroutput>vboxconf</computeroutput> can contain the
-          following debconf settings:
+          <literal>vboxconf</literal> can contain the following debconf
+          settings:
         </para>
 
@@ -1008,7 +1066,6 @@
           The RPM format does not provide a configuration system
           comparable to the debconf system. See
-          <xref
-        linkend="linux_install_opts" /> for how to set
-          some common installation options provided by &product-name;.
+          <xref linkend="linux_install_opts" /> for how to set some
+          common installation options provided by &product-name;.
         </para>
 
@@ -1022,7 +1079,7 @@
           To configure the installation process for .deb and .rpm
           packages, you can create a response file named
-          <computeroutput>/etc/default/virtualbox</computeroutput>. The
-          automatic generation of the udev rule can be prevented with
-          the following setting:
+          <filename>/etc/default/virtualbox</filename>. The automatic
+          generation of the udev rule can be prevented with the
+          following setting:
         </para>
 
@@ -1038,7 +1095,6 @@
         <para>
           If the following line is specified, the package installer will
-          not try to build the <computeroutput>vboxdrv</computeroutput>
-          kernel module if no module fitting the current kernel was
-          found.
+          not try to build the <command>vboxdrv</command> kernel module
+          if no module fitting the current kernel was found.
         </para>
 
@@ -1055,10 +1111,9 @@
       <para>
         The Linux installers create the system user group
-        <computeroutput>vboxusers</computeroutput> during installation.
-        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> through the GUI
-        user/group management or using the following command:
+        <literal>vboxusers</literal> during installation. 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 <literal>vboxusers</literal> either by using the
+        desktop user and group tools, or with the following command:
       </para>
 
@@ -1072,5 +1127,5 @@
 
       <para>
-        The easiest way to start a &product-name; program is by running
+        The easiest way to start an &product-name; program is by running
         the program of your choice (<command>VirtualBox</command>,
         <command>VBoxManage</command>, or
@@ -1084,18 +1139,17 @@
         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. &product-name; consists of a
-        service daemon, <computeroutput>VBoxSVC</computeroutput>, and
-        several application programs. The daemon is automatically
-        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
-        running under the user account as the application. The local
-        domain socket resides in a subdirectory of your system's
-        directory for temporary files called
-        <computeroutput>.vbox-&lt;username&gt;-ipc</computeroutput>. In
-        case of communication problems or server startup problems, you
-        may try to remove this directory.
+        <command>vboxdrv</command> kernel module and inserting it into
+        the Linux kernel. &product-name; consists of a service daemon,
+        <command>VBoxSVC</command>, and several application programs.
+        The daemon is automatically 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 running under the user account
+        as the application. The local domain socket resides in a
+        subdirectory of your system's directory for temporary files
+        called <filename>.vbox-&lt;username&gt;-ipc</filename>. In case
+        of communication problems or server startup problems, you may
+        try to remove this directory.
       </para>
 
@@ -1119,6 +1173,5 @@
     <para>
       For the specific versions of Oracle Solaris that are supported as
-      host operating systems, see <xref
-    linkend="hostossupport" />.
+      host operating systems, see <xref linkend="hostossupport" />.
     </para>
 
@@ -1137,12 +1190,15 @@
       <para>
         &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
+        package. Download the &product-name; SunOS package, which
+        includes the 64-bit version 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
-        <command>zonename</command> command. Execute the following
-        commands:
+        zone</emphasis>. This is because 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
+        <command>zonename</command> command.
+      </para>
+
+      <para>
+        To start installation, run the following commands:
       </para>
 
@@ -1150,7 +1206,6 @@
 
       <para>
-        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:
+        The &product-name; kernel package is integrated into the main
+        package. Install the &product-name; package as follows:
       </para>
 
@@ -1172,7 +1227,7 @@
         Once the postinstall script has been executed your installation
         is now complete. You may now safely delete the uncompressed
-        package and <computeroutput>autoresponse</computeroutput> files
-        from your system. &product-name; is installed in
-        <computeroutput>/opt/VirtualBox</computeroutput>.
+        package and <filename>autoresponse</filename> files from your
+        system. &product-name; is installed in
+        <filename>/opt/VirtualBox</filename>.
       </para>
 
@@ -1192,11 +1247,11 @@
       <para>
         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:
+        <literal>vboxuser</literal> 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 either by using the
+        desktop user and group tools or by running the following command
+        as root:
       </para>
 
@@ -1204,7 +1259,8 @@
 
       <para>
-        Note that adding an active user to that group will require that
-        user to log out and back in again. This should be done manually
-        after successful installation of the package.
+        Note that adding an active user to the
+        <literal>vboxuser</literal> group will require the user to log
+        out and then log in again. This should be done manually after
+        successful installation of the package.
       </para>
 
@@ -1216,5 +1272,5 @@
 
       <para>
-        The easiest way to start a &product-name; program is by running
+        The easiest way to start an &product-name; program is by running
         the program of your choice (<command>VirtualBox</command>,
         <command>VBoxManage</command>, or
@@ -1226,7 +1282,6 @@
       <para>
         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 enter the full
-        path.
+        from <filename>/opt/VirtualBox</filename>. Using the links
+        provided is easier as you do not have to enter the full path.
       </para>
 
@@ -1256,12 +1311,4 @@
       </para>
 
-      <para>
-        If you are uninstalling &product-name; version 3.0 or lower, you
-        need to remove the &product-name; kernel interface package, as
-        follows:
-      </para>
-
-<screen>pkgrm SUNWvboxkern</screen>
-
     </sect2>
 
@@ -1273,13 +1320,12 @@
         To perform a non-interactive installation of &product-name;
         there is a response file named
-        <computeroutput>autoresponse</computeroutput>, that the
-        installer will use for responses to inputs rather than ask them
-        from you.
-      </para>
-
-      <para>
-        Extract the tar.gz package as described in the normal
-        installation instructions. Then open a root terminal session and
-        run the following command:
+        <filename>autoresponse</filename>. The installer uses this for
+        responses to inputs, rather than prompting the user.
+      </para>
+
+      <para>
+        Extract the tar.gz package as described in
+        <xref linkend="install-solaris-performing"/>. Then open a root
+        terminal session and run the following command:
       </para>
 
@@ -1306,16 +1352,15 @@
       </para>
 
-<screen>zonecfg -z vboxzone</screen>
-
-      <para>
-        Replace "vboxzone" with the name of the zone where you intend to
-        run &product-name;.
-      </para>
-
-      <para>
-        Use<computeroutput>zonecfg</computeroutput> to add the
-        <computeroutput>device</computeroutput> resource and
-        <computeroutput>match</computeroutput> properties to the zone,
-        as follows:
+<screen>zonecfg -z <replaceable>vboxzone</replaceable></screen>
+
+      <para>
+        Replace <replaceable>vboxzone</replaceable> with the name of the
+        zone where you intend to run &product-name;.
+      </para>
+
+      <para>
+        Use <command>zonecfg</command> to add the
+        <literal>device</literal> resource and <literal>match</literal>
+        properties to the zone, as follows:
       </para>
 
@@ -1329,18 +1374,15 @@
 
       <para>
-        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 Oracle Solaris 10
-        hosts, due to lack of USB support.
+        On Oracle Solaris 11 or later, you may also add a device for
+        <filename>/dev/vboxusbmon</filename>, similar to that shown
+        above.
       </para>
 
       <para>
         If you are not using sparse root zones, you will need to
-        loopback mount <computeroutput>/opt/VirtualBox</computeroutput>
-        from the global zone into the non-global zone at the same path.
-        This is specified below using the
-        <computeroutput>dir</computeroutput> attribute and the
-        <computeroutput>special</computeroutput> attribute. For example:
+        loopback mount <filename>/opt/VirtualBox</filename> from the
+        global zone into the non-global zone at the same path. This is
+        specified below using the <literal>dir</literal> attribute and
+        the <literal>special</literal> attribute. For example:
       </para>
 
@@ -1353,7 +1395,6 @@
 
       <para>
-        Reboot the zone using <computeroutput>zoneadm</computeroutput>
-        and you should be able to run &product-name; from within the
-        configured zone.
+        Reboot the zone using <command>zoneadm</command> 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 82349)
+++ /trunk/doc/manual/en_US/user_Introduction.xml	(revision 82350)
@@ -184,5 +184,5 @@
           OS).</emphasis> This is the OS that is running inside the
           virtual machine. Theoretically, &product-name; can run any x86
-          OS. such as DOS, Windows, OS/2, FreeBSD, and OpenBSD. But to
+          OS 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
@@ -203,24 +203,24 @@
           is the special environment that &product-name; creates for
           your guest OS while it is running. In other words, you run
-          your guest OS <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 &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 <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.
+          your guest OS <emphasis>in</emphasis> a VM. Normally, a VM is
+          shown as a window on your computer's desktop. Depending on
+          which of the various frontends of &product-name; you use, the
+          VM might be shown in full screen mode or remotely on another
+          computer.
+        </para>
+
+        <para>
+          Internally, &product-name; treats a VM as a set of parameters
+          that specify its behavior. Some parameters describe hardware
+          settings, such as the amount of memory and number of CPUs
+          assigned. Other parameters describe the state information,
+          such as whether the VM is running or saved.
+        </para>
+
+        <para>
+          You can view these VM settings in the VirtualBox Manager
+          window, the <emphasis role="bold">Settings</emphasis> dialog,
+          and by running the <command>VBoxManage</command> command. See
+          <xref linkend="vboxmanage" />.
         </para>
       </listitem>
@@ -287,8 +287,8 @@
 
         <para>
-          For users of &oci; the functionality extends to exporting
-          and importing virtial machines to and from the cloud. This
-          simplifies development of applications and deployment to
-          the production environment. See
+          For users of &oci; the functionality extends to exporting and
+          importing virtual machines to and from the cloud. This
+          simplifies development of applications and deployment to the
+          production environment. See
           <xref linkend="cloud-export-oci"/>.
         </para>
@@ -310,7 +310,8 @@
 
         <para>
-          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" />.
+          In particular, Guest Additions provide for <emphasis>shared
+          folders</emphasis>, which let you access files on the host
+          system from within a guest machine. See
+          <xref linkend="sharedfolders" />.
         </para>
       </listitem>
@@ -319,5 +320,5 @@
         <para>
           <emphasis role="bold">Great hardware support.</emphasis> Among
-          others, &product-name; supports the following:
+          other features, &product-name; supports the following:
         </para>
 
@@ -350,11 +351,11 @@
               devices, among them many devices that are typically
               provided by other virtualization platforms. That includes
-              IDE, SCSI and SATA hard disk controllers, several virtual
+              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 &product-name;.
+              Controller (I/O APIC), which is found in many computer
+              systems. This enables easy cloning of disk images from
+              real machines and importing of third-party virtual
+              machines into &product-name;.
             </para>
           </listitem>
@@ -364,12 +365,13 @@
               <emphasis role="bold">Full ACPI support.</emphasis> The
               Advanced Configuration and Power Interface (ACPI) is fully
-              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 OSes 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.
+              supported by &product-name;. This enables easy cloning of
+              disk 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 OSes
+              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>
           </listitem>
@@ -503,5 +505,5 @@
               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
+              machine which is running remotely on an &product-name; RDP
               server. See <xref linkend="usb-over-rdp" />.
             </para>
@@ -546,5 +548,6 @@
           <listitem>
             <para>
-              Windows 10 Anniversary Update (1607 / 2016 LTSB) build 14393
+              Windows 10 Anniversary Update (1607 / 2016 LTSB) build
+              14393
             </para>
           </listitem>
@@ -564,5 +567,6 @@
           <listitem>
             <para>
-              Windows 10 October 2018 Update (1809 / 2019 LTSC) build 17763
+              Windows 10 October 2018 Update (1809 / 2019 LTSC) build
+              17763
             </para>
           </listitem>
@@ -668,5 +672,5 @@
           <listitem>
             <para>
-              Redhat Enterprise Linux 6, 7 and 8
+              Red Hat Enterprise Linux 6, 7 and 8
             </para>
           </listitem>
@@ -740,14 +744,14 @@
     </para>
 
-  </sect1>
-
-  <sect1 id="hostcpurequirements">
-
-    <title>Host CPU Requirements</title>
-
-    <para>
-      SSE2 is required, starting with &product-name; version 5.2.10 and
-      version 5.1.24.
-    </para>
+    <sect2 id="hostcpurequirements">
+
+      <title>Host CPU Requirements</title>
+
+      <para>
+        SSE2 (Streaming SIMD Extensions 2) support is required for host
+        CPUs.
+      </para>
+
+    </sect2>
 
   </sect1>
@@ -788,6 +792,6 @@
           Oracle provides a single extension pack, available from:
           <ulink
-          url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>.
-          The extension pack provides the following added functionality:
+          url="http://www.virtualbox.org" />. The
+          extension pack provides the following added functionality:
         </para>
 
@@ -829,10 +833,10 @@
           </listitem>
 
-          <listitem>
+<!--   <listitem>
             <para>
               Experimental support for PCI passthrough on Linux hosts.
               See <xref linkend="pcipassthrough" />.
             </para>
-          </listitem>
+          </listitem>-->
 
           <listitem>
@@ -847,7 +851,7 @@
         <para>
           &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 <emphasis role="bold">Network Operations
+          <filename>.vbox-extpack</filename> file name extension. To
+          install an extension, simply double-click on the package file
+          and a <emphasis role="bold">Network Operations
           Manager</emphasis> window is shown to guide you through the
           required steps.
@@ -891,7 +895,7 @@
           <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 <emphasis role="bold">Start</emphasis> menu.
+          On some Windows platforms, you can also enter
+          <command>VirtualBox</command> in the search box of the
+          <emphasis role="bold">Start</emphasis> menu.
         </para>
       </listitem>
@@ -912,7 +916,6 @@
           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.
+          Alternatively, you can enter <command>VirtualBox</command> in
+          a terminal window.
         </para>
       </listitem>
@@ -1002,11 +1005,13 @@
       <listitem>
         <para>
-          The <emphasis role="bold">Name</emphasis> of the VM will later
-          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.
+          The <emphasis role="bold">Name</emphasis> of the VM you choose
+          is shown in the machine list of the VirtualBox Manager window
+          and is also used for the VM's files on disk.
+        </para>
+
+        <para>
+          Be sure to assign each VM an informative name that describes
+          the OS and software running on the VM. For example,
+          <literal>Windows 10 with Visio</literal>.
         </para>
       </listitem>
@@ -1022,12 +1027,11 @@
       <listitem>
         <para>
-          For <emphasis role="bold">Operating System Type</emphasis>
-          select the OS that you want to install later. The supported
-          OSes are grouped. If you want to install something very
-          unusual that is not listed, select
-          <emphasis role="bold">Other</emphasis>. Depending on your
-          selection, &product-name; will enable or disable certain VM
-          settings that your guest OS may require. This is particularly
-          important for 64-bit guests. See
+          For <emphasis role="bold">Operating System Type</emphasis>,
+          select the OS that you want to install. The supported OSes are
+          grouped. If you want to install something very unusual that is
+          not listed, select <emphasis role="bold">Other</emphasis>.
+          Depending on your selection, &product-name; will enable or
+          disable certain VM settings that your guest OS 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.
@@ -1049,31 +1053,31 @@
             Choose this setting carefully. The memory you give to the VM
             will not be available to your host OS while the VM is
-            running, so do not specify more than you can spare. For
-            example, if your host machine has 1 GB of RAM and you enter
-            512 MB as the amount of RAM for a particular virtual
-            machine, while that VM is running, you will only have 512 MB
-            left for all the other software on your host. If you run two
-            VMs at the same time, even more memory will be allocated for
-            the second VM, which may not even be able to start if that
-            memory is not available. On the other hand, you should
-            specify as much as your guest OS and your applications will
-            require to run properly.
+            running, so do not specify more than you can spare.
+          </para>
+
+          <para>
+            For example, if your host machine has 4 GB of RAM and you
+            enter 2048 MB as the amount of RAM for a particular virtual
+            machine, you will only have 2 GB left for all the other
+            software on your host while the VM is running. If you run
+            two VMs at the same time, even more memory will be allocated
+            for the second VM, which may not even be able to start if
+            that memory is not available.
+          </para>
+
+          <para>
+            On the other hand, you should specify as much as your guest
+            OS and your applications will require to run properly. A
+            guest OS may require at least 1 or 2 GB of memory to install
+            and boot up. For best performance, more memory than that may
+            be required.
           </para>
         </caution>
 
         <para>
-          A Windows XP guest will require at least a few hundred MB of
-          RAM to run properly, and Windows Vista will not install with
-          less than 512 MB. If you want to run graphics-intensive
-          applications in your VM, you may require even more RAM.
-        </para>
-
-        <para>
-          As a rule of thumb, if you have 1 GB of RAM or more in your
-          host computer, it is usually safe to allocate 512 MB to each
-          VM. In any case, make sure you always have at least 256 to 512
-          MB of RAM left on your host OS. Otherwise you may cause your
-          host OS to excessively swap out memory to your hard disk,
-          effectively bringing your host system to a standstill.
+          Always ensure that the host OS has enough RAM remaining. If
+          insufficient RAM remains, the system might excessively swap
+          memory to the hard disk, which effectively brings the host
+          system to a standstill.
         </para>
 
@@ -1094,7 +1098,7 @@
           &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
+          a large image file on your physical 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
+          hard disk. This file then represents an entire hard disk, so
           you can even copy it to another host and use it with another
           &product-name; installation.
@@ -1107,5 +1111,5 @@
         <figure id="fig-new-vm-hard-disk">
           <title>Creating a New Virtual Machine: Hard Disk</title>
-          <mediaobject>
+         <mediaobject>
             <imageobject>
               <imagedata align="center" fileref="images/create-vm-2.png"
@@ -1174,17 +1178,16 @@
             <para>
               A <emphasis role="bold">dynamically allocated
-              file</emphasis> will only grow in size when the guest
-              actually stores data on its virtual hard disk. It will
-              therefore initially be small on the host hard drive and
-              only later grow to the size specified as it is filled with
-              data.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              A <emphasis role="bold">fixed-size file</emphasis> will
-              immediately occupy the file specified, even if only a
-              fraction of the virtual hard disk space is actually in
+              file</emphasis> only grows in size when the guest actually
+              stores data on its virtual hard disk. Therefore, this file
+              is small initially. As the drive is filled with data, the
+              file grows to the specified size.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              A <emphasis role="bold">fixed-size file</emphasis>
+              immediately occupies the file specified, even if only a
+              fraction of that virtual hard disk space is actually in
               use. While occupying much more space, a fixed-size file
               incurs less overhead and is therefore slightly faster than
@@ -1201,11 +1204,12 @@
 
         <para>
-          To prevent your physical hard disk from running full,
-          &product-name; limits the size of the image file. Still, it
-          needs to be large enough to hold the contents of your OS 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"/>.
+          To prevent your physical hard disk (host OS) from filling up,
+          &product-name; limits the size of the image file. But the
+          image file must be large enough to hold the contents of the
+          guest OS and the applications you want to install. For a
+          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-modifymedium"/>.
         </para>
 
@@ -1275,9 +1279,9 @@
       <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.
+          Go to the <filename>VirtualBox VMs</filename> 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 <filename>.vbox</filename> file
+          extension.
         </para>
       </listitem>
@@ -1386,11 +1390,11 @@
 
       <para>
-        Otherwise, if the virtual machine only sees standard PS/2 mouse
-        and keyboard devices, since the OS in the virtual machine does
-        not know that it is not running on a real computer, it expects
-        to have exclusive control over your keyboard and mouse. But
-        unless you are running the VM in full screen mode, your VM needs
-        to share keyboard and mouse with other applications and possibly
-        other VMs on your host.
+        Otherwise, if the virtual machine detects only standard PS/2
+        mouse and keyboard devices, since the OS in the virtual machine
+        does not know that it is not running on a real computer, it
+        expects to have exclusive control over your keyboard and mouse.
+        But unless you are running the VM in full screen mode, your VM
+        needs to share keyboard and mouse with other applications and
+        possibly other VMs on your host.
       </para>
 
@@ -1450,15 +1454,14 @@
           <para>
             Note that while the VM owns the keyboard, some key
-            sequences, such as Alt-Tab, will no longer be seen by the
+            sequences, such as Alt+Tab, will no longer be seen by the
             host, but will go to the guest instead. After you press the
             Host key to reenable the host keyboard, all key presses will
-            go through the host again, so that sequences such as Alt-Tab
+            go through the host again, so that sequences such as Alt+Tab
             will no longer reach the guest. For technical reasons it may
             not be possible for the VM to get all keyboard input even
             when it does own the keyboard. Examples of this are the
-            Ctrl-Alt-Del sequence on Windows hosts or single keys
-            grabbed by other applications on X11 hosts like the GNOME
-            desktop's "Control key highlights mouse pointer"
-            functionality.
+            Ctrl+Alt+Del sequence on Windows hosts or single keys
+            grabbed by other applications on X11 hosts such as the GNOME
+            desktop Locate Pointer feature.
           </para>
         </listitem>
@@ -1488,10 +1491,10 @@
 
       <para>
-        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. See
+        As this behavior is inconvenient, &product-name; provides a set
+        of tools and device drivers for guest systems called the
+        &product-name; Guest Additions. These tools make VM keyboard and
+        mouse operations much more seamless. Most importantly, the Guest
+        Additions suppress the second "guest" mouse pointer and make
+        your host mouse pointer work directly in the guest. See
         <xref linkend="guestadditions" />.
       </para>
@@ -1504,10 +1507,9 @@
 
       <para>
-        OSes expect certain key combinations to initiate certain
-        procedures. Some of these key combinations may be difficult to
-        enter into a virtual machine, as there are three candidates as
-        to who receives keyboard input: the host OS, &product-name;, or
-        the guest OS. Which of these three receives keypresses depends
-        on a number of factors, including the key itself.
+        Some OSes expect certain key combinations to initiate certain
+        procedures. The key combinations that you type into a VM might
+        target the host OS, the &product-name; software, or the guest
+        OS. The recipient of these keypresses depends on a number of
+        factors, including the key combination itself.
       </para>
 
@@ -1517,11 +1519,10 @@
           <para>
             Host OSes reserve certain key combinations for themselves.
-            For example, it is impossible to enter the
+            For example, you cannot use the
             <emphasis role="bold">Ctrl+Alt+Delete</emphasis> combination
-            if you want to reboot the guest OS 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>.
+            to reboot the guest OS in your VM because this key
+            combination is usually hard-wired into the host OS. So, even
+            though both the Windows and Linux OSes intercept this key
+            combination, only the host OS would be rebooted.
           </para>
 
@@ -1543,7 +1544,7 @@
             where Fx is one of the function keys from F1 to F12,
             normally enables you to switch between virtual terminals. As
-            with Ctrl+Alt+Delete, these combinations are intercepted by
-            the host OS and therefore always switch terminals on the
-            <emphasis>host</emphasis>.
+            with <emphasis role="bold">Ctrl+Alt+Delete</emphasis>, these
+            combinations are intercepted by the host OS and therefore
+            always switch terminals on the <emphasis>host</emphasis>.
           </para>
 
@@ -1563,7 +1564,8 @@
                 virtual machine window. This menu includes the settings
                 <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 Oracle
-                Solaris guests, however.
+                and <emphasis role="bold">Insert
+                Ctrl+Alt+Backspace</emphasis>. However, the latter
+                setting affects only Linux guests or Oracle Solaris
+                guests.
               </para>
 
@@ -1576,8 +1578,7 @@
             <listitem>
               <para>
-                Use special key combinations with the Host key, normally
-                the right Control key. &product-name; will then
-                translate these key combinations for the virtual
-                machine:
+                Use special key combinations with the Host key, which is
+                normally the right Control key. &product-name; then
+                translates the following key combinations for the VM:
               </para>
 
@@ -1586,6 +1587,7 @@
                 <listitem>
                   <para>
-                    <emphasis role="bold">Host key + Del</emphasis> to
-                    send Ctrl+Alt+Del to reboot the guest.
+                    <emphasis role="bold">Host key + Del</emphasis>
+                    sends <emphasis role="bold">Ctrl+Alt+Del</emphasis>
+                    to reboot the guest OS.
                   </para>
                 </listitem>
@@ -1594,7 +1596,8 @@
                   <para>
                     <emphasis role="bold">Host key +
-                    Backspace</emphasis> to send Ctrl+Alt+Backspace to
-                    restart the graphical user interface of a Linux or
-                    Oracle Solaris guest.
+                    Backspace</emphasis> sends
+                    <emphasis role="bold">Ctrl+Alt+Backspace</emphasis>
+                    to restart the graphical user interface of a Linux
+                    or Oracle Solaris guest.
                   </para>
                 </listitem>
@@ -1603,7 +1606,8 @@
                   <para>
                     <emphasis role="bold">Host key + Function
-                    key</emphasis>. For example, to simulate Ctrl+Alt+Fx
-                    to switch between virtual terminals in a Linux
-                    guest.
+                    key</emphasis>. For example, use this key
+                    combination to simulate
+                    <emphasis role="bold">Ctrl+Alt+Fx</emphasis> to
+                    switch between virtual terminals in a Linux guest.
                   </para>
                 </listitem>
@@ -1618,5 +1622,5 @@
           <para>
             For some other keyboard combinations such as
-            <emphasis role="bold">Alt-Tab</emphasis> to switch between
+            <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
@@ -1626,4 +1630,11 @@
             <emphasis role="bold">Preferences</emphasis>,
             <emphasis role="bold">Input</emphasis>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            A soft keyboard can be used to input key combinations in the
+            guest. See <xref linkend="soft-keyb"/>.
           </para>
         </listitem>
@@ -1675,6 +1686,6 @@
 
       <para>
-        You can resize the virtual machine's window when it is running.
-        In that case, one of the following things will happen:
+        You can resize the VM's window while that VM is running. When
+        you do, the window is scaled as follows:
       </para>
 
@@ -1795,7 +1806,6 @@
             This will send an ACPI shutdown signal to the virtual
             machine, which has the same effect as if you had pressed the
-            power button on a real computer. So long as the VM is
-            running a fairly modern OS, this should trigger a proper
-            shutdown mechanism from within the VM.
+            power button on a real computer. This should trigger a
+            proper shutdown mechanism from within the VM.
           </para>
         </listitem>
@@ -2085,5 +2095,5 @@
           <figure id="fig-snapshots-list">
             <title>Snapshots List For a Virtual Machine</title>
-            <mediaobject>
+           <mediaobject>
               <imageobject>
                 <imagedata align="center" fileref="images/snapshots-1.png"
@@ -2258,6 +2268,5 @@
           <para>
             The memory state file can be as large as the memory size of
-            the virtual machine and will therefore occupy quite some
-            disk space as well.
+            the VM and will therefore occupy considerable disk space.
           </para>
         </listitem>
@@ -2557,6 +2566,34 @@
         <para>
           <emphasis role="bold">Cloud service formats.</emphasis> Export
-          to cloud services such as &oci; is supported. Import is not
-          supported. See <xref linkend="cloud-export-oci"/>.
+          to and import from cloud services such as &oci; is supported.
+          See the following topics:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <xref linkend="cloud-export-oci"/>
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <xref linkend="cloud-import-oci"/>
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+        <para>
+          Before using &product-name; with &oci; there are some initial
+          configuration steps you need to consider. See
+          <xref linkend="cloud-integration-steps"/>.
+        </para>
+
+        <para>
+          &product-name; can also be used to create new instances from a
+          custom image stored on &oci;. See
+          <xref linkend="cloud-new-vm"/>
         </para>
       </listitem>
@@ -2592,6 +2629,5 @@
           &product-name; supports all appliances created by other
           virtualization software. For a list of known limitations, see
-          <xref
-        linkend="KnownIssues" />.
+          <xref linkend="KnownIssues" />.
         </para>
       </note>
@@ -2609,7 +2645,7 @@
             <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.
+            <filename>.ovf</filename> extension. These files must then
+            reside in the same directory for &product-name; to be able
+            to import them.
           </para>
         </listitem>
@@ -2619,8 +2655,8 @@
             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.
+            <filename>.ova</filename> 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>
@@ -2666,13 +2702,12 @@
           <para>
             Select <emphasis role="bold">File</emphasis>,
-            <emphasis
-            role="bold">Import
-            Appliance</emphasis> from the VirtualBox Manager window.
+            <emphasis role="bold">Import Appliance</emphasis> from the
+            VirtualBox Manager window.
           </para>
 
           <para>
             From the file dialog, go to the file with either the
-            <computeroutput>.ovf</computeroutput> or the
-            <computeroutput>.ova</computeroutput> file extension.
+            <filename>.ovf</filename> or the <filename>.ova</filename>
+            file extension.
           </para>
 
@@ -2742,5 +2777,5 @@
                 <emphasis role="bold">Import Hard Drives as
                 VDI:</emphasis> Imports hard drives in the VDI format
-                rather that in the defalut VMDK format.
+                rather than in the default VMDK format.
               </para>
             </listitem>
@@ -2828,5 +2863,6 @@
               <para>
                 The <emphasis role="bold">&oci;</emphasis> value exports
-                export to &oci;. See <xref linkend="cloud-export-oci"/>.
+                the appliance to &oci;. See
+                <xref linkend="cloud-export-oci"/>.
               </para>
             </listitem>
@@ -2902,15 +2938,12 @@
     </sect2>
 
-    <sect2 id="cloud-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 can export a VM to &oci;, ensure that you perform the
-        following configuration steps:
+    <sect2 id="cloud-integration-steps">
+
+      <title>Preparing for &oci; Integration</title>
+
+      <para>
+        There are some common configuration steps you need to take
+        before using &product-name; to integrate with your &oci;
+        account.
       </para>
 
@@ -2919,6 +2952,7 @@
         <listitem>
           <para>
-            Generate an API signing key pair that is used for API
-            requests to &oci;.
+            <emphasis role="bold">Create a key pair.</emphasis> Generate
+            an API signing key pair that is used for API requests to
+            &oci;.
           </para>
 
@@ -2928,7 +2962,6 @@
               <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
+                <filename>.oci</filename> folder in your home directory.
+                For example, <filename>~/.oci</filename> on a Linux
                 system.
               </para>
@@ -2950,17 +2983,14 @@
 
           <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
+            <ulink url="https://docs.cloud.oracle.com/iaas/Content/API/Concepts/apisigningkey.htm#How" />
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Create a cloud profile.</emphasis> 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>
@@ -2970,5 +3000,5 @@
             <listitem>
               <para>
-                Automatically by using the <emphasis role="bold">Cloud
+                Automatically, by using the <emphasis role="bold">Cloud
                 Profile Manager</emphasis>. See
                 <xref linkend="ovf-cloud-profile-manager"/>.
@@ -2978,9 +3008,16 @@
             <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>
+                Automatically, by using the <command>VBoxManage
+                cloudprofile</command> command. See
+                <xref linkend="vboxmanage-cloudprofile"/>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Manually, by creating an <filename>oci_config</filename>
+                file in your &product-name; global configuration
+                directory. For example, this is
+                <filename>$HOME/.config/VirtualBox/oci_config</filename>
                 on a Linux host.
               </para>
@@ -2989,9 +3026,8 @@
             <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.
+                Manually, by creating a <filename>config</filename> file
+                in your &oci; configuration directory. For example, this
+                is <filename>$HOME/.oci/config</filename> on a Linux
+                host.
               </para>
 
@@ -3003,8 +3039,8 @@
               <para>
                 &product-name; automatically uses the
-                <computeroutput>config</computeroutput> file if no cloud
-                profile file is present in your global configuration
-                directory. Alternatively, you can import this file
-                manually into the Cloud Profile Manager.
+                <filename>config</filename> file if no cloud profile
+                file is present in your global configuration directory.
+                Alternatively, you can import this file manually into
+                the Cloud Profile Manager.
               </para>
             </listitem>
@@ -3018,16 +3054,49 @@
 
           <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 subnets that are used by source VMs are
-            available in the target compartment on the cloud service.
+            <ulink url="https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm" />
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Custom Linux images.</emphasis> To
+            export a custom Linux image, prepare the VM as described
+            here:
+          </para>
+
+          <para>
+            <ulink url="https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/importingcustomimagelinux.htm" />
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Subnets.</emphasis> When exporting a
+            VM to cloud, ensure that the subnets that are used by source
+            VMs are available in the target compartment on the cloud
+            service.
           </para>
         </listitem>
 
       </itemizedlist>
+
+    </sect2>
+
+    <sect2 id="cloud-export-oci">
+
+      <title>Exporting an Appliance to &oci;</title>
+
+      <para>
+        &product-name; supports the export of VMs to an &oci; service.
+        The exported VM is stored on &oci; as a custom image. You can
+        configure whether a cloud instance is created and started after
+        the export process has completed.
+      </para>
+
+      <para>
+        Before you can export a VM to &oci; ensure that you have done
+        the required preconfiguration tasks, as described in
+        <xref linkend="cloud-integration-steps"/>.
+      </para>
 
       <para>
@@ -3074,5 +3143,6 @@
 
           <figure id="fig-export-appliance-oci">
-            <title>Appliance Settings Screen, Showing Cloud Profile Settings</title>
+            <title>Appliance Settings Screen, Showing Cloud Profile and Machine Creation
+              Settings</title>
             <mediaobject>
               <imageobject>
@@ -3081,42 +3151,116 @@
               </imageobject>
             </mediaobject>
+
           </figure>
+
+          <para>
+            In the <emphasis role="bold">Machine Creation</emphasis>
+            field, select an option to configure settings for a cloud
+            instance created when you export to &oci;. The options
+            enable you to do one of the following:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                Configure settings for the cloud instance
+                <emphasis>after</emphasis> you have finished exporting
+                the VM.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Configure settings for the cloud instance
+                <emphasis>before</emphasis> you start to export the VM.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Do not create a cloud instance when you export the VM.
+              </para>
+            </listitem>
+
+          </itemizedlist>
 
           <para>
             Click <emphasis role="bold">Next</emphasis> to make an API
             request to the &oci; service and open the
-            <emphasis
-            role="bold">Virtual System
-            Settings</emphasis> screen.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Optionally edit settings used for the virtual machine on
-            &oci;.
-          </para>
-
-          <para>
-            For example, you can edit the Disk Size and Shape used for
-            the VM instance.
-          </para>
+            <emphasis role="bold">Virtual System Settings</emphasis>
+            screen.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Optionally edit storage settings used for the exported
+            virtual machine in &oci;. You can change the following
+            settings:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                The name of the bucket used to store the exported files.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Whether to store the custom image in &oci;.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The name for the custom image in &oci;.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The launch mode for the custom image.
+              </para>
+
+              <para>
+                <emphasis role="bold">Paravirtualized</emphasis> mode
+                gives improved performance and should be suitable for
+                most &product-name; VMs.
+              </para>
+
+              <para>
+                <emphasis role="bold">Emulated</emphasis> mode is
+                suitable for legacy OS images.
+              </para>
+            </listitem>
+
+          </itemizedlist>
 
           <para>
             Click <emphasis role="bold">Export</emphasis> to export the
-            VMs to the cloud service.
-          </para>
-
-          <para>
-            The VMs are uploaded to &oci;.
-          </para>
-
-          <para>
-            Instances are created for the uploaded VMs.
-          </para>
-
-          <para>
-            By default, the VM instance is started after upload to
-            &oci;.
+            VM to &oci;.
+          </para>
+
+          <para>
+            Depending on the selection in the
+            <emphasis role="bold">Machine Creation</emphasis> field, the
+            <emphasis role="bold">Cloud Virtual Machine
+            Settings</emphasis> screen may be displayed before or after
+            export. This screen enables you to configure settings for
+            the cloud instance, such as Shape and Disk Size.
+          </para>
+
+          <para>
+            Click <emphasis role="bold">Create</emphasis>. The VM is
+            exported to &oci;.
+          </para>
+
+          <para>
+            Depending on the <emphasis role="bold">Machine
+            Creation</emphasis> setting, a cloud instance may be started
+            after upload to &oci; is completed.
           </para>
         </listitem>
@@ -3140,123 +3284,16 @@
     <sect2 id="cloud-import-oci">
 
-      <title>Importing an instance from &oci;</title>
-
-      <para>
-        &product-name; supports the import of cloud instance from an &oci; service.
-      </para>
-
-      <para>
-        Before you can import an instance from &oci;, ensure that you perform the
-        following configuration steps:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            Generate an API signing key pair that 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>
-                Upload the public key of the key pair to the cloud
-                service.
-              </para>
-            </listitem>
-
-          </itemizedlist>
-
-          <para>
-            For step-by-step instructions for creating and uploading an
-            API signing key for &oci;, see:
-          </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 by 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; automatically uses the
-                <computeroutput>config</computeroutput> file if no cloud
-                profile file is present in your global configuration
-                directory. Alternatively, you can import this file
-                manually into the Cloud Profile Manager.
-              </para>
-            </listitem>
-
-          </itemizedlist>
-
-          <para>
-            For more information about the cloud profile settings used
-            by &oci; see:
-          </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>
-
-      </itemizedlist>
+      <title>Importing an Instance from &oci;</title>
+
+      <para>
+        &product-name; supports the import of cloud instances from an
+        &oci; service.
+      </para>
+
+      <para>
+        Before you can import an instance from &oci; ensure that you
+        have done the required preconfiguration tasks, as described in
+        <xref linkend="cloud-integration-steps"/>.
+      </para>
 
       <para>
@@ -3270,5 +3307,11 @@
             Select <emphasis role="bold">File</emphasis>,
             <emphasis role="bold">Import Appliance</emphasis> to open
-            the <emphasis role="bold">Import Virtual Appliance</emphasis> wizard.
+            the <emphasis role="bold">Import Virtual
+            Appliance</emphasis> wizard.
+          </para>
+
+          <para>
+            In the <emphasis role="bold">Source</emphasis> drop-down
+            list, select <emphasis role="bold">&oci;</emphasis>.
           </para>
 
@@ -3289,24 +3332,37 @@
 
           <para>
-            Choose the interesting cloud instance from the list <emphasis role="bold">Machines</emphasis>.
-          </para>
-
-          <para>
-            Click <emphasis role="bold">Next</emphasis>
-            to make an API request to the &oci; service and open the <emphasis role="bold">Appliance Settings</emphasis> screen.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Optionally edit settings used for new local virtual machine.
-          </para>
-
-          <para>
-            For example, you can edit the VM name, CPUs, RAM memory, OS type, OS version.
-          </para>
-
-          <para>
-            Click <emphasis role="bold">Import</emphasis> to import the instance from the cloud service.
+            Choose the required cloud instance from the list in the
+            <emphasis role="bold">Machines</emphasis> field.
+          </para>
+
+          <para>
+            Click <emphasis role="bold">Next</emphasis> to make an API
+            request to the &oci; service and open the
+            <emphasis role="bold">Appliance Settings</emphasis> screen.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Optionally edit settings for the new local virtual machine.
+          </para>
+
+          <para>
+            For example, you can edit the VM name and description.
+          </para>
+
+          <figure id="fig-import-instance-oci">
+            <title>Import Cloud Instance Screen, Showing Profile Settings and VM Settings</title>
+           <mediaobject>
+              <imageobject>
+                <imagedata align="center" fileref="images/import-instance.png"
+                  width="12cm" />
+              </imageobject>
+           </mediaobject>
+          </figure>
+
+          <para>
+            Click <emphasis role="bold">Import</emphasis> to import the
+            instance from the cloud service.
           </para>
         </listitem>
@@ -3319,45 +3375,4 @@
 
       </orderedlist>
-
-      <para>
-        General OCI import logic:
-      </para>
-      <orderedlist>
-        <listitem>
-          <para>
-            A custom image created from the boot volume of the instance.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The custom image exported into OCI object and stored in the OCI Object Storage in the bucket pointed by user.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The OCI object is downloaded to the local host. OCI object is a TAR archive which contains a boot volume of instance
-            in QCOW2 format and JSON file with some meta-data related to the instance.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The boot volume of instance is extracted from the archive and new VMDK image is created by conversion the boot volume
-            into the VMDK format. The VMDK image is registered in the VirtualBox.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            New VM is created with the VMDK image created on the previous step.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The downloaded OCI object (TAR archive) is deleted after successful import.
-          </para>
-        </listitem>
-      </orderedlist>
-      <para>
-        By default, the VM isn't launched after import from &oci;.
-      </para>
 
       <para>
@@ -3366,4 +3381,71 @@
         <xref linkend="vboxmanage-import-cloud"/>.
       </para>
+
+      <simplesect id="import-instance-sequence">
+
+        <title>Importing an Instance: Overview of Events</title>
+
+        <para>
+          The following describes the sequence of events when you import
+          an instance from &oci;.
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              A custom image is created from the boot volume of the
+              instance.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              The custom image is exported to an &oci; object and is
+              stored using Object Storage in the bucket specified by the
+              user.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              The &oci; object is downloaded to the local host. The
+              object is a TAR archive which contains a boot volume of
+              the instance in QCOW2 format and a JSON file containing
+              metadata related to the instance.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              The boot volume of the instance is extracted from the
+              archive and a new VMDK image is created by converting the
+              boot volume into the VMDK format. The VMDK image is
+              registered with &product-name;.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              A new VM is created using the VMDK image for the cloud
+              instance.
+            </para>
+
+            <para>
+              By default, the new VM is not started after import from
+              &oci;.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              The downloaded TAR archive is deleted after a successful
+              import.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+      </simplesect>
 
     </sect2>
@@ -3397,12 +3479,12 @@
 
       <para>
-        Use the Cloud Profile Manager to create a new cloud profile
-        automatically. Or, create a cloud profile by importing settings
-        from your &oci; configuration file into the Cloud Profile
-        Manager.
-      </para>
-
-      <para>
-        Perform the following steps to create a new cloud profile:
+        You can use the Cloud Profile Manager to create a new cloud
+        profile automatically or to create a cloud profile by importing
+        settings from your &oci; configuration file.
+      </para>
+
+      <para>
+        Perform the following steps to create a new cloud profile
+        automatically:
       </para>
 
@@ -3484,6 +3566,6 @@
           <para>
             The cloud profile settings are saved in the
-            <computeroutput>oci_config</computeroutput> file in your
-            &product-name; global settings directory.
+            <filename>oci_config</filename> file in your &product-name;
+            global settings directory.
           </para>
         </listitem>
@@ -3500,9 +3582,7 @@
         <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.
+            Ensure that a <filename>config</filename> file is present in
+            your &oci; configuration directory. For example, this is
+            <filename>$HOME/.oci/config</filename> on a Linux host.
           </para>
         </listitem>
@@ -3530,6 +3610,6 @@
           <para>
             Your cloud profile settings are saved to the
-            <computeroutput>oci_config</computeroutput> file in your
-            &product-name; global settings directory.
+            <filename>oci_config</filename> file in your &product-name;
+            global settings directory.
           </para>
         </listitem>
@@ -3554,4 +3634,121 @@
 
       </orderedlist>
+
+    </sect2>
+
+    <sect2 id="cloud-new-vm">
+
+      <title>Creating New Cloud Instances from a Custom Image</title>
+
+      <para>
+        You can use &product-name; to create new instances from a custom
+        image on your cloud service.
+      </para>
+
+      <para>
+        <xref linkend="cloud-export-oci"/> describes how to create a
+        custom image when you are exporting a VM to &oci;. Using a
+        custom image means that you can quickly create cloud instances
+        without having to upload your image to the cloud service every
+        time.
+      </para>
+
+      <para>
+        Before you can create a new cloud instance in &oci; ensure that
+        you have done the required preconfiguration tasks, as described
+        in <xref linkend="cloud-integration-steps"/>.
+      </para>
+
+      <para>
+        Perform the following steps to create a new cloud instance on
+        &oci;:
+      </para>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Select <emphasis role="bold">File</emphasis>,
+            <emphasis role="bold">New Cloud VM</emphasis> to open the
+            <emphasis role="bold">Create Cloud Virtual
+            Machine</emphasis> wizard.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            From the <emphasis role="bold">Destination</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>
+            You can set up &oci; accounts by using the Cloud Profile
+            Manager.
+          </para>
+
+          <para>
+            The list after the <emphasis role="bold">Account</emphasis>
+            field shows the profile settings for your cloud account.
+          </para>
+
+          <para>
+            In the <emphasis role="bold">Images</emphasis> list, select
+            from the custom images available on &oci;.
+          </para>
+
+          <figure id="fig-newcloudvm">
+            <title>New Cloud VM Wizard, Showing List of Custom Images</title>
+           <mediaobject>
+              <imageobject>
+                <imagedata align="center" fileref="images/newcloudvm.png"
+                  width="12cm" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+
+          <para>
+            Click <emphasis role="bold">Next</emphasis> to make an API
+            request to the &oci; service and open the
+            <emphasis role="bold">Cloud Virtual Machine
+            Settings</emphasis> screen.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Optionally edit settings used for the instance on &oci;.
+          </para>
+
+          <para>
+            For example, you can edit the Disk Size and Shape used for
+            the VM instance and the networking configuration.
+          </para>
+
+          <para>
+            Click <emphasis role="bold">Create</emphasis> to create the
+            new cloud instance.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Monitor the instance creation process by using the &oci;
+            Console.
+          </para>
+        </listitem>
+
+      </orderedlist>
+
+      <para>
+        You can also use the <command>VBoxManage cloud
+        instance</command> command to create and manage instances on a
+        cloud service. See <xref linkend="vboxmanage-cloudinstance"/>.
+      </para>
 
     </sect2>
@@ -3582,5 +3779,5 @@
         <para>
           <emphasis role="bold">General.</emphasis> Enables the user to
-          specify the default folder/directory for VM files, and the
+          specify the default folder or directory for VM files, and the
           VRDP Authentication Library.
         </para>
@@ -3590,8 +3787,8 @@
         <para>
           <emphasis role="bold">Input.</emphasis> Enables the user to
-          specify the Host key. It identifies the key that toggles
-          whether the cursor is in the focus of the VM or the Host OS
-          windows, see <xref linkend="keyb_mouse_normal"/>, and which is
-          also used to trigger certain VM actions, see
+          specify the Host key. This is the key that toggles whether the
+          cursor is in the focus of the VM or the Host OS windows, see
+          <xref linkend="keyb_mouse_normal"/>. The Host key is also used
+          to trigger certain VM actions, see
           <xref linkend="specialcharacters"/>.
         </para>
@@ -3715,3 +3912,277 @@
   </sect1>
 
+  <sect1 id="soft-keyb">
+
+    <title>Soft Keyboard</title>
+
+    <para>
+      &product-name; provides a <emphasis>soft keyboard</emphasis> that
+      enables you to input keyboard characters on the guest. A soft
+      keyboard is an on-screen keyboard that can be used as an
+      alternative to a physical keyboard. See
+      <xref linkend="soft-keyb-using"/> for details of how to use the
+      soft keyboard.
+    </para>
+
+    <caution>
+      <para>
+        For best results, ensure that the keyboard layout configured on
+        the guest OS matches the keyboard layout used by the soft
+        keyboard. &product-name; does not do this automatically.
+      </para>
+    </caution>
+
+    <figure id="fig-soft-keyb">
+      <title>Soft Keyboard in a Guest Virtual Machine</title>
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="images/softkeybd.png"
+                   width="14cm" />
+      </imageobject>
+    </mediaobject>
+    </figure>
+
+    <para>
+      The soft keyboard can be used in the following scenarios:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          When the physical keyboard on the host is not the same as the
+          keyboard layout configured on the guest. For example, if the
+          guest is configured to use an international keyboard, but the
+          host keyboard is US English.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          To send special key combinations to the guest. Note that some
+          common key combinations are also available in the
+          <emphasis role="bold">Input</emphasis>,
+          <emphasis role="bold">Keyboard</emphasis> menu of the guest VM
+          window. See <xref linkend="specialcharacters"/>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          For guests in kiosk mode, where a physical keyboard is not
+          present.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          When using nested virtualization, the soft keyboard provides a
+          method of sending key presses to a guest.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>
+      By default, the soft keyboard includes some common international
+      keyboard layouts. You can copy and modify these to meet your own
+      requirements. See <xref linkend="soft-keyb-custom"/>.
+    </para>
+
+    <sect2 id="soft-keyb-using">
+
+      <title>Using the Soft Keyboard</title>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Display the soft keyboard.
+          </para>
+
+          <para>
+            In the guest VM window, select
+            <emphasis role="bold">Input</emphasis>,
+            <emphasis role="bold">Keyboard</emphasis>,
+            <emphasis role="bold">Soft Keyboard</emphasis>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Select the required keyboard layout.
+          </para>
+
+          <para>
+            The name of the current keyboard layout is displayed in the
+            task bar of the soft keyboard window. This is the previous
+            keyboard layout that was used.
+          </para>
+
+          <para>
+            Click the <emphasis role="bold">Layout List</emphasis> icon
+            in the task bar of the soft keyboard window. The
+            <emphasis role="bold">Layout List</emphasis> window is
+            displayed.
+          </para>
+
+          <para>
+            Select the required keyboard layout from the entries in the
+            <emphasis role="bold">Layout List</emphasis> window.
+          </para>
+
+          <para>
+            The keyboard display graphic is updated to show the
+            available input keys.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Use the soft keyboard to enter keyboard characters on the
+            guest.
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                Modifier keys such as Shift, Ctrl, and Alt are available
+                on the soft keyboard. Click once to select the modifier
+                key, click twice to lock the modifier key.
+              </para>
+
+              <para>
+                The <emphasis role="bold">Reset the Keyboard and Release
+                All Keys</emphasis> icon can be used to release all
+                pressed modifier keys, both on the host and the guest.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                To change the look of the soft keyboard, click the
+                <emphasis role="bold">Settings</emphasis> icon in the
+                task bar. You can change colors used in the keyboard
+                graphic, and can hide or show sections of the keyboard,
+                such as the NumPad or multimedia keys.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+        </listitem>
+
+      </orderedlist>
+
+    </sect2>
+
+    <sect2 id="soft-keyb-custom">
+
+      <title>Creating a Custom Keyboard Layout</title>
+
+      <para>
+        You can use one of the supplied default keyboard layouts as the
+        starting point to create a custom keyboard layout.
+      </para>
+
+      <note>
+        <para>
+          To permananently save a custom keyboard layout, you must save
+          it to file. Otherwise, any changes you make are discarded when
+          you close down the <emphasis role="bold">Soft
+          Keyboard</emphasis> window.
+        </para>
+
+        <para>
+          Custom keyboard layouts that you save are stored as an XML
+          file on the host, in the <filename>keyboardLayouts</filename>
+          folder in the global configuration data directory. For
+          example, in
+          <filename>$HOME/.config/VirtualBox/keyboardLayouts</filename>
+          on a Linux host.
+        </para>
+      </note>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Display the <emphasis role="bold">Layout List</emphasis>.
+          </para>
+
+          <para>
+            Click the <emphasis role="bold">Layout List</emphasis> icon
+            in the task bar of the soft keyboard window.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Make a copy of an existing keyboard layout.
+          </para>
+
+          <para>
+            Highlight the required layout and click the
+            <emphasis role="bold">Copy the Selected Layout</emphasis>
+            icon.
+          </para>
+
+          <para>
+            A new layout entry with a name suffix of
+            <literal>-Copy</literal> is created.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Edit the new keyboard layout.
+          </para>
+
+          <para>
+            Highlight the new layout in the <emphasis role="bold">Layout
+            List</emphasis> and click the <emphasis role="bold">Edit the
+            Selected Layout</emphasis> icon.
+          </para>
+
+          <para>
+            Enter a new name for the layout.
+          </para>
+
+          <para>
+            Edit keys in the new layout. Click on the key that you want
+            to edit and enter new key captions in the
+            <emphasis role="bold">Captions</emphasis> fields.
+          </para>
+
+          <para>
+            The keyboard graphic is updated with the new captions.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            (Optional) Save the layout to file. This means that your
+            custom keyboard layout will be available for future use.
+          </para>
+
+          <para>
+            Highlight the new layout in the <emphasis role="bold">Layout
+            List</emphasis> and click the <emphasis role="bold">Save the
+            Selected Layout into File</emphasis> icon.
+          </para>
+
+          <para>
+            Any custom layouts that you create can later be removed from
+            the Layout List, by highlighting and clicking the
+            <emphasis role="bold">Delete the Selected Layout</emphasis>
+            icon.
+          </para>
+        </listitem>
+
+      </orderedlist>
+
+    </sect2>
+
+  </sect1>
+
 </chapter>
Index: /trunk/doc/manual/en_US/user_KnownIssues.xml
===================================================================
--- /trunk/doc/manual/en_US/user_KnownIssues.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_KnownIssues.xml	(revision 82350)
@@ -37,9 +37,9 @@
       </listitem>
 
-      <listitem>
-        <para>
-          PCI pass-through (Linux hosts only)
-        </para>
-      </listitem>
+<!--   <listitem>
+        <para>
+          PCI passthrough (Linux hosts only)
+        </para>
+      </listitem>-->
 
       <listitem>
@@ -63,5 +63,5 @@
       <listitem>
         <para>
-          Host CD/DVD drive pass-through
+          Host CD/DVD drive passthrough
         </para>
       </listitem>
@@ -108,7 +108,7 @@
               32-bit guests on AMD CPUs. This affects mainly Windows and
               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.
+              revisions. Partially solved for 32-bit Windows NT, 2000,
+              XP, and 2003 guests. Requires the Guest Additions to be
+              installed.
             </para>
           </listitem>
@@ -121,7 +121,6 @@
               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.
+              solved for 32-bit Windows NT, 2000, XP, and 2003 guests.
+              Requires the Guest Additions to be installed.
             </para>
           </listitem>
@@ -134,28 +133,6 @@
           <emphasis role="bold">NX (no execute, data execution
           prevention)</emphasis> only works for guests running on 64-bit
-          hosts or guests running on 32-bit hosts with PAE enabled and
-          requires that hardware virtualization be enabled.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          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 <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>
+          hosts and requires that hardware virtualization be enabled.
+        </para>
       </listitem>
 
@@ -173,10 +150,9 @@
           guest's group policy must be changed. To do so, open the group
           policy editor on the command line by typing
-          <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.
+          <command>gpedit.msc</command>, open the key <literal>Computer
+          Configuration\Windows Settings\Security Settings\Local
+          Policies\Security Options</literal> and change the value of
+          <literal>Accounts: Limit local account use of blank passwords
+          to console logon only</literal> to Disabled.
         </para>
       </listitem>
@@ -186,5 +162,5 @@
           <emphasis role="bold">Compacting virtual disk images is
           limited to VDI files.</emphasis> The <command>VBoxManage
-          modifyhd --compact</command> command is currently only
+          modifymedium --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,
@@ -236,8 +212,7 @@
         <para>
           Neither <emphasis role="bold">scale mode</emphasis> nor
-          <emphasis
-          role="bold">seamless mode</emphasis> work
-          correctly with guests using OpenGL 3D features, such as with
-          compiz-enabled window managers.
+          <emphasis role="bold">seamless mode</emphasis> work correctly
+          with guests using OpenGL 3D features, such as with
+          Compiz-enabled window managers.
         </para>
       </listitem>
@@ -246,5 +221,5 @@
         <para>
           The RDP server in the &product-name; extension pack supports
-          only audio streams in format 22.05kHz stereo 16 bit. If the
+          only audio streams in format 22.05kHz stereo 16-bit. If the
           RDP client requests any other audio format there will be no
           audio.
@@ -331,6 +306,6 @@
               Depending on your system and version of Mac OS X, you
               might experience guest hangs after some time. This can be
-              fixed by turning off energy saving. Set timeout to "Never"
-              in the system preferences.
+              fixed by turning off energy saving. Set the timeout to
+              "Never" in the system preferences.
             </para>
           </listitem>
@@ -346,5 +321,5 @@
             </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal2/EfiBootArgs" "  "</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal2/EfiBootArgs" "  "</screen>
 
             <para>
@@ -353,5 +328,5 @@
             </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal2/EfiBootArgs" ""</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal2/EfiBootArgs" ""</screen>
           </listitem>
 
@@ -359,6 +334,6 @@
             <para>
               It is currently not possible to start a Mac OS X guest in
-              safe mode by specifying "-x" option in
-              "VBoxInternal2/EfiBootArgs" extradata.
+              safe mode by specifying the <option>-x</option> option in
+              <literal>VBoxInternal2/EfiBootArgs</literal> extradata.
             </para>
           </listitem>
@@ -373,11 +348,4 @@
 
         <itemizedlist>
-
-          <listitem>
-            <para>
-              There is no support for USB devices connected to Oracle
-              Solaris 10 hosts.
-            </para>
-          </listitem>
 
           <listitem>
@@ -416,9 +384,8 @@
               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.
+              However, you can use <command>dladm</command> 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 later.
             </para>
           </listitem>
@@ -429,45 +396,10 @@
       <listitem>
         <para>
-          <emphasis role="bold">Guest Additions of version 4.1, 4.1.2
-          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>
-
-        <note>
-          <para>
-            This does <emphasis>not</emphasis> apply to a Guest
-            Additions update. Installing one version of Guest Additions
-            on top of another works correctly.
-          </para>
-        </note>
-
-        <para>
-          To solve this problem, uninstall the &product-name; WDDM Video
-          driver manually. Open Device Manager, and check whether the
-          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
-          <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
-          for the Graphics adapter.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Neither <emphasis>virtio</emphasis> nor <emphasis>Intel
-          PRO/1000 </emphasis> drivers for <emphasis role="bold">Windows
-          XP guests</emphasis> support segmentation offloading.
-          Therefore Windows XP guests have slower transmission rates
-          comparing to other guest types. Refer to MS Knowledge base
-          article 842264 for additional information.
+          Neither virtio nor Intel PRO/1000 drivers for
+          <emphasis role="bold">Windows XP guests</emphasis> support
+          segmentation offloading. Therefore Windows XP guests have
+          slower transmission rates comparing to other guest types.
+          Refer to MS Knowledge base article 842264 for additional
+          information.
         </para>
       </listitem>
Index: /trunk/doc/manual/en_US/user_Networking.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Networking.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_Networking.xml	(revision 82350)
@@ -150,5 +150,5 @@
         <para>
           <ulink
-            url="http://www.linux-kvm.org/page/WindowsGuestDrivers">http://www.linux-kvm.org/page/WindowsGuestDrivers</ulink>.
+            url="http://www.linux-kvm.org/page/WindowsGuestDrivers" />.
         </para>
       </listitem>
@@ -189,8 +189,8 @@
           present, but that there is no connection. This is as if no
           Ethernet cable was plugged into the card. Using this mode, it
-          is possible to "pull" the virtual Ethernet cable and disrupt
-          the connection, which can be useful to inform a guest
-          operating system that no network connection is available and
-          enforce a reconfiguration.
+          is possible to <emphasis>pull</emphasis> the virtual Ethernet
+          cable and disrupt the connection, which can be useful to
+          inform a guest operating system that no network connection is
+          available and enforce a reconfiguration.
         </para>
       </listitem>
@@ -534,6 +534,6 @@
         ports on the host which are not already in use by a service. For
         example, to set up incoming NAT connections to an
-        <computeroutput>ssh</computeroutput> server in the guest, use
-        the following command:
+        <command>ssh</command> server in the guest, use the following
+        command:
       </para>
 
@@ -543,11 +543,11 @@
         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
-        mandatory attribute defining which protocol should be used for
-        forwarding, <computeroutput>udp</computeroutput> could also be
-        used. The name <computeroutput>guestssh</computeroutput> is
-        purely descriptive and will be auto-generated if omitted. The
-        number after <option>--natpf</option> denotes the network card,
-        as with other <command>VBoxManage</command> commands.
+        The protocol name <literal>tcp</literal> is a mandatory
+        attribute defining which protocol should be used for forwarding,
+        <literal>udp</literal> could also be used. The name
+        <literal>guestssh</literal> is purely descriptive and will be
+        auto-generated if omitted. The number after
+        <option>--natpf</option> denotes the network card, as with other
+        <command>VBoxManage</command> commands.
       </para>
 
@@ -601,9 +601,9 @@
         PXE booting is now supported in NAT mode. The NAT DHCP server
         provides a boot file name of the form
-        <computeroutput>vmname.pxe</computeroutput> if the directory
-        <computeroutput>TFTP</computeroutput> exists in the directory
-        where the user's <computeroutput>VirtualBox.xml</computeroutput>
-        file is kept. It is the responsibility of the user to provide
-        <computeroutput>vmname.pxe</computeroutput>.
+        <filename><replaceable>vmname</replaceable>.pxe</filename> if
+        the directory <literal>TFTP</literal> exists in the directory
+        where the user's <filename>VirtualBox.xml</filename> file is
+        kept. It is the responsibility of the user to provide
+        <filename><replaceable>vmname</replaceable>.pxe</filename>.
       </para>
 
@@ -625,9 +625,9 @@
             <emphasis role="bold">ICMP protocol limitations.</emphasis>
             Some frequently used network debugging tools, such as
-            <computeroutput>ping</computeroutput> or tracerouting, rely
-            on the ICMP protocol for sending and receiving messages.
-            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.
+            <command>ping</command> or <command>traceroute</command>,
+            rely on the ICMP protocol for sending and receiving
+            messages. &product-name; ICMP support has some limitations,
+            meaning <command>ping</command> should work but some other
+            tools may not work reliably.
           </para>
         </listitem>
@@ -643,5 +643,6 @@
             WINS always works. As a workaround, you can use the numeric
             IP of the desired server in the
-            <computeroutput>\\server\share</computeroutput> notation.
+            <filename>\\<replaceable>server</replaceable>\<replaceable>share</replaceable></filename>
+            notation.
           </para>
         </listitem>
@@ -663,7 +664,7 @@
             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 port forwarding, the VM will refuse
-            to start.
+            <literal>root</literal>. As a result, if you try to
+            configure such a port forwarding, the VM will refuse to
+            start.
           </para>
         </listitem>
@@ -768,7 +769,6 @@
     <para>
       Port-forwarding is supported, using the
-      <computeroutput>--port-forward-4</computeroutput> switch for IPv4
-      and <computeroutput>--port-forward-6</computeroutput> for IPv6.
-      For example:
+      <option>--port-forward-4</option> switch for IPv4 and
+      <option>--port-forward-6</option> for IPv6. For example:
     </para>
 
@@ -1002,6 +1002,5 @@
         <para>
           If you do not specify a network name, the network card will be
-          attached to the network
-          <computeroutput>intnet</computeroutput> by default.
+          attached to the network <literal>intnet</literal> by default.
         </para>
       </listitem>
@@ -1032,13 +1031,12 @@
 
     <para>
-      Host-only networking is another networking mode that was added
-      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.
+      Host-only networking 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>
 
@@ -1085,6 +1083,7 @@
       <listitem>
         <para>
-          On the command line, enter <computeroutput>VBoxManage modifyvm
-          "VM name" --nic&lt;x&gt; hostonly</computeroutput>. See
+          On the command line, enter <command>VBoxManage modifyvm
+          <replaceable>"vmname</replaceable>
+          --nic<replaceable>x</replaceable> hostonly</command>. See
           <xref
           linkend="vboxmanage-modifyvm" />.
@@ -1096,6 +1095,7 @@
     <para>
       Before you can attach a VM to a host-only network you have to
-      create at least one host-only interface. You can use the GUI for
-      this. Choose <emphasis role="bold">File</emphasis>,
+      create at least one host-only interface. You can use the
+      VirtualBox Manager for this. Choose
+      <emphasis role="bold">File</emphasis>,
       <emphasis role="bold">Preferences</emphasis>,
       <emphasis role="bold">Network</emphasis>,
@@ -1241,8 +1241,7 @@
         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.
+        applications that are not run by <literal>root</literal>. As a
+        result, if you try to configure such a source UDP port, the VM
+        will refuse to start.
       </para>
     </note>
@@ -1353,5 +1352,5 @@
       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>.
+        url="http://wiki.virtualsquare.org/wiki/index.php/VDE_Basic_Networking" />.
     </para>
 
@@ -1520,7 +1519,7 @@
           <listitem>
             <para>
-              <computeroutput>deny</computeroutput>, which hides any
-              traffic not intended for the VM's network adaptor. This is
-              the default setting.
+              <literal>deny</literal>, which hides any traffic not
+              intended for the VM's network adaptor. This is the default
+              setting.
             </para>
           </listitem>
@@ -1528,7 +1527,7 @@
           <listitem>
             <para>
-              <computeroutput>allow-vms</computeroutput>, which hides
-              all host traffic from the VM's network adaptor, but allows
-              it to see traffic from and to other VMs.
+              <literal>allow-vms</literal>, which hides all host traffic
+              from the VM's network adaptor, but allows it to see
+              traffic from and to other VMs.
             </para>
           </listitem>
@@ -1536,7 +1535,6 @@
           <listitem>
             <para>
-              <computeroutput>allow-all</computeroutput>, which removes
-              all restrictions. The VM's network adaptor sees all
-              traffic.
+              <literal>allow-all</literal>, which removes all
+              restrictions. The VM's network adaptor sees all traffic.
             </para>
           </listitem>
Index: /trunk/doc/manual/en_US/user_Preface.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Preface.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_Preface.xml	(revision 82350)
@@ -11,5 +11,5 @@
 
   <para>
-    The <emphasis>&product-name; User Manual</emphasis> provides an
+    The <citetitle>&product-name; User Manual</citetitle> provides an
     introduction to using &product-name;. The manual provides
     information on how to install &product-name; and use it to create
@@ -39,5 +39,5 @@
 
     <para>
-      <ulink url="&otn-doc-tab;" />
+      <ulink url="&ohc-doc-page;" />
     </para>
 
@@ -72,7 +72,7 @@
       <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.
+          <literal>monospace</literal>: Monospace type indicates
+          commands within a paragraph, URLs, code in examples, text that
+          appears on the screen, or text that you enter.
         </para>
       </listitem>
@@ -82,6 +82,9 @@
   </simplesect>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../common/oracle-accessibility-en.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../common/oracle-support-en.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/oracle-accessibility-en.xml" />
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/oracle-support-en.xml" />
 
 </preface>
Index: /trunk/doc/manual/en_US/user_PrivacyPolicy.xml
===================================================================
--- /trunk/doc/manual/en_US/user_PrivacyPolicy.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_PrivacyPolicy.xml	(revision 82350)
@@ -15,5 +15,5 @@
   <para>
     The Oracle Privacy Policies posted on
-    <ulink url="https://www.oracle.com/legal/privacy/privacy-policy.html">https://www.oracle.com/legal/privacy/privacy-policy.html</ulink>
+    <ulink url="https://www.oracle.com/legal/privacy/privacy-policy.html" />
     apply to your personal data collected and used by Oracle. The
     following privacy information describes in more detail which
@@ -84,5 +84,5 @@
     <emphasis role="bold">§ 6 Updates.</emphasis> Oracle may update the
     privacy policy at any time by posting a new version at
-    <ulink url="https://www.oracle.com/legal/privacy/privacy-policy.html">https://www.oracle.com/legal/privacy/privacy-policy.html</ulink>
+    <ulink url="https://www.oracle.com/legal/privacy/privacy-policy.html" />
     and the privacy information will be kept up to date in the
     documentation which comes with the &product-name; application. You
Index: /trunk/doc/manual/en_US/user_Security.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Security.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_Security.xml	(revision 82350)
@@ -97,5 +97,5 @@
         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>.
+        <ulink url="http://www.virtualbox.org" />.
         The integrity of the package should be verified with the
         provided SHA256 checksum which can be found on the official
@@ -558,10 +558,10 @@
 
       <para>
-        Mitigation options:
+        The following mitigation options are available.
       </para>
 
       <sect3>
 
-        <title>Disable nested paging</title>
+        <title>Disable Nested Paging</title>
 
         <para>
@@ -578,5 +578,5 @@
           guests may be able to cope with dropping these features after
           installation. Also, for some guests, especially in SMP
-          configurations, there could be stability issues arrising from
+          configurations, there could be stability issues arising from
           disabling nested paging. Finally, some workloads may
           experience a performance degradation.
@@ -587,5 +587,5 @@
       <sect3>
 
-        <title>Flushing the level 1 data cache</title>
+        <title>Flushing the Level 1 Data Cache</title>
 
         <para>
@@ -627,6 +627,6 @@
         <para>
           A more aggressive flushing option is provided via the
-          VBoxManage modifyvm option
-          <computeroutput>--l1d-flush-on-vm-entry</computeroutput>. When
+          <command>VBoxManage modifyvm</command>
+          <option>--l1d-flush-on-vm-entry</option> option. When
           enabled the level 1 data cache will be flushed on every VM
           entry. The performance impact is greater than with the default
@@ -638,10 +638,6 @@
         <para>
           For users not concerned by this security issue, the default
-          mitigation can be disabled using
-        </para>
-
-        <para>
-          <computeroutput>VBoxManage modifyvm name --l1d-flush-on-sched
-          off</computeroutput>
+          mitigation can be disabled using the <command>VBoxManage modifyvm
+          name --l1d-flush-on-sched off</command> command.
         </para>
 
@@ -656,71 +652,70 @@
       <para>
         These security issues affect a range of Intel CPUs starting with
-        Nehalem.  The CVE-2018-12130 also affects some Atom Silvermont,
-        Atom Airmont, and Knights family CPUs, however the scope is so limited
-        that the host OS should deal with it for us and VBox therefore not
-        be affected (leaks only happens when entering and leaving C states).
-      </para>
-
-      <para>
-        Mitigation option:
+        Nehalem. The CVE-2018-12130 also affects some Atom Silvermont,
+        Atom Airmont, and Knights family CPUs, however the scope is so
+        limited that the host OS should deal with it and &product-name;
+        is therefore not affected. Leaks only happens when entering and
+        leaving C states.
+      </para>
+
+      <para>
+        The following mitigation option is available.
       </para>
 
       <sect3>
 
-        <title>Buffer overwriting and disabling HT</title>
-
-        <para>
-          First, up to date CPU microcode is a prerequisite for the buffer
-          overwriting (clearing) mitigations.  Some host OSes may install
-          these automatically, though it has traditionally been a task best
-          performed by the system firmware.  So, please check with your
-          system / mainboard manufacturer for the latest firmware update.
-        </para>
-
-        <para>
-          This mitigation aims at removing potentially sensitive data from
-          the affected buffers before running guest code.  Since this means
-          additional work each time the guest is scheduled, there might be
-          some performance side effects.
-        </para>
-
-        <para>
-          We recommend disabling hyper threading on host affected by
-          CVE-2018-12126 and CVE-2018-12127 because the affected sets of
-          buffers are normally shared between thread pairs and therefore
-          cause leaks between the threads. This is traditionally done from
-          the firmware setup, but some OSes also offers ways disable HT. In
-          some cases it may be disabled by default, but please verify as the
-          effectiveness of the mitigation depends on it.
-        </para>
-
-        <para>
-          The default action taken by VirtualBox is to clear the affected
-          buffers when a thread is scheduled to execute guest code, rather
-          than on each VM entry. This reduces the performance impact, while
-          making the assumption that the host OS will not handle security
-          sensitive data from interrupt handlers and similar without taking
-          precautions.
-        </para>
-
-        <para>
-          A more aggressive flushing option is provided via the
-          VBoxManage modifyvm option
-          <computeroutput>--mds-clear-on-vm-entry</computeroutput>. When
-          enabled the affected buffers will be cleared on every VM entry.
-          The performance impact is greater than with the default option,
-          though this of course depends on the workload.  Workloads producing
-          a lot of VM exits (like networking, VGA access, and similiar) will
-          probably be most impacted.
+        <title>Buffer Overwriting and Disabling Hyper-Threading</title>
+
+        <para>
+          First, up to date CPU microcode is a prerequisite for the
+          buffer overwriting (clearing) mitigations. Some host OSes may
+          install these automatically, though it has traditionally been
+          a task best performed by the system firmware. Please check
+          with your system or mainboard manufacturer for the latest
+          firmware update.
+        </para>
+
+        <para>
+          This mitigation aims at removing potentially sensitive data
+          from the affected buffers before running guest code. Since
+          this means additional work each time the guest is scheduled,
+          there might be some performance side effects.
+        </para>
+
+        <para>
+          We recommend disabling hyper-threading (HT) on hosts affected
+          by CVE-2018-12126 and CVE-2018-12127, because the affected
+          sets of buffers are normally shared between thread pairs and
+          therefore cause leaks between the threads. This is
+          traditionally done from the firmware setup, but some OSes also
+          offers ways disable HT. In some cases it may be disabled by
+          default, but please verify as the effectiveness of the
+          mitigation depends on it.
+        </para>
+
+        <para>
+          The default action taken by &product-name; is to clear the
+          affected buffers when a thread is scheduled to execute guest
+          code, rather than on each VM entry. This reduces the
+          performance impact, while making the assumption that the host
+          OS will not handle security sensitive data from interrupt
+          handlers and similar without taking precautions.
+        </para>
+
+        <para>
+          The <command>VBoxManage modifyvm</command> command provides a more
+          aggressive flushing option is provided by means of the
+          <option>--mds-clear-on-vm-entry</option> option. When
+          enabled the affected buffers will be cleared on every VM
+          entry. The performance impact is greater than with the default
+          option, though this of course depends on the workload.
+          Workloads producing a lot of VM exits (like networking, VGA
+          access, and similiar) will probably be most impacted.
         </para>
 
         <para>
           For users not concerned by this security issue, the default
-          mitigation can be disabled using
-        </para>
-
-        <para>
-          <computeroutput>VBoxManage modifyvm name --mds-clear-on-sched
-          off</computeroutput>
+          mitigation can be disabled using the <command>VBoxManage modifyvm
+          name --mds-clear-on-sched off</command> command.
         </para>
 
Index: /trunk/doc/manual/en_US/user_Storage.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Storage.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_Storage.xml	(revision 82350)
@@ -52,12 +52,12 @@
   <sect1 id="harddiskcontrollers">
 
-    <title>Hard Disk Controllers: IDE, SATA (AHCI), SCSI, SAS, USB MSD, NVMe</title>
-
-    <para>
-      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. &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
+    <title>Hard Disk Controllers</title>
+
+    <para>
+      In a computing device, hard disks and CD/DVD drives are connected
+      to a device called hard disk controller which drives hard disk
+      operation and data transfers. &product-name; can emulate the most
+      common types of hard disk controllers typically found in computing
+      devices: IDE, SATA (AHCI), SCSI, SAS, USB-based, and NVMe mass
       storage devices.
     </para>
@@ -68,5 +68,5 @@
         <para>
           <emphasis role="bold">IDE (ATA)</emphasis> controllers are a
-          backwards compatible yet very advanced extension of the disk
+          backwards-compatible yet very advanced extension of the disk
           controller in the IBM PC/AT (1984). Initially, this interface
           worked only with hard disks, but was later extended to also
@@ -116,6 +116,6 @@
       <listitem>
         <para>
-          <emphasis role="bold">Serial ATA (SATA)</emphasis> is a newer
-          standard introduced in 2003. Compared to IDE, it supports both
+          <emphasis role="bold">Serial ATA (SATA)</emphasis> is a more
+          recent standard than IDE. Compared to IDE, it supports both
           much higher speeds and more devices per controller. Also, with
           physical hardware, devices can be added and removed while the
@@ -147,9 +147,10 @@
             seen by OSes 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 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
+            Windows versions before Windows Vista</emphasis>. Legacy
+            Windows versions such as Windows XP, even with SP3
+            installed, 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
             <emphasis role="bold">Settings</emphasis> dialog.
           </para>
@@ -158,6 +159,5 @@
             &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>.
+            <ulink url="http://downloadcenter.intel.com/Product_Filter.aspx?ProductID=2101" />.
           </para>
         </warning>
@@ -188,10 +188,10 @@
           <emphasis role="bold">SCSI</emphasis> is another established
           industry standard, standing for Small Computer System
-          Interface. SCSI was standardized as early as 1986 as a generic
-          interface for data transfer between all kinds of devices,
-          including storage devices. Today SCSI is still used for
-          connecting hard disks and tape devices, but it has mostly been
-          displaced in commodity hardware. It is still in common use in
-          high-performance workstations and servers.
+          Interface. SCSI is as a generic interface for data transfer
+          between all kinds of devices, including storage devices. SCSI
+          is still used for connecting some hard disks and tape devices,
+          but it has mostly been displaced in commodity hardware. It is
+          still in common use in high-performance workstations and
+          servers.
         </para>
 
@@ -199,6 +199,6 @@
           Primarily for compatibility with other virtualization
           software, &product-name; optionally supports LSI Logic and
-          BusLogic SCSI controllers, to each of which up to 15 virtual
-          hard disks can be attached.
+          BusLogic SCSI controllers, to each of which up to fifteen
+          virtual hard disks can be attached.
         </para>
 
@@ -229,9 +229,8 @@
           <emphasis role="bold">Serial Attached SCSI (SAS)</emphasis> is
           another bus standard which uses the SCSI command set. As
-          opposed to SCSI, however, with physical devices, serial cables
-          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 enables more reliable and faster
-          connections.
+          opposed to SCSI physical devices, serial cables are used
+          instead of parallel cables. This simplifies physical device
+          connections. In some ways, therefore, SAS is to SCSI what SATA
+          is to IDE: it enables more reliable and faster connections.
         </para>
 
@@ -260,8 +259,8 @@
           class</emphasis> is a standard to connect external storage
           devices like hard disks or flash drives to a host through USB.
-          All major OSes support these devices for a long time and ship
-          generic drivers making third-party drivers superfluous. In
-          particular, legacy OSes without support for SATA controllers
-          may benefit from USB mass storage devices.
+          All major OSes support these devices and ship generic drivers
+          making third-party drivers superfluous. In particular, legacy
+          OSes without support for SATA controllers may benefit from USB
+          mass storage devices.
         </para>
 
@@ -287,9 +286,9 @@
         <para>
           <emphasis role="bold">Non volatile memory express
-          (NVMe)</emphasis> is a standard which emerged in 2011 for
-          connecting non volatile memory (NVM) directly over PCI express
-          to lift the bandwidth limitation of the previously used SATA
-          protocol for SSDs. Unlike other standards the command set is
-          very simple to achieve maximum throughput and is not
+          (NVMe)</emphasis> is a standard for connecting non volatile
+          memory (NVM) directly over PCI Express to lift the bandwidth
+          limitation of the previously used SATA protocol for
+          solid-state devices. Unlike other standards the command set is
+          very simple in order to achieve maximum throughput and is not
           compatible with ATA or SCSI. OSes need to support NVMe devices
           to make use of them. For example, Windows 8.1 added native
@@ -391,5 +390,5 @@
       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" />.
+      <xref linkend="vboxmanage-modifymedium" />.
     </para>
 
@@ -503,8 +502,6 @@
       <listitem>
         <para>
-          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" />.
+          Registered media, for compatibility with legacy &product-name;
+          versions.
         </para>
       </listitem>
@@ -572,24 +569,57 @@
       <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.
-        </para>
-
-        <para>
-          You can specify one of the following target types: VDI, VHD,
-          or VMDK.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Move</emphasis> an image that is
-          currently in the registry to another location.
+          <emphasis role="bold">Add</emphasis> an image to the known
+          media.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Create</emphasis> a new disk image.
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              For virtual hard disks, the <emphasis role="bold">Create
+              Virtual Hard Disk</emphasis> wizard is shown.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              For optical disks, the <emphasis role="bold">VISO
+              Creator</emphasis> screen is shown. This enables you to
+              create a virtual ISO from selected files on the host.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              For floppy disks, the <emphasis role="bold">Floppy Disk
+              Creator</emphasis> screen is shown.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Copy</emphasis> an image to create
+          another one.
+        </para>
+
+        <para>
+          For virtual hard disks, you can specify one of the following
+          target types: VDI, VHD, or VMDK.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Move</emphasis> an image to another
+          location.
         </para>
 
@@ -625,5 +655,5 @@
         <para>
           <emphasis role="bold">Remove</emphasis> an image from the
-          registry. You can optionally delete the image file when
+          known media. You can optionally delete the image file when
           removing the image.
         </para>
@@ -635,4 +665,11 @@
           from a VM. This action only applies if the image is currently
           attached to a VM as a virtual hard disk.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Search</emphasis> for an image by name
+          or UUID.
         </para>
       </listitem>
@@ -729,8 +766,8 @@
 
     <para>
-      You can copy hard disk image files to other host systems and
-      import them in to VMs from the host system. However, certain guest
-      OSes, such as Windows 2000 and Windows XP, require that you
-      configure the new VM in a similar way to the old one.
+      You can copy hard disk image files to other host systems and then
+      import them in to VMs from the host system. However, some Windows
+      guest OSes may require that you configure the new VM in a similar
+      way to the old one.
     </para>
 
@@ -765,8 +802,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 <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
+      below, use <command>VBoxManage modifymedium</command>. See
+      <xref linkend="vboxmanage-modifymedium" />. Alternatively, use
+      <command>VBoxManage storageattach</command> to attach the image to
+      a VM and specify the <option>--mtype</option> argument. See
       <xref linkend="vboxmanage-storageattach" />.
     </para>
@@ -794,9 +831,10 @@
         <para>
           The image file itself is not reset. Instead, when a snapshot
-          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"/>.
+          is taken, &product-name; <emphasis>freezes</emphasis> 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>
 
@@ -903,6 +941,6 @@
           startup does not fit your needs, you can turn it off using the
           <option>autoreset</option> parameter of <command>VBoxManage
-          modifyhd</command>. See
-          <xref linkend="vboxmanage-modifyvdi"/>.
+          modifymedium</command>. See
+          <xref linkend="vboxmanage-modifymedium"/>.
         </para>
       </listitem>
@@ -1062,12 +1100,12 @@
           <emphasis role="bold">Snapshots.</emphasis> When you create a
           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
-          "write-through" mode. From the point of view of the virtual
-          machine, the virtual disks continue to operate before, but all
-          write operations go into the differencing images. Each time
-          you create another snapshot, for each hard disk attachment,
-          another differencing image is created and attached, forming a
-          chain or tree.
+          <emphasis>freezes</emphasis> the images attached to the
+          virtual machine and creates differencing images for each image
+          that is not in <emphasis>write-through</emphasis> mode. From
+          the point of view of the virtual machine, the virtual disks
+          continue to operate before, but all write operations go into
+          the differencing images. Each time you create another
+          snapshot, for each hard disk attachment, another differencing
+          image is created and attached, forming a chain or tree.
         </para>
 
@@ -1164,8 +1202,8 @@
       However, you should <emphasis>only</emphasis> make copies of
       virtual disk images using the utility supplied with
-      &product-name;. See <xref linkend="vboxmanage-clonevdi" />. This
-      is because &product-name; assigns a 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
+      &product-name;. See <xref linkend="vboxmanage-clonemedium" />.
+      This is because &product-name; assigns a 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 the <command>VBoxManage
@@ -1174,13 +1212,13 @@
 
     <para>
-      Note that newer Linux distributions identify the boot hard disk
-      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
+      Note that Linux distributions identify the boot hard disk 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
       loader script, for example
-      <computeroutput>/boot/grub/menu.lst</computeroutput>. The disk ID
-      looks like the following:
+      <filename>/boot/grub/menu.lst</filename>. The disk ID looks like
+      the following:
     </para>
 
@@ -1300,5 +1338,5 @@
 
     <para>
-      For the above reasons, &product-name; now uses SATA controllers by
+      For the above reasons, &product-name; uses SATA controllers by
       default for new virtual machines.
     </para>
@@ -1395,11 +1433,10 @@
       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 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.
+      force a medium removal in such situations by using the VirtualBox
+      Manager 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>
 
@@ -1448,8 +1485,7 @@
 
     <para>
-      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
+      To enable host drive passthrough you can use the
+      <option>--passthrough</option> option of the <command>VBoxManage
+      storageattach</command> command. See
       <xref linkend="vboxmanage-storageattach" />.
     </para>
@@ -1475,13 +1511,13 @@
 
     <para>
-      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
-      disks to a computer network. In iSCSI terminology, the server
-      providing storage resources is called an <emphasis>iSCSI
-      target</emphasis>, while the client connecting to the server and
-      accessing its resources is called an <emphasis>iSCSI
-      initiator</emphasis>.
+      iSCSI stands for <emphasis>Internet SCSI</emphasis> 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 disks to a computer network. In iSCSI
+      terminology, the server providing storage resources is called an
+      <emphasis>iSCSI target</emphasis>, while the client connecting to
+      the server and accessing its resources is called an
+      <emphasis>iSCSI initiator</emphasis>.
     </para>
 
@@ -1509,7 +1545,7 @@
     <para>
       <command>vboximg-mount</command> is a command line utility for Mac
-      OS X hosts that provides raw access to an &product-name; virtual
-      disk image on the host system. Use this utility to mount, view,
-      and optionally modify the disk image contents.
+      OS and Linux hosts that provides raw access to an &product-name;
+      virtual disk image on the host system. Use this utility to mount,
+      view, and optionally modify the disk image contents.
     </para>
 
@@ -1560,7 +1596,17 @@
 
     <para>
+      The <command>vboximg-mount </command>command includes experimental
+      read-only access to file systems inside a VM disk image. This
+      feature enables you to extract some files from the disk image
+      without starting the VM and without requiring third-party file
+      system drivers on the host system. FAT, NTFS, ext2, ext3, and ext4
+      file systems are supported.
+    </para>
+
+    <para>
       Use the <option>--help</option> option to view information about
       the <command>vboximg-mount</command> command usage. The complete
-      command reference is described in <xref linkend="man_vboximg-mount" />.
+      command reference is described in
+      <xref linkend="man_vboximg-mount" />.
     </para>
 
@@ -1703,6 +1749,6 @@
           <para>
             In this example, partition 2 is mounted on the
-            <computeroutput>macos_sysdisk</computeroutput> mount point.
-            The mount includes all snapshots for the disk image.
+            <filename>macos_sysdisk</filename> mount point. The mount
+            includes all snapshots for the disk image.
           </para>
         </listitem>
@@ -1710,7 +1756,7 @@
         <listitem>
           <para>
-            Use the host OS to mount the
-            <computeroutput>vhdd</computeroutput> device node. The
-            FUSE-mounted device node represents the virtual disk image.
+            Use the host OS to mount the <literal>vhdd</literal> device
+            node. The FUSE-mounted device node represents the virtual
+            disk image.
           </para>
 
Index: /trunk/doc/manual/en_US/user_Technical.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Technical.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_Technical.xml	(revision 82350)
@@ -24,28 +24,35 @@
       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
+      addition, most virtual machines have one or more virtual hard
+      disks. These are typically represented by disk images, such as
+      those in VDI format. The location of these files may vary,
+      depending on the host operating system. See
+      <xref linkend="vboxconfigdata-machine-folder"/>.
+    </para>
+
+    <para>
+      Global configuration data for &product-name; is maintained in
+      another location on the host. See
+      <xref linkend="vboxconfigdata-global"/>.
+    </para>
+
+    <sect2 id="vboxconfigdata-machine-folder">
+
+      <title>The Machine Folder</title>
+
+      <para>
+        By default, each virtual machine has a 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, as follows:
+        settings file, with a <filename>.vbox</filename> file extension,
+        and its disk images. This is called the <emphasis>machine
+        folder</emphasis>.
+      </para>
+
+      <para>
+        By default, this machine folder is located in a common folder
+        called <filename>VirtualBox VMs</filename>, 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, as follows:
       </para>
 
@@ -55,14 +62,8 @@
           <para>
             On Windows, this is the location returned by the
-            <computeroutput>SHGetFolderPath</computeroutput> function of
-            the Windows system library Shell32.dll, asking for the user
-            profile. On very old Windows versions which do not have this
-            function or where it unexpectedly returns an error, there is
-            a fallback based on environment variables. First,
-            <computeroutput>%USERPROFILE%</computeroutput> is checked.
-            If it does not exist then an attempt with
-            <computeroutput>%HOMEDRIVE%%HOMEPATH%</computeroutput> is
-            made. A typical location is
-            <computeroutput>C:\Users\username</computeroutput>.
+            <literal>SHGetFolderPath</literal> function of the Windows
+            system library Shell32.dll, asking for the user profile. A
+            typical location is
+            <filename>C:\Users\<replaceable>username</replaceable></filename>.
           </para>
         </listitem>
@@ -72,14 +73,17 @@
             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 &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 Oracle Solaris is
-            <computeroutput>/home/username</computeroutput> and on Mac
-            OS X <computeroutput>/Users/username</computeroutput>.
+            <filename>$HOME</filename>, except for the user
+            <literal>root</literal> where it is taken from the account
+            database. This is a workaround for the frequent trouble
+            caused by users using &product-name; in combination with the
+            tool <command>sudo</command>, which by default does not
+            reset the environment variable <filename>$HOME</filename>.
+          </para>
+
+          <para>
+            A typical location on Linux and Oracle Solaris is
+            <filename>/home/<replaceable>username</replaceable></filename>
+            and on Mac OS X is
+            <filename>/Users/<replaceable>username</replaceable></filename>.
           </para>
         </listitem>
@@ -88,8 +92,8 @@
 
       <para>
-        For simplicity, we will abbreviate the location of the home
-        directory as <computeroutput>$HOME</computeroutput>. Using that
-        convention, the common folder for all virtual machines is
-        <computeroutput>$HOME/VirtualBox VMs</computeroutput>.
+        For simplicity, we abbreviate the location of the home directory
+        as <filename>$HOME</filename>. Using that convention, the common
+        folder for all virtual machines is <filename>$HOME/VirtualBox
+        VMs</filename>.
       </para>
 
@@ -103,6 +107,6 @@
         <listitem>
           <para>
-            A machine folder <computeroutput>$HOME/VirtualBox
-            VMs/Example VM/</computeroutput>
+            A machine folder: <filename>$HOME/VirtualBox VMs/Example
+            VM/</filename>
           </para>
         </listitem>
@@ -110,6 +114,6 @@
         <listitem>
           <para>
-            In the machine folder, a settings file:
-            <computeroutput>Example VM.vbox</computeroutput>
+            In the machine folder, a settings file: <filename>Example
+            VM.vbox</filename>
           </para>
         </listitem>
@@ -118,5 +122,5 @@
           <para>
             In the machine folder, a virtual disk image:
-            <computeroutput>Example VM.vdi</computeroutput>.
+            <filename>Example VM.vdi</filename>.
           </para>
         </listitem>
@@ -129,9 +133,8 @@
         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
-        VM settings.
+        are in a subfolder called <filename>Logs</filename>, and if you
+        have taken snapshots, they are in a
+        <filename>Snapshots</filename> subfolder. For each VM, you can
+        change the location of its snapshots folder in the VM settings.
       </para>
 
@@ -142,94 +145,18 @@
         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" />.
+        the <command>VBoxManage setproperty machinefolder</command>
+        command. See <xref linkend="vboxmanage-setproperty" />.
       </para>
 
     </sect2>
 
-    <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 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>
-
-      <para>
-        The old layout had the following severe disadvantages:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            It was very difficult to move a virtual machine from one
-            host to another because the files involved did not reside in
-            the same folder. In addition, the virtual media of all
-            machines were registered with a global registry in the
-            central &product-name; settings file,
-            <computeroutput>$HOME/.VirtualBox/VirtualBox.xml</computeroutput>.
-          </para>
-
-          <para>
-            To move a machine to another host, it was therefore not
-            enough to move the XML settings file and the disk images,
-            which were in different locations, but the hard disk entries
-            from the global media registry XML had to be meticulously
-            copied as well. This was close to impossible if the machine
-            had snapshots and therefore differencing images.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Storing virtual disk images, which can grow very large,
-            under the hidden
-            <computeroutput>.VirtualBox</computeroutput> directory, at
-            least on Linux and Oracle Solaris hosts, made many users
-            wonder where their disk space had gone.
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      <para>
-        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 &product-name;.
-      </para>
-
-    </sect2>
-
     <sect2 id="vboxconfigdata-global">
 
-      <title>Global Configuration Data</title>
-
-      <para>
-        In addition to the files of the virtual machines, &product-name;
-        maintains global configuration data in the following directory:
+      <title>Global Settings</title>
+
+      <para>
+        In addition to the files for the virtual machines,
+        &product-name; maintains global configuration data in the
+        following directory:
       </para>
 
@@ -239,11 +166,5 @@
           <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.
+            <filename>$HOME/.config/VirtualBox</filename>.
           </para>
         </listitem>
@@ -252,5 +173,5 @@
           <para>
             <emphasis role="bold">Windows:</emphasis>
-            <computeroutput>$HOME/.VirtualBox</computeroutput>.
+            <filename>$HOME/.VirtualBox</filename>.
           </para>
         </listitem>
@@ -259,5 +180,5 @@
           <para>
             <emphasis role="bold">Mac OS X:</emphasis>
-            <computeroutput>$HOME/Library/VirtualBox</computeroutput>.
+            <filename>$HOME/Library/VirtualBox</filename>.
           </para>
         </listitem>
@@ -267,61 +188,36 @@
       <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 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
-        global configuration options and the list of registered virtual
-        machines with pointers to their XML settings files. Neither the
-        location of this file nor its directory has changed with
-        &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 an &product-name; version
-        before 4.0, files in these directories are not automatically
-        moved in order not to break backwards compatibility.
+        automatically, if necessary. You can specify an alternate
+        configuration directory by either setting the
+        <literal>VBOX_USER_HOME</literal> environment variable, or on
+        Linux or Oracle Solaris by using the standard
+        <literal>XDG_CONFIG_HOME</literal> variable. Since the global
+        <filename>VirtualBox.xml</filename> settings file points to all
+        other configuration files, this enables switching between
+        several &product-name; configurations.
+      </para>
+
+      <para>
+        In this configuration directory, &product-name; stores its
+        global settings file, an XML file called
+        <filename>VirtualBox.xml</filename>. This file includes global
+        configuration options and a list of registered virtual machines
+        with pointers to their XML settings files.
       </para>
 
     </sect2>
 
-    <sect2 id="vboxconfigdata-summary-version-four">
-
-      <title>Summary of 4.0 Configuration Changes</title>
+    <sect2 id="vboxconfigdata-summary-locations">
+
+      <title>Summary of Configuration Data Locations</title>
 
       <para>
         The following table gives a brief overview of the configuration
-        changes between legacy versions and version 4.0 or later.
-      </para>
-
-      <table id="table-version4-config-changes" tabstyle="oracle-all">
-        <title>Configuration Changes in Version 4.0 or Above</title>
-        <tgroup cols="3">
+        data locations on an &product-name; host.
+      </para>
+
+      <table id="table-config-summary" tabstyle="oracle-all">
+        <title>Configuration File Locations</title>
+        <tgroup cols="2">
           <thead>
             <row>
@@ -330,8 +226,5 @@
                 </para></entry>
               <entry><para>
-                  <emphasis role="bold">Before 4.0</emphasis>
-                </para></entry>
-              <entry><para>
-                  <emphasis role="bold">4.0 or above</emphasis>
+                  <emphasis role="bold">Location</emphasis>
                 </para></entry>
             </row>
@@ -343,8 +236,5 @@
                 </para></entry>
               <entry><para>
-                  <computeroutput>$HOME/.VirtualBox/Machines</computeroutput>
-                </para></entry>
-              <entry><para>
-                  <computeroutput>$HOME/VirtualBox VMs</computeroutput>
+                  <filename>$HOME/VirtualBox VMs</filename>
                 </para></entry>
             </row>
@@ -352,7 +242,4 @@
               <entry><para>
                   Default disk image location
-                </para></entry>
-              <entry><para>
-                  <computeroutput>$HOME/.VirtualBox/HardDisks</computeroutput>
                 </para></entry>
               <entry><para>
@@ -365,8 +252,5 @@
                 </para></entry>
               <entry><para>
-                  <computeroutput>.xml</computeroutput>
-                </para></entry>
-              <entry><para>
-                  <computeroutput>.vbox</computeroutput>
+                  <filename>.vbox</filename>
                 </para></entry>
             </row>
@@ -376,20 +260,12 @@
                 </para></entry>
               <entry><para>
-                  Global <computeroutput>VirtualBox.xml</computeroutput>
-                  file
-                </para></entry>
-              <entry><para>
                   Each machine settings file
-                </para></entry>
-            </row>
-            <row>
-              <entry><para>
-                  Media registration
-                </para></entry>
-              <entry><para>
-                  Explicit open/close required
-                </para></entry>
-              <entry><para>
-                  Automatic on attach
+                </para>
+
+
+
+                <para>
+                  Media registration is done automatically when a
+                  storage medium is attached to a VM
                 </para></entry>
             </row>
@@ -407,5 +283,5 @@
         &product-name; uses XML for both the machine settings files and
         the global configuration file,
-        <computeroutput>VirtualBox.xml</computeroutput>.
+        <filename>VirtualBox.xml</filename>.
       </para>
 
@@ -426,19 +302,4 @@
 
       <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
@@ -476,12 +337,12 @@
       <listitem>
         <para>
-          <computeroutput>VBoxSVC</computeroutput>, the &product-name;
-          service process which always runs in the background. This
-          process is started automatically by the first &product-name;
-          client process and exits a short time after the last client
-          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,
+          <command>VBoxSVC</command>, the &product-name; service process
+          which always runs in the background. This process is started
+          automatically by the first &product-name; client process and
+          exits a short time after the last client exits. The first
+          &product-name; service can be the GUI,
+          <command>VBoxManage</command>,
+          <command>VBoxHeadless</command>, the web service amongst
+          others. The service is responsible for bookkeeping,
           maintaining the state of all VMs, and for providing
           communication between &product-name; components. This
@@ -492,11 +353,10 @@
           <para>
             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.
+            the local clients of a particular <command>VBoxSVC</command>
+            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>
@@ -505,12 +365,10 @@
       <listitem>
         <para>
-          The GUI process,
-          <computeroutput>VirtualBoxVM</computeroutput>, a client
+          The GUI process, <command>VirtualBoxVM</command>, 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
+          started without the <option>--startvm</option> option, this
+          application acts as the VirtualBox Manager, displaying the VMs
+          and their settings. It then communicates settings and state
+          changes to <command>VBoxSVC</command> and also reflects
           changes effected through other means, such as the
           <command>VBoxManage</command> command.
@@ -520,7 +378,6 @@
       <listitem>
         <para>
-          If the <computeroutput>VirtualBoxVM</computeroutput> client
-          application is started with the
-          <computeroutput>--startvm</computeroutput> argument, it loads
+          If the <command>VirtualBoxVM</command> client application is
+          started with the <option>--startvm</option> argument, it loads
           the VMM library which includes the actual hypervisor and then
           runs a virtual machine and provides the input and output for
@@ -549,33 +406,32 @@
       <listitem>
         <para>
-          <computeroutput>VirtualBoxVM</computeroutput>: The Qt front
-          end implementing the VirtualBox Manager and running VMs.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>VBoxManage</computeroutput>: A less
-          user-friendly but more powerful alternative. See
-          <xref linkend="vboxmanage" />.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <computeroutput>VBoxHeadless</computeroutput>: A VM front end
-          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>
-      </listitem>
-
-      <listitem>
-        <para>
-          <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" />.
+          <command>VirtualBoxVM</command>: The Qt front end implementing
+          the VirtualBox Manager and running VMs.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>VBoxManage</command>: A less user-friendly but more
+          powerful alternative. See <xref linkend="vboxmanage" />.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>VBoxHeadless</command>: A VM front end 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>
+      </listitem>
+
+      <listitem>
+        <para>
+          <command>vboxwebsrv</command>: 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>
@@ -584,6 +440,6 @@
         <para>
           The &product-name; Python shell: A Python alternative to
-          <computeroutput>VBoxManage</computeroutput>. This is also
-          described in the SDK reference.
+          <command>VBoxManage</command>. This is also described in the
+          SDK reference.
         </para>
       </listitem>
@@ -617,11 +473,4 @@
         <para>
           EM (Execution Manager): Controls execution of guest code.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          REM (Recompiled Execution Monitor): Provides software
-          emulation of CPU instructions.
         </para>
       </listitem>
@@ -662,11 +511,4 @@
         <para>
           PGM (Page Manager): A component that controls guest paging.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          PATM (Patch Manager): Patches guest code to improve and speed
-          up software virtualization.
         </para>
       </listitem>
@@ -747,5 +589,5 @@
   <sect1 id="hwvirt">
 
-    <title>Hardware vs. Software Virtualization</title>
+    <title>Hardware Virtualization</title>
 
     <para>
@@ -757,10 +599,10 @@
       &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.
+      &product-name; simulates a certain <emphasis>virtual</emphasis>
+      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>
 
@@ -769,5 +611,33 @@
       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:
+      above, is difficult. To achieve this, &product-name; uses
+      <emphasis>hardware virtualization</emphasis>.
+    </para>
+
+    <para>
+      Intel and AMD processors have support for hardware virtualization.
+      This 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>
+
+    <para>
+      These hardware features differ between Intel and AMD processors.
+      Intel named its technology VT-x, AMD calls theirs AMD-V. The Intel
+      and AMD support for virtualization is very different in detail,
+      but not very different in principle.
+    </para>
+
+    <note>
+      <para>
+        On many systems, the hardware virtualization features first need
+        to be enabled in the BIOS before &product-name; can use them.
+      </para>
+    </note>
+
+    <para>
+      Enabling hardware virtualization is <emphasis>required</emphasis>
+      in the following scenarios:
     </para>
 
@@ -776,57 +646,7 @@
       <listitem>
         <para>
-          Since 2006, Intel and AMD processors have had support for
-          so-called <emphasis>hardware virtualization</emphasis>. This
-          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>
-
-        <para>
-          These hardware features differ between Intel and AMD
-          processors. Intel named its technology VT-x. AMD calls theirs
-          AMD-V. The Intel and AMD support for virtualization is very
-          different in detail, but not very different in principle.
-        </para>
-
-        <note>
-          <para>
-            On many systems, the hardware virtualization features first
-            need to be enabled in the BIOS before &product-name; can use
-            them.
-          </para>
-        </note>
-      </listitem>
-
-      <listitem>
-        <para>
-          As opposed to other virtualization software, for many usage
-          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>
-
-    </itemizedlist>
-
-    <para>
-      Even though &product-name; does not always require hardware
-      virtualization, enabling it is <emphasis>required</emphasis> in
-      the following scenarios:
-    </para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>
           Certain rare guest operating systems like OS/2 make use of
-          very esoteric processor instructions that are not supported
-          with our software virtualization. For virtual machines that
-          are configured to contain such an operating system, hardware
+          very esoteric processor instructions. For virtual machines
+          that are configured to use such an operating system, hardware
           virtualization is enabled automatically.
         </para>
@@ -835,11 +655,10 @@
       <listitem>
         <para>
-          &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.
+          &product-name;'s 64-bit guest and multiprocessing (SMP)
+          support both require hardware virtualization to be enabled.
+          This is not much of a limitation since the vast majority of
+          64-bit and multicore CPUs ship with hardware virtualization.
+          The exceptions to this rule are some legacy Intel and AMD
+          CPUs.
         </para>
       </listitem>
@@ -858,319 +677,11 @@
         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.
+        host.
       </para>
     </warning>
 
-  </sect1>
-
-  <sect1 id="gimproviders">
-
-    <title>Paravirtualization Providers</title>
-
-    <para>
-      &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>
-
-    <para>
-      Most modern, mainstream guest operating systems, including Windows
-      and Linux, ship with support for one or more paravirtualization
-      interfaces. Hence, there is typically no need to install
-      additional software in the guest to take advantage of this
-      feature.
-    </para>
-
-    <para>
-      Exposing a paravirtualization provider to the guest operating
-      system does not rely on the choice of host platforms. For example,
-      the <emphasis>Hyper-V</emphasis> paravirtualization provider can
-      be used for VMs to run on any host platform supported by
-      &product-name; and not just Windows.
-    </para>
-
-    <para>
-      &product-name; provides the following interfaces:
-    </para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Minimal</emphasis>: Announces the
-          presence of a virtualized environment. Additionally, reports
-          the TSC and APIC frequency to the guest operating system. This
-          provider is mandatory for running any Mac OS X guests.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">KVM</emphasis>: Presents a Linux KVM
-          hypervisor interface which is recognized by Linux kernels
-          version 2.6.25 or later. &product-name;'s implementation
-          currently supports paravirtualized clocks and SMP spinlocks.
-          This provider is recommended for Linux guests.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Hyper-V</emphasis>: Presents a Microsoft
-          Hyper-V hypervisor interface which is recognized by Windows 7
-          and newer operating systems. &product-name;'s implementation
-          currently supports paravirtualized clocks, APIC frequency
-          reporting, guest debugging, guest crash reporting and relaxed
-          timer checks. This provider is recommended for Windows guests.
-        </para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1 id="swvirt-details">
-
-    <title>Details About Software Virtualization</title>
-
-    <para>
-      Implementing virtualization on x86 CPUs with no hardware
-      virtualization support is an extraordinarily complex task because
-      the CPU architecture was not designed to be virtualized. The
-      problems can usually be solved, but at the cost of reduced
-      performance. Thus, there is a constant clash between
-      virtualization performance and accuracy.
-    </para>
-
-    <para>
-      The x86 instruction set was originally designed in the 1970s and
-      underwent significant changes with the addition of protected mode
-      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 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>
-
-    <para>
-      In theory, software virtualization is not overly complex. There
-      are four privilege levels, called <emphasis>rings</emphasis>,
-      provided by the hardware. Typically only two rings are used: ring
-      0 for kernel mode and ring 3 for user mode. Additionally, one
-      needs to differentiate between <emphasis>host context</emphasis>
-      and <emphasis>guest context</emphasis>.
-    </para>
-
-    <para>
-      In host context, everything is as if no hypervisor was active.
-      This might be the active mode if another application on your host
-      has been scheduled CPU time. In that case, there is a host ring 3
-      mode and a host ring 0 mode. The hypervisor is not involved.
-    </para>
-
-    <para>
-      In guest context, however, a virtual machine is active. So long as
-      the guest code is running in ring 3, this is not much of a problem
-      since a hypervisor can set up the page tables properly and run
-      that code natively on the processor. The problems mostly lie in
-      how to intercept what the guest's kernel does.
-    </para>
-
-    <para>
-      There are several possible solutions to these problems. One
-      approach is full software emulation, usually involving
-      recompilation. That is, all code to be run by the guest is
-      analyzed, transformed into a form which will not allow the guest
-      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. &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.
-    </para>
-
-    <para>
-      Another possible solution is paravirtualization, in which only
-      specially modified guest OSes are allowed to run. This way, most
-      of the hardware access is abstracted and any functions which would
-      normally access the hardware or privileged CPU state are passed on
-      to the hypervisor instead. Paravirtualization can achieve good
-      functionality and performance on standard x86 CPUs, but it can
-      only work if the guest OS can actually be modified, which is
-      obviously not always the case.
-    </para>
-
-    <para>
-      &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>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>
-          Guest ring 3 code is run unmodified, at full speed, as much as
-          possible. The number of faults will generally be low, unless
-          the guest allows port I/O from ring 3. This is something we
-          cannot do as we do not want the guest to be able to access
-          real ports. This is also referred to as <emphasis>raw
-          mode</emphasis>, as the guest ring-3 code runs unmodified.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          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 &product-name; hypervisor in the "real" ring
-          0 can take over.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The hypervisor (VMM) can be active. Every time a fault occurs,
-          &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 &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
-          startup, is run in the recompiler entirely.
-        </para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>
-      Unfortunately this only works to a degree. Among others, the
-      following situations require special handling:
-    </para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>
-          Running ring 0 code in ring 1 causes a lot of additional
-          instruction faults, as ring 1 is not allowed to execute any
-          privileged instructions, of which guest's ring-0 contains
-          plenty. With each of these faults, the VMM must step in and
-          emulate the code to achieve the desired behavior. While this
-          works, emulating thousands of these faults is very expensive
-          and severely hurts the performance of the virtualized guest.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          There are certain flaws in the implementation of ring 1 in the
-          x86 architecture that were never fixed. Certain instructions
-          that <emphasis>should</emphasis> trap in ring 1 do not. This
-          affects, for example, the LGDT/SGDT, LIDT/SIDT, or POPF/PUSHF
-          instruction pairs. Whereas the "load" operation is privileged
-          and can therefore be trapped, the "store" instruction always
-          succeed. If the guest is allowed to execute these, it will see
-          the true state of the CPU, not the virtualized state. The
-          CPUID instruction also has the same problem.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          A hypervisor typically needs to reserve some portion of the
-          guest's address space, both linear address space and
-          selectors, for its own use. This is not entirely transparent
-          to the guest OS and may cause clashes.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The SYSENTER instruction, used for system calls, executed by
-          an application running in a guest OS always transitions to
-          ring 0. But that is where the hypervisor runs, not the guest
-          OS. In this case, the hypervisor must trap and emulate the
-          instruction even when it is not desirable.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The CPU segment registers contain a "hidden" descriptor cache
-          which is not software-accessible. The hypervisor cannot read,
-          save, or restore this state, but the guest OS may use it.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Some resources must, and can, be trapped by the hypervisor,
-          but the access is so frequent that this creates a significant
-          performance overhead. An example is the TPR (Task Priority)
-          register in 32-bit mode. Accesses to this register must be
-          trapped by the hypervisor. But certain guest operating
-          systems, notably Windows and Oracle Solaris, write this
-          register very often, which adversely affects virtualization
-          performance.
-        </para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>
-      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>
-
-    <para>
-      Before executing ring 0 code, CSAM scans it recursively to
-      discover problematic instructions. PATM then performs
-      <emphasis>in-situ </emphasis>patching. It replaces the instruction
-      with a jump to hypervisor memory where an integrated code
-      generator has placed a more suitable implementation. In reality,
-      this is a very complex task as there are lots of odd situations to
-      be discovered and handled correctly. So, with its current
-      complexity, one could argue that PATM is an advanced
-      <emphasis>in-situ</emphasis> recompiler.
-    </para>
-
-    <para>
-      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.
+    <para>
+      See <xref linkend="hwvirt-details"/> for a technical discussion of
+      hardware virtualization.
     </para>
 
@@ -1270,8 +781,77 @@
       software virtualization, the overhead of VM exits is relatively
       high. This causes problems for devices whose emulation requires
-      high number of traps. One example is the VGA device in 16-color
-      modes, where not only every I/O port access but also every access
+      high number of traps. One example is a VGA device in 16-color
+      mode, where not only every I/O port access but also every access
       to the framebuffer memory must be trapped.
     </para>
+
+  </sect1>
+
+  <sect1 id="gimproviders">
+
+    <title>Paravirtualization Providers</title>
+
+    <para>
+      &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>
+
+    <para>
+      Most modern, mainstream guest operating systems, including Windows
+      and Linux, ship with support for one or more paravirtualization
+      interfaces. Hence, there is typically no need to install
+      additional software in the guest to take advantage of this
+      feature.
+    </para>
+
+    <para>
+      Exposing a paravirtualization provider to the guest operating
+      system does not rely on the choice of host platforms. For example,
+      the <emphasis>Hyper-V</emphasis> paravirtualization provider can
+      be used for VMs to run on any host platform supported by
+      &product-name; and not just Windows.
+    </para>
+
+    <para>
+      &product-name; provides the following interfaces:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Minimal</emphasis>: Announces the
+          presence of a virtualized environment. Additionally, reports
+          the TSC and APIC frequency to the guest operating system. This
+          provider is mandatory for running any Mac OS X guests.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">KVM</emphasis>: Presents a Linux KVM
+          hypervisor interface which is recognized by Linux kernels
+          version 2.6.25 or later. &product-name;'s implementation
+          currently supports paravirtualized clocks and SMP spinlocks.
+          This provider is recommended for Linux guests.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Hyper-V</emphasis>: Presents a Microsoft
+          Hyper-V hypervisor interface which is recognized by Windows 7
+          and newer operating systems. &product-name;'s implementation
+          currently supports paravirtualized clocks, APIC frequency
+          reporting, guest debugging, guest crash reporting and relaxed
+          timer checks. This provider is recommended for Windows guests.
+        </para>
+      </listitem>
+
+    </itemizedlist>
 
   </sect1>
@@ -1328,7 +908,6 @@
           and overhead. This can yield a performance improvement of up
           to 5%. To enable this feature for a VM, you use the
-          <computeroutput>VBoxManage modifyvm
-          --largepages</computeroutput> command. See
-          <xref linkend="vboxmanage-modifyvm" />.
+          <command>VBoxManage modifyvm --largepages</command> command.
+          See <xref linkend="vboxmanage-modifyvm" />.
         </para>
 
@@ -1350,6 +929,6 @@
         <para>
           To enable these features for a VM, you use the
-          <computeroutput>VBoxManage modifyvm --vtxvpid</computeroutput>
-          and <computeroutput>--largepages</computeroutput> commands.
+          <command>VBoxManage modifyvm --vtxvpid</command> and
+          <command>VBoxManage modifyvm --largepages</command> commands.
           See <xref linkend="vboxmanage-modifyvm" />.
         </para>
Index: /trunk/doc/manual/en_US/user_ThirdParty.xml
===================================================================
--- /trunk/doc/manual/en_US/user_ThirdParty.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_ThirdParty.xml	(revision 82350)
@@ -24,6 +24,5 @@
     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>,
+    <ulink url="http://www.virtualbox.org" />,
     both as tarballs for particular releases and as a live SVN
     repository.
@@ -182,6 +181,5 @@
           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>).
+          <ulink url="http://etherboot.sourceforge.net/clinks.html" />).
           Etherboot is
         </para>
@@ -3291,6 +3289,5 @@
         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>.
+        <ulink url="http://www.cs.fsu.edu/~engelen/soaplicense.html" />.
         Software distributed under the License is distributed on an "AS
         IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
Index: /trunk/doc/manual/en_US/user_Troubleshooting.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Troubleshooting.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_Troubleshooting.xml	(revision 82350)
@@ -66,16 +66,7 @@
             Because of significant differences between VT-x and AMD-V,
             problems may be specific to one or the other technology. The
-            exact CPU model may also make a difference, even for
-            software virtualization, because different CPUs support
-            different features, which may affect certain aspects of
-            guest CPU operation.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Is the problem specific to a certain virtualization mode?
-            Some problems may only occur in software virtualization
-            mode, others may be specific to hardware virtualization.
+            exact CPU model may also make a difference because different
+            CPUs support different features, which may affect certain
+            aspects of guest CPU operation.
           </para>
         </listitem>
@@ -139,18 +130,18 @@
         <emphasis>release log file</emphasis> is created, containing
         lots of information about the VM configuration and runtime
-        events. The log file is called
-        <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>
+        events. The log file is called <filename>VBox.log</filename> and
+        resides in the VM log file folder, which is
+        <filename>$HOME/VirtualBox
+        VMs/<replaceable>VM-name</replaceable>/Logs</filename> by
+        default.
+      </para>
 
       <para>
         When starting a VM, the configuration file of the last run will
-        be renamed to <computeroutput>.1</computeroutput>, up to
-        <computeroutput>.3</computeroutput>. Sometimes when there is a
-        problem, it is useful to have a look at the logs. Also when
-        requesting support for &product-name;, supplying the
-        corresponding log file is mandatory.
+        be renamed to <filename>.1</filename>, up to
+        <filename>.3</filename>. Sometimes when there is a problem, it
+        is useful to have a look at the logs. Also when requesting
+        support for &product-name;, supplying the corresponding log file
+        is mandatory.
       </para>
 
@@ -164,7 +155,7 @@
 
       <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
+        The release log file, <filename>VBox.log</filename>, contains a
+        wealth of diagnostic information, such as Host OS type and
+        version, &product-name; version and build. It also includes a
         complete dump of the guest's configuration (CFGM), detailed
         information about the host CPU type and supported features,
@@ -180,11 +171,10 @@
         <emphasis>crash dumps</emphasis>. This is true for both host and
         guest crashes. For information about enabling core dumps on
-        Linux, Oracle Solaris, and OS X systems, refer to the following
-        core dump article on the &product-name; website:
-      </para>
-
-      <para>
-        <ulink
-          url="http://www.virtualbox.org/wiki/Core_dump">http://www.virtualbox.org/wiki/Core_dump</ulink>.
+        Linux, Oracle Solaris, and Mac OS X systems, refer to the
+        following core dump article on the &product-name; website:
+      </para>
+
+      <para>
+        <ulink url="http://www.virtualbox.org/wiki/Core_dump" />.
       </para>
 
@@ -211,12 +201,100 @@
 
       <para>
-        <ulink
-          url="http://www.virtualbox.org/wiki/Network_tips">http://www.virtualbox.org/wiki/Network_tips</ulink>.
+        <ulink url="http://www.virtualbox.org/wiki/Network_tips" />.
       </para>
 
       <para>
         The trace files created by &product-name; are in
-        <computeroutput>.pcap</computeroutput> format and can be easily
-        analyzed with Wireshark.
+        <filename>.pcap</filename> format and can be easily analyzed
+        with Wireshark.
+      </para>
+
+    </sect2>
+
+    <sect2 id="ts_vboxbugreport">
+
+      <title>Using the VBoxBugReport Command to Collect Debug Information
+        Automatically</title>
+
+      <para>
+        The <command>VBoxBugReport</command> command is used to collect
+        debug information automatically for an &product-name;
+        installation. This command can be useful when you need to gather
+        information to send to Oracle Support.
+      </para>
+
+      <para>
+        The following examples show how to use
+        <command>VBoxBugReport</command>.
+      </para>
+
+      <para>
+        By default, the command collects <command>VBoxSVC</command>
+        process logs, device settings, and global configuration data for
+        an &product-name; host.
+      </para>
+
+<screen>$ VBoxBugReport
+  ...
+  0% - collecting VBoxSVC.log.10...
+  7% - collecting VBoxSVC.log.9...
+  ...
+ 64% - collecting VBoxSVC.log.1...
+ 71% - collecting VBoxSVC.log...
+ 78% - collecting VirtualBox.xml...
+ 85% - collecting HostUsbDevices...
+ 92% - collecting HostUsbFilters...
+100% - compressing...
+
+Report was written to '2019-03-26-13-32-02-bugreport.tgz'</screen>
+
+      <para>
+        The results are saved as a compressed tar file archive in the
+        same directory where the command is run.
+      </para>
+
+      <para>
+        To specify a different output file location:
+      </para>
+
+<screen>$ VBoxBugReport --output ~/debug/bug004.tgz</screen>
+
+      <para>
+        To output all debug information to a single text file, rather
+        than a <filename>tgz</filename> file:
+      </para>
+
+<screen>$ VBoxBugReport --text</screen>
+
+      <para>
+        To collect information for a specific VM, called
+        <literal>Windows_10</literal>:
+      </para>
+
+<screen>$ VBoxBugReport Windows_10</screen>
+
+      <para>
+        This command collects machine settings, guest properties, and
+        log files for the specified VM. Global configuration information
+        for the host is also included.
+      </para>
+
+      <para>
+        To collect information for several VMs, called
+        <literal>Windows_7</literal>, <literal>Windows_8</literal>, and
+        <literal>Windows_10</literal>:
+      </para>
+
+<screen>$ VBoxBugReport Windows_7 Windows_8 Windows_10</screen>
+
+      <para>
+        To collect information for all VMs:
+      </para>
+
+<screen>$ VBoxBugReport --all</screen>
+
+      <para>
+        To show a full list of the available command options, run
+        <command>VBoxBugReport --help</command>.
       </para>
 
@@ -262,6 +340,5 @@
         <listitem>
           <para>
-            Using the <computeroutput>telnet</computeroutput> protocol
-            on port 5000
+            Using the <command>telnet</command> protocol on port 5000
           </para>
         </listitem>
@@ -277,21 +354,18 @@
         <listitem>
           <para>
-            Start the VM directly using <command>VirtualBox
+            Start the VM directly using <command>VirtualBoxVM
             --startvm</command>, with an additional
-            <computeroutput>--dbg</computeroutput>,
-            <computeroutput>--debug</computeroutput>, or
-            <computeroutput>--debug-command-line</computeroutput>
-            argument. See the <command>VirtualBox</command> command
-            usage help for details.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Set the
-            <computeroutput>VBOX_GUI_DBG_ENABLED</computeroutput> or
-            <computeroutput>VBOX_GUI_DBG_AUTO_SHOW</computeroutput>
-            environment variable to
-            <computeroutput>true</computeroutput> before launching the
+            <option>--dbg</option>, <option>--debug</option>, or
+            <option>--debug-command-line</option> argument. See the
+            <command>VirtualBoxVM --help</command> command usage help
+            for details.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Set the <literal>VBOX_GUI_DBG_ENABLED</literal> or
+            <literal>VBOX_GUI_DBG_AUTO_SHOW</literal> environment
+            variable to <literal>true</literal> before launching the
             &product-name; process. Setting these variables, only their
             presence is checked, is effective even when the first
@@ -304,8 +378,7 @@
         <listitem>
           <para>
-            Set the <computeroutput>GUI/Dbg/Enabled</computeroutput>
-            extra data item to <computeroutput>true</computeroutput>
-            before launching the VM. This can be set globally or on a
-            per VM basis.
+            Set the <literal>GUI/Dbg/Enabled</literal> extra data item
+            to <literal>true</literal> before launching the VM. This can
+            be set globally or on a per VM basis.
           </para>
         </listitem>
@@ -341,103 +414,106 @@
         <listitem>
           <para>
-            <computeroutput>stop</computeroutput>: Stops the VM
-            execution and enables single stepping
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>g</computeroutput>: Continue VM execution
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>t</computeroutput>: Single step an
-            instruction
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>rg/rh/r</computeroutput>: Print the
-            guest/hypervisor/current registers
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>kg/kh/k</computeroutput>: Print the
-            guest/hypervisor/current call stack
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>da/db/dw/dd/dq</computeroutput>: Print
-            memory contents as ASCII/bytes/words/dwords/qwords
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>u</computeroutput>: Unassemble memory
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>dg</computeroutput>: Print the guest's GDT
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>di</computeroutput>: Print the guest's IDT
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>dl</computeroutput>: Print the guest's LDT
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>dt</computeroutput>: Print the guest's TSS
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>dp*</computeroutput>: Print the guest's page
-            table structures
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>bp/br</computeroutput>: Set a
-            normal/recompiler breakpoint
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>bl</computeroutput>: List breakpoints
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>bc</computeroutput>: Clear a breakpoint
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>writecore</computeroutput>: Write a VM core
-            file to disk. See <xref linkend="ts_guest-core-format" />
+            <command>stop</command>: Stops the VM execution and enables
+            single stepping
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>g</command>: Continue VM execution
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>t</command>: Single step an instruction
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>rg</command>, <command>rh</command>, and
+            <command>r</command>: Print the guest, hypervisor, and
+            current registers
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>kg</command>, <command>kh</command>, and
+            <command>k</command>: Print the guest, hypervisor, and
+            current call stack
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>da</command>, <command>db</command>,
+            <command>dw</command>, <command>dd</command>,
+            <command>dq</command>: Print memory contents as ASCII,
+            bytes, words, dwords, and qwords
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>u</command>: Unassemble memory
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>dg</command>: Print the guest's GDT
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>di</command>: Print the guest's IDT
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>dl</command>: Print the guest's LDT
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>dt</command>: Print the guest's TSS
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>dp*</command>: Print the guest's page table
+            structures
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>bp</command> and <command>br</command>: Set a
+            normal and recompiler breakpoint
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>bl</command>: List breakpoints
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>bc</command>: Clear a breakpoint
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>writecore</command>: Write a VM core file to disk.
+            See <xref linkend="ts_guest-core-format" />
           </para>
         </listitem>
@@ -446,6 +522,6 @@
 
       <para>
-        See the built-in <computeroutput>help</computeroutput> for other
-        available commands.
+        See the built-in <command>help</command> for other available
+        commands.
       </para>
 
@@ -459,13 +535,12 @@
         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
+        <filename>/proc/kallsyms</filename> on Linux guests. This file
+        must be copied to the host, for example using
         <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
-        configuration changes, the symbols will change as well and must
-        be updated.
+        the VM debugger. Note that the <filename>kallsyms</filename>
+        file contains the symbols for the currently loaded modules. If
+        the guest's configuration changes, the symbols will change as
+        well and must be updated.
       </para>
 
@@ -494,75 +569,69 @@
         <listitem>
           <para>
-            <computeroutput>cfgm</computeroutput>: Print a branch of the
-            configuration tree
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>cpuid</computeroutput>: Display the guest
-            CPUID leaves
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>ioport</computeroutput>: Print registered
-            I/O port ranges
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>mmio</computeroutput>: Print registered MMIO
-            ranges
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>mode</computeroutput> -- print the current
-            paging mode
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>pit</computeroutput>: Print the i8254 PIT
-            state
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>pic</computeroutput>: Print the i8259A PIC
-            state
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>ohci/ehci/xhci</computeroutput>: Print a
-            subset of the OHCI/EHCI/xHCI USB controller state
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>pcnet0</computeroutput>: Print the PCnet
-            state
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>vgatext</computeroutput>: Print the contents
-            of the VGA framebuffer formatted as standard text mode
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>timers</computeroutput>: Print all VM timers
+            <command>cfgm</command>: Print a branch of the configuration
+            tree
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>cpuid</command>: Display the guest CPUID leaves
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>ioport</command>: Print registered I/O port ranges
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>mmio</command>: Print registered MMIO ranges
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>mode</command>: Print the current paging mode
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>pit</command>: Print the i8254 PIT state
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>pic</command>: Print the i8259A PIC state
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>ohci</command>, <command>ehci</command>,
+            <command>xhci</command>: Print a subset of the OHCI, EHCI,
+            and xHCI USB controller state
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>pcnet0</command>: Print the PCnet state
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>vgatext</command>: Print the contents of the VGA
+            framebuffer formatted as standard text mode
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <command>timers</command>: Print all VM timers
           </para>
         </listitem>
@@ -593,6 +662,5 @@
 
       <para>
-        <ulink
-      url="http://downloads.openwatcom.org/ftp/devel/docs/elf-64-gen.pdf">http://downloads.openwatcom.org/ftp/devel/docs/elf-64-gen.pdf</ulink>.
+        <ulink url="http://downloads.openwatcom.org/ftp/devel/docs/elf-64-gen.pdf" />.
       </para>
 
@@ -628,14 +696,13 @@
         The relevant data structures and definitions can be found in the
         &product-name; sources under the following header files:
-        <computeroutput>include/VBox/dbgfcorefmt.h</computeroutput>,
-        <computeroutput>include/iprt/x86.h</computeroutput> and
-        <computeroutput>src/VBox/Runtime/include/internal/ldrELFCommon.h</computeroutput>.
+        <filename>include/VBox/dbgfcorefmt.h</filename>,
+        <filename>include/iprt/x86.h</filename> and
+        <filename>src/VBox/Runtime/include/internal/ldrELFCommon.h</filename>.
       </para>
 
       <para>
         The VM core file can be inspected using
-        <computeroutput>elfdump</computeroutput> and GNU
-        <computeroutput>readelf</computeroutput> or other similar
-        utilities.
+        <command>elfdump</command> and GNU <command>readelf</command> or
+        other similar utilities.
       </para>
 
@@ -684,6 +751,6 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name"
-"VBoxInternal/Devices/piix3ide/0/LUN#[x]/Config/FlushInterval" [b]</screen>
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable>
+"VBoxInternal/Devices/piix3ide/0/LUN#[<replaceable>x</replaceable>]/Config/FlushInterval" [<replaceable>b</replaceable>]</screen>
 
       <para>
@@ -691,37 +758,44 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name"
-"VBoxInternal/Devices/ahci/0/LUN#[x]/Config/FlushInterval" [b]</screen>
-
-      <para>
-        The value [x] that selects the disk for IDE is 0 for the master
-        device on the first channel, 1 for the slave device on the first
-        channel, 2 for the master device on the second channel or 3 for
-        the slave device on the second channel. For SATA use values
-        between 0 and 29. Only disks support this configuration option;
-        it must not be set for CD/DVD drives.
-      </para>
-
-      <para>
-        The unit of the interval [b] is the number of bytes written
-        since the last flush. The value for it must be selected so that
-        the occasional long write delays do not occur. Since the proper
-        flush interval depends on the performance of the host and the
-        host filesystem, finding the optimal value that makes the
-        problem disappear requires some experimentation. Values between
-        1000000 and 10000000 (1 to 10 megabytes) are a good starting
-        point. Decreasing the interval both decreases the probability of
-        the problem and the write performance of the guest. Setting the
-        value unnecessarily low will cost performance without providing
-        any benefits. An interval of 1 will cause a flush for each write
-        operation and should solve the problem in any case, but has a
-        severe write performance penalty.
-      </para>
-
-      <para>
-        Providing a value of 0 for [b] is treated as an infinite flush
-        interval, effectively disabling this workaround. Removing the
-        extra data key by specifying no value for [b] has the same
-        effect.
+<screen>VBoxManage setextradata <replaceable>VM-name</replaceable>
+"VBoxInternal/Devices/ahci/0/LUN#[<replaceable>x</replaceable>]/Config/FlushInterval" [<replaceable>b</replaceable>]</screen>
+
+      <para>
+        <literal>[<replaceable>x</replaceable>]</literal> specifies the
+        disk for IDE. <literal>0</literal> represents the master device
+        on the first channel, <literal>1</literal> represents the slave
+        device on the first channel, <literal>2</literal> represents the
+        master device on the second channel, and <literal>3</literal>
+        represents the slave device on the second channel. For SATA, use
+        values between <literal>0</literal> and <literal>29</literal>.
+        This configuration option applies to disks only. Do not use this
+        option for CD or DVD drives.
+      </para>
+
+      <para>
+        The unit of the interval
+        (<literal>[<replaceable>b</replaceable>]</literal>) is the
+        number of bytes written since the last flush. The value for it
+        must be selected so that the occasional long write delays do not
+        occur. Since the proper flush interval depends on the
+        performance of the host and the host filesystem, finding the
+        optimal value that makes the problem disappear requires some
+        experimentation. Values between 1000000 and 10000000 (1 to 10
+        megabytes) are a good starting point. Decreasing the interval
+        both decreases the probability of the problem and the write
+        performance of the guest. Setting the value unnecessarily low
+        will cost performance without providing any benefits. An
+        interval of 1 will cause a flush for each write operation and
+        should solve the problem in any case, but has a severe write
+        performance penalty.
+      </para>
+
+      <para>
+        Providing a value of <literal>0</literal> for
+        <literal>[<replaceable>b</replaceable>]</literal> is treated as
+        an infinite flush interval, effectively disabling this
+        workaround. Removing the extra data key by specifying no value
+        for <literal>[<replaceable>b</replaceable>]</literal> has the
+        same effect.
       </para>
 
@@ -744,11 +818,12 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/Devices/piix3ide/0/LUN#[x]/Config/IgnoreFlush" 0</screen>
-
-      <para>
-        The value [x] that selects the disk is 0 for the master device
-        on the first channel, 1 for the slave device on the first
-        channel, 2 for the master device on the second channel or 3 for
-        the master device on the second channel.
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/Devices/piix3ide/0/LUN#[<replaceable>x</replaceable>]/Config/IgnoreFlush" 0</screen>
+
+      <para>
+        <literal>[<replaceable>x</replaceable>]</literal> specifies the
+        disk. is 0 for the master device on the first channel, 1 for the
+        slave device on the first channel, 2 for the master device on
+        the second channel or 3 for the master device on the second
+        channel.
       </para>
 
@@ -757,5 +832,5 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/Devices/ahci/0/LUN#[x]/Config/IgnoreFlush" 0</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/Devices/ahci/0/LUN#[x]/Config/IgnoreFlush" 0</screen>
 
       <para>
@@ -767,8 +842,7 @@
         Note that this does not affect the flushes performed according
         to the configuration described in
-        <xref linkend="ts_config-periodic-flush"
-      xrefstyle="template: %n" />.
-        Restoring the default of ignoring flush commands is possible by
-        setting the value to 1 or by removing the key.
+        <xref linkend="ts_config-periodic-flush"/>. Restoring the
+        default of ignoring flush commands is possible by setting the
+        value to 1 or by removing the key.
       </para>
 
@@ -780,5 +854,5 @@
 
       <para>
-        Many newer multi-core processors support some form of frequency
+        Many multicore processors support some form of frequency
         boosting, which means that if only one core is utilized, it can
         run possibly 50% faster or even more than the rated CPU
@@ -807,5 +881,5 @@
         scaling may cause CPU usage reporting to be highly misleading.
         This happens in situations when the host CPU load is significant
-        but not heavy, such as 15-30% of the maximum.
+        but not heavy, such as between 15% to 30% of the maximum.
       </para>
 
@@ -814,9 +888,9 @@
         spent, measuring for example how many nanoseconds the systems or
         a process was active within one second. However, in order to
-        save energy, modern systems can significantly scale down CPU
-        speed when the system is not fully loaded. Naturally, when the
-        CPU is running at for example one half of its maximum speed, the
-        same number of instructions will take roughly twice as long to
-        execute compared to running at full speed.
+        save energy, systems can significantly scale down CPU speed when
+        the system is not fully loaded. When the CPU is running at for
+        example one half of its maximum speed, the same number of
+        instructions will take roughly twice as long to execute compared
+        to running at full speed.
       </para>
 
@@ -872,9 +946,9 @@
         support in the system's BIOS should be disabled, if such a
         setting is available. Not all systems support the C1E power
-        state. On Intel systems, the <computeroutput>Intel C
-        State</computeroutput> setting should be disabled. Disabling
-        other power management settings may also improve performance.
-        However, a balance between performance and power consumption
-        must always be considered.
+        state. On Intel systems, the <literal>Intel C State</literal>
+        setting should be disabled. Disabling other power management
+        settings may also improve performance. However, a balance
+        between performance and power consumption must always be
+        considered.
       </para>
 
@@ -897,5 +971,5 @@
       </para>
 
-<screen>VBoxTestOGL --log "log_file_name" --test 2D</screen>
+<screen>$ VBoxTestOGL --log "log_file_name" --test 2D</screen>
 
       <para>
@@ -979,9 +1053,8 @@
             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 &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.
+            disk image from an older version of &product-name; to a new
+            virtual machine. The default subtype of IDE controller
+            hardware used by &product-name; is PIIX4. Make sure that the
+            storage controller settings are identical.
           </para>
         </listitem>
@@ -1005,7 +1078,5 @@
       <para>
         According to Microsoft, this is due to a race condition in
-        Windows. A hotfix is available. See
-        <ulink
-          url="http://support.microsoft.com/kb/955076">http://support.microsoft.com/kb/955076</ulink>.
+        Windows. A hotfix is available from Microsoft.
       </para>
 
@@ -1043,5 +1114,5 @@
           <para>
             Installation complains about a failure installing
-            <computeroutput>msgina.dll</computeroutput>.
+            <filename>msgina.dll</filename>.
           </para>
         </listitem>
@@ -1066,5 +1137,5 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/Devices/piix3ide/0/Config/IRQDelay" 1</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/Devices/piix3ide/0/Config/IRQDelay" 1</screen>
 
       <para>
@@ -1083,6 +1154,6 @@
 
       <para>
-        When Windows guests run into a kernel crash, they display the
-        infamous bluescreen. Depending on how Windows is configured, the
+        When Windows guests run into a kernel crash, they display a
+        bluescreen error. Depending on how Windows is configured, the
         information will remain on the screen until the machine is
         restarted or it will reboot automatically. During installation,
@@ -1098,28 +1169,5 @@
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/PDM/HaltOnReset" 1</screen>
-
-    </sect2>
-
-    <sect2 id="ts_pcnet-driver-win-2003-server-guest">
-
-      <title>PCnet Driver Failure in 32-bit Windows Server 2003 Guests</title>
-
-      <para>
-        Certain editions of Windows 2000 and 2003 servers support more
-        than 4 GB RAM on 32-bit systems. The AMD PCnet network driver
-        shipped with Windows Server 2003 fails to load if the 32-bit
-        guest OS uses paging extensions, which will occur with more than
-        approximately 3.5 GB RAM assigned to the VM.
-      </para>
-
-      <para>
-        This problem is known to occur with version 4.38.0.0 of the
-        PCnet driver. The issue was fixed in version 4.51.0.0 of the
-        driver, which is available as a separate download. An
-        alternative solution may be changing the emulated NIC type to
-        Intel PRO/1000 MT Desktop (82540EM), or reducing the RAM
-        assigned to the VM to approximately 3.5 GB or less.
-      </para>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/PDM/HaltOnReset" 1</screen>
 
     </sect2>
@@ -1131,6 +1179,6 @@
       <para>
         With Windows Vista, Microsoft dropped support for the AMD PCNet
-        card that &product-name; used to provide as the default virtual
-        network card before version 1.6.0. For Windows Vista guests,
+        card that legacy versions of &product-name; used to provide as
+        the default virtual network card. For Windows Vista guests,
         &product-name; now uses an Intel E1000 card by default.
       </para>
@@ -1152,5 +1200,5 @@
       <para>
         Several background applications of Windows guests, especially
-        virus scanners, are known to increases the CPU load notably even
+        virus scanners, are known to increase the CPU load notably even
         if the guest appears to be idle. We recommend to deactivate
         virus scanners within virtualized guests if possible.
@@ -1168,6 +1216,6 @@
         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:
+        <filename>\windows\system32\drivers\etc\lmhosts</filename> of
+        the Windows guest:
       </para>
 
@@ -1194,11 +1242,10 @@
       <para>
         The USB HID (Human Interface Device) drivers in Windows 98 are
-        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
+        very old and do not handle tablets in the same way as modern
+        operating systems do. To work around the problem, use the
         following command:
       </para>
 
-<screen>VBoxManage setextradata "VM name" "VBoxInternal/USB/HidMouse/0/Config/CoordShift" 0</screen>
+<screen>$ VBoxManage setextradata <replaceable>VM-name</replaceable> "VBoxInternal/USB/HidMouse/0/Config/CoordShift" 0</screen>
 
       <para>
@@ -1216,223 +1263,16 @@
       <para>
         If a Windows guest is a member of an Active Directory domain and
-        the snapshot feature of &product-name; is used, it could happen
-        it loses this status after you restore an older snapshot.
-      </para>
-
-      <para>
-        The reason is the automatic machine password changing performed
+        the snapshot feature of &product-name; is used, it could be
+        removed from the Active Direcory domain after you restore an
+        older snapshot.
+      </para>
+
+      <para>
+        This is caused by automatic machine password changes performed
         by Windows at regular intervals for security purposes. You can
-        disable this feature by following the instruction of the
-        following article from Microsoft:
-        <ulink
-          url="http://support.microsoft.com/kb/154501">http://support.microsoft.com/kb/154501</ulink>
-      </para>
-
-    </sect2>
-
-    <sect2 id="ts_d3d8-d3d9-restore">
-
-      <title>Restoring d3d8.dll and d3d9.dll</title>
-
-      <para>
-        &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>
-
-      <para>
-        For WDDM Direct3D support however, the originally shipped
-        d3d8.dll and d3d9.dll files are required in order to run
-        Direct3D 8.0 and Direct3D 9.0 applications. As a result of the
-        above mentioned system files corruption these applications will
-        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 &product-name; Guest Additions installer warned about
-        those incorrect files or when having trouble running Direct3D
-        applications.
-      </para>
-
-      <note>
-        <para>
-          Starting at Windows 7 the 3D desktop, called Aero, uses
-          DirectX 10 for rendering so that corrupted d3d8.dll and
-          d3d9.dll system files will have no effect on the actual
-          rendering.
-        </para>
-      </note>
-
-      <para>
-        This is why such a detected file corruption is not considered as
-        fatal for the basic Direct3D installation on all supported
-        Windows guests, and for WDDM Direct3D installation on Windows 7
-        and later guests.
-      </para>
-
-      <para>
-        <emphasis role="bold">Extracting d3d8 and d3d9.dll from a
-        Windows XP installation CD:</emphasis>
-      </para>
-
-      <orderedlist>
-
-        <listitem>
-          <para>
-            Download and install the latest version of 7-Zip File
-            Manager.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Browse into the installation CD. For example E:\i386, or
-            E:\amd64 for the 64-bit version.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Locate the entries d3d8.dl_ and d3d9.dl_. Double-click on
-            the file names and extract d3d8.dll and d3d9.dll.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Reboot Windows in Safe mode.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Copy the extracted d3d8.dll and d3d9.dll files to
-            C:\Windows\system32 and C:\Windows\system32\dllcache.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Reboot Windows.
-          </para>
-        </listitem>
-
-      </orderedlist>
-
-      <para>
-        <emphasis role="bold">Extracting d3d8 and d3d9.dll from a
-        Windows XP Service pack:</emphasis>
-      </para>
-
-      <orderedlist>
-
-        <listitem>
-          <para>
-            Download and install the latest version of 7-Zip File
-            Manager.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Choose Open Inside, to open WindowsXP-KB936929-SP3-x86.exe
-            as an archive and browse the i386 directory.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Locate the entries d3d8.dl_ and d3d9.dl_. Double-click on
-            the file names and extract d3d8.dll and d3d9.dll.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Reboot Windows in Safe mode.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Copy the extracted d3d8.dll and d3d9.dll files to
-            C:\Windows\system32 and C:\Windows\system32\dllcache.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Reboot Windows.
-          </para>
-        </listitem>
-
-      </orderedlist>
-
-      <para>
-        <emphasis role="bold">Extracting d3d8 and d3d9.dll from a
-        Vista/Windows7 installation CD or Service Pack ISO:</emphasis>
-      </para>
-
-      <orderedlist>
-
-        <listitem>
-          <para>
-            Download and install the latest version of 7-Zip File
-            Manager.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Browse into the installation CD. For example E:\sources.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Locate file install.wim and double-click the file. After the
-            7-Zip utility unzips the file, you will see a few numbered
-            folders. Each numeric subfolder represents a different
-            version of Windows such as Starter or Home Basic.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Open one of the numeric folders and browse to the
-            Windows\System32 directory, or C:\Windows\SysWOW64 for the
-            64-bit version. Locate and extract the d3d8.dll and d3d9.dll
-            files.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Copy extracted the d3d8.dll and d3d9.dll files to
-            C:\Windows\system32 or C:\Windows\SysWOW64. Files from
-            system32 should go to system32, from SysWOW64 to SysWOW64.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Reboot Windows.
-          </para>
-        </listitem>
-
-      </orderedlist>
+        disable this feature as shown in the following article from
+        Microsoft:
+        <ulink url="http://support.microsoft.com/kb/154501" />.
+      </para>
 
     </sect2>
@@ -1452,7 +1292,6 @@
 
       <para>
-        This is a HIMEM.SYS limitation documented by Microsoft in
-        Knowledge base article KB 116256. Windows 3.1 memory limits are
-        described in detail in Microsoft Knowledge base article KB
+        This is a known HIMEM.SYS limitation. Windows 3.1 memory limits
+        are described in detail in Microsoft Knowledge base article KB
         84388.
       </para>
@@ -1487,26 +1326,11 @@
 
       <para>
-        Linux kernels shipped with Red Hat Enterprise Linux (RHEL) as of
-        release 4.7 and 5.1 as well as kernels of related Linux
-        distributions, such as CentOS and Oracle Linux, support a kernel
-        parameter <emphasis>divider=N</emphasis>. Hence, such kernels
-        support a lower timer frequency without recompilation. We
-        suggest you add the kernel parameter
-        <emphasis>divider=10</emphasis> to select a guest kernel timer
-        frequency of 100Hz.
-      </para>
-
-    </sect2>
-
-    <sect2 id="ts_linux-guest-amd-barcelona">
-
-      <title>AMD Barcelona CPUs</title>
-
-      <para>
-        Most Linux-based guests will fail with AMD Phenoms or
-        Barcelona-level Opterons due to a bug in the Linux kernel.
-        Enable the I/O-APIC to work around the problem. See
-        <xref
-      linkend="settings-system" />.
+        Linux kernels shipped with Red Hat Enterprise Linux, as well as
+        kernels of related Linux distributions, such as CentOS and
+        Oracle Linux, support a kernel parameter
+        <emphasis>divider=N</emphasis>. Hence, such kernels support a
+        lower timer frequency without recompilation. We suggest you add
+        the kernel parameter <emphasis>divider=10</emphasis> to select a
+        guest kernel timer frequency of 100Hz.
       </para>
 
@@ -1545,13 +1369,11 @@
             If you see this message, either disable hardware
             virtualization or the I/O APIC as described in
-            <xref
-            linkend="settings-system" />, or upgrade
-            the guest to a newer kernel.
+            <xref linkend="settings-system" />, or upgrade the guest to
+            a newer kernel.
           </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>
+            <ulink url="http://www.mail-archive.com/git-commits-head@vger.kernel.org/msg30813.html" />
             for details about the kernel fix.
           </para>
@@ -1569,14 +1391,14 @@
         Guest desktop services in guests running the X11 window system
         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>
-
-<screen>VBoxClient --clipboard
-VBoxClient --display
-VBoxClient --seamless</screen>
+        service called <command>VBoxClient</command>, 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>
+
+<screen>$ VBoxClient --clipboard
+$ VBoxClient --display
+$ VBoxClient --seamless</screen>
 
       <para>
@@ -1587,13 +1409,13 @@
 
       <para>
-        The <computeroutput>VBoxClient</computeroutput> processes create
-        files in the user's home directory with names of the form
-        <computeroutput>.vboxclient-*.pid</computeroutput> when they are
-        running in order to prevent a given service from being started
-        twice. It can happen due to misconfiguration that these files
-        are created owned by root and not deleted when the services are
-        stopped, which will prevent them from being started in future
-        sessions. If the services cannot be started, you may wish to
-        check whether these files still exist.
+        The <command>VBoxClient</command> processes create files in the
+        user's home directory with names of the form
+        <filename>.vboxclient-*.pid</filename> when they are running in
+        order to prevent a given service from being started twice. It
+        can happen due to misconfiguration that these files are created
+        owned by root and not deleted when the services are stopped,
+        which will prevent them from being started in future sessions.
+        If the services cannot be started, you may wish to check whether
+        these files still exist.
       </para>
 
@@ -1606,25 +1428,4 @@
     <title>Oracle Solaris Guests</title>
 
-    <sect2 id="ts_solaris-10-guest-crash">
-
-      <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.
-      </para>
-
-      <para>
-        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 Oracle Solaris is using the 32-bit kernel.
-      </para>
-
-    </sect2>
-
     <sect2 id="ts_solaris-10-guest-slow-boot-smp">
 
@@ -1632,14 +1433,13 @@
 
       <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 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.
+        When using more than one CPU, 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 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>
 
@@ -1649,51 +1449,4 @@
         solutions include restricting the number of virtual CPUs to one
         or possibly using a different storage controller.
-      </para>
-
-    </sect2>
-
-    <sect2 id="ts_solaris-8-guest-crash">
-
-      <title>Solaris 8 5/01 and Earlier May Crash on Startup</title>
-
-      <para>
-        Solaris 2.6, 7 and 8 releases up to and including Solaris 8 4/01
-        ("S8U4") incorrectly set up Machine Check Exception (MCE) MSRs
-        on Pentium 4 and some later Intel CPUs. The problem leads to the
-        Solaris kernel crashing, and usually causing a triple fault,
-        almost immediately during startup, in both virtualized and
-        physical environments. Solaris 9 and later releases are not
-        affected by this problem, and neither is Solaris 2.5.1 and
-        earlier.
-      </para>
-
-      <para>
-        The recommended solution is upgrading to at least Solaris 8 7/01
-        ("S8U5"). Alternative solutions include applying a patch for
-        bugs 4408508 and 4414557 on an unaffected system.
-      </para>
-
-    </sect2>
-
-  </sect1>
-
-  <sect1 id="ts_fbsd-guests">
-
-    <title>FreeBSD Guests</title>
-
-    <sect2 id="ts_fbsd-guest-xhci">
-
-      <title>FreeBSD 10.0 May Hang with xHCI</title>
-
-      <para>
-        If xHCI (USB 3.0) emulation is enabled for FreeBSD 10.0 guests,
-        the guest OS will hang. This is caused by the guest OS
-        incorrectly handling systems where Message Signaled Interrupts
-        (MSIs) are not used with the xHCI device.
-      </para>
-
-      <para>
-        The problem does not exist in earlier FreeBSD releases and was
-        fixed in FreeBSD 10.1.
       </para>
 
@@ -1717,7 +1470,7 @@
         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 an &product-name; process
-        is started, it requests access to the COM server and Windows
+        process <filename>VBoxSVC.exe</filename>, which is 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.
@@ -1727,5 +1480,5 @@
         When the last process disconnects from the COM server, it will
         terminate itself after some seconds. The &product-name;
-        configuration (XML files) is maintained and owned by the COM
+        configuration XML files are maintained and owned by the COM
         server and the files are locked whenever the server runs.
       </para>
@@ -1739,5 +1492,5 @@
         subsequently other processes fail to initialize it. In these
         situations, it is recommended to use the Windows task manager to
-        kill the process <computeroutput>VBoxSVC.exe</computeroutput>.
+        kill the process <filename>VBoxSVC.exe</filename>.
       </para>
 
@@ -1746,9 +1499,9 @@
     <sect2 id="ts_win-host-cd-dvd-changes">
 
-      <title>CD/DVD Changes Not Recognized</title>
-
-      <para>
-        In case you have assigned a physical CD/DVD drive to a guest and
-        the guest does not notice when the medium changes, make sure
+      <title>CD and DVD Changes Not Recognized</title>
+
+      <para>
+        In case you have assigned a physical CD or DVD drive to a guest
+        and the guest does not notice when the medium changes, make sure
         that the Windows media change notification (MCN) feature is not
         turned off. This is represented by the following key in the
@@ -1819,9 +1572,9 @@
 
       <para>
-        Setting the environment variable
-        <computeroutput>VBOX_DISABLE_HOST_DISK_CACHE</computeroutput> to
-        1 will enable a workaround for this problem until Microsoft
-        addresses the issue. For example, open a command prompt window
-        and start &product-name; like this:
+        Setting the <literal>VBOX_DISABLE_HOST_DISK_CACHE</literal>
+        environment variable to <literal>1</literal> enables a
+        workaround for this problem until Microsoft addresses the issue.
+        For example, open a command prompt window and start
+        &product-name; like this:
       </para>
 
@@ -1855,6 +1608,6 @@
             The maximum allowed filter count was reached on the host. In
             this case, the MSI log would mention the
-            <computeroutput>0x8004a029</computeroutput> error code
-            returned on NetFlt network component install, as follows:
+            <literal>0x8004a029</literal> error code returned on NetFlt
+            network component install, as follows:
           </para>
 
@@ -1876,16 +1629,12 @@
         <listitem>
           <para>
-            The INF cache is corrupt. In this case, the install log
-            (<computeroutput>%windir%\inf\setupapi.log</computeroutput>
-            on 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 either the
-            <computeroutput>sun_VBoxNetFlt</computeroutput> or
-            <computeroutput>sun_VBoxNetFltmp</computeroutput>
-            components. The solution then is to uninstall
-            &product-name;, remove the INF cache
-            (<computeroutput>%windir%\inf\INFCACHE.1</computeroutput>),
-            reboot and try to reinstall &product-name;.
+            The INF cache is corrupt. In this case, the install log at
+            <filename>%windir%\inf\setupapi.dev.log</filename> would
+            typically mention the failure to find a suitable driver
+            package for either the <command>sun_VBoxNetFlt</command> or
+            <command>sun_VBoxNetFltmp</command> components. The solution
+            then is to uninstall &product-name;, remove the INF cache
+            (<filename>%windir%\inf\INFCACHE.1</filename>), reboot and
+            try to reinstall &product-name;.
           </para>
         </listitem>
@@ -1903,16 +1652,12 @@
         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
-        Windows XP or
-        <computeroutput>%windir%\inf\setupapi.dev.log</computeroutput>
-        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 &product-name;, remove the INF
-        cache
-        (<computeroutput>%windir%\inf\INFCACHE.1</computeroutput>),
-        reboot and try to reinstall &product-name;.
+        install log at
+        <filename>%windir%\inf\setupapi.dev.log</filename> would
+        typically mention the failure to find a suitable driver package
+        for the <filename>sun_VBoxNetAdp</filename> component. Again, as
+        with the bridged networking problem described above, the
+        solution is to uninstall &product-name;, remove the INF cache
+        (<filename>%windir%\inf\INFCACHE.1</filename>), reboot and try
+        to reinstall &product-name;.
       </para>
 
@@ -1930,12 +1675,12 @@
 
       <para>
-        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 <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.
+        If the &product-name; kernel module, <command>vboxdrv</command>,
+        refuses to load you may see an <literal>Error inserting vboxdrv:
+        Invalid argument</literal> message. 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 that was used to build the
+        kernel.
       </para>
 
@@ -1944,93 +1689,22 @@
     <sect2 id="ts_linux-host-cd-dvd-not-found">
 
-      <title>Linux Host CD/DVD Drive Not Found</title>
-
-      <para>
-        If you have configured a virtual machine to use the host's
-        CD/DVD drive, but this does not appear to work, make sure that
-        the current user has permission to access the corresponding
-        Linux device file. This is
-        <computeroutput>/dev/hdc</computeroutput>,
-        <computeroutput>/dev/scd0</computeroutput>,
-        <computeroutput>/dev/cdrom</computeroutput> or similar. On most
-        distributions, the user must be added to a corresponding group,
-        usually called <computeroutput>cdrom</computeroutput> or
-        <computeroutput>cdrw</computeroutput>.
-      </para>
-
-    </sect2>
-
-    <sect2 id="ts_linux-host-cd-dvd-not-found-legacy">
-
-      <title>Linux Host CD/DVD Drive Not Found (Older Distributions)</title>
-
-      <para>
-        On older Linux distributions, if your CD/DVD device has a
-        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>
-
-      <orderedlist>
-
-        <listitem>
-          <para>
-            &product-name; checks if the environment variable
-            <computeroutput>VBOX_CDROM</computeroutput> is defined. If
-            so, &product-name; omits all the following checks.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            &product-name; tests if
-            <computeroutput>/dev/cdrom</computeroutput> works.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            &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.
-          </para>
-        </listitem>
-
-      </orderedlist>
-
-      <para>
-        You can set the VBOX_CDROM environment variable to contain a
-        list of your CD/DVD devices, separated by colons. For example:
-      </para>
-
-<screen>export VBOX_CDROM='/dev/cdrom0:/dev/cdrom1'</screen>
-
-      <para>
-        On modern Linux distributions, &product-name; uses the hardware
-        abstraction layer (HAL) to locate CD and DVD hardware.
-      </para>
-
-    </sect2>
-
-    <sect2 id="ts_linux-host-floppy-not-found">
-
-      <title>Linux Host Floppy Not Found</title>
-
-      <para>
-        <xref linkend="ts_linux-host-cd-dvd-not-found-legacy"/> appplies
-        also to floppy disks, except that on older distributions
-        &product-name; tests for
-        <computeroutput>/dev/fd*</computeroutput> devices by default.
-        This can be overridden with the
-        <computeroutput>VBOX_FLOPPY</computeroutput> environment
-        variable.
+      <title>Linux Host CD/DVD or Floppy Disk Drive Not Found</title>
+
+      <para>
+        If you have configured a virtual machine to use the host's CD or
+        DVD drive or floppy disk drive, but this does not appear to
+        work, make sure that the current user has permission to access
+        the corresponding Linux device file. For example, for a CD or
+        DVD drive this may be <filename>/dev/hdc</filename>,
+        <filename>/dev/scd0</filename>, <filename>/dev/cdrom</filename>
+        or similar. On most distributions, the user must be added to a
+        corresponding group, usually called <command>cdrom</command> or
+        <command>cdrw</command> or <command>floppy</command>.
+      </para>
+
+      <para>
+        On supported Linux distributions, &product-name; uses
+        <command>udev</command> to locate hardware such as CD/DVD drives
+        and floppy disk drives.
       </para>
 
@@ -2039,16 +1713,16 @@
     <sect2 id="ts_linux-host-ide-messages">
 
-      <title>Strange Guest IDE Error Messages When Writing to CD/DVD</title>
-
-      <para>
-        If the experimental CD/DVD writer support is enabled with an
-        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. &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 &product-name; cannot detect all misconfigurations. The
+      <title>Strange Guest IDE Error Messages When Writing to CD or DVD</title>
+
+      <para>
+        If the experimental CD or DVD writer support is enabled with an
+        incorrect host or guest configuration, it is possible that any
+        attempt to access the CD or DVD writer fails and simply results
+        in guest kernel error messages for Linux guests 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 or DVD
+        writer is not writable by the user starting the VM. But
+        &product-name; cannot detect all misconfigurations. The
         necessary host and guest OS configuration is not specific for
         &product-name;, but a few frequent problems are listed here
@@ -2058,28 +1732,26 @@
       <para>
         Special care must be taken to use the correct device. The
-        configured host CD/DVD device file name, in most cases
-        <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
+        configured host CD or DVD device file name, in most cases
+        <filename>/dev/cdrom</filename>, must point to the device that
+        allows writing to the CD or DVD unit. For CD or 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>
-
-      <para>
-        Similar rules, except that within the guest the CD/DVD writer is
-        always an IDE device, apply to the guest configuration. Since
+        <filename>/dev/scd0</filename>. Even for IDE CD or DVD writer
+        units this must refer to the appropriate SCSI CD-ROM device
+        node, such as <filename>/dev/scd0</filename>, if the
+        <command>ide-scsi</command> kernel module is loaded. This module
+        is required for CD or DVD writer support with some early 2.6
+        kernels. Many Linux distributions load this module whenever a CD
+        or DVD writer is detected in the system, even if the kernel
+        would support CD or DVD writers without the module.
+        &product-name; supports the use of IDE device files, such as
+        <filename>/dev/hdc</filename>, provided the kernel supports this
+        and the <command>ide-scsi</command> module is not loaded.
+      </para>
+
+      <para>
+        Similar rules, except that within the guest the CD or DVD writer
+        is always an IDE device, apply to the guest configuration. Since
         this setup is very common, it is likely that the default
         configuration of the guest works as expected.
@@ -2096,25 +1768,23 @@
         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 &product-name; processes and
-        maintains the global configuration, such as the XML database.
-        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>
+        <command>VBoxSVC</command> serves as a communication hub between
+        different &product-name; processes and maintains the global
+        configuration, such as the XML database. When starting an
+        &product-name; component, the processes
+        <command>VBoxSVC</command> and <command>VBoxXPCOMIPCD</command>
+        are started automatically. They are only accessible from the
+        user account they are running under. <command>VBoxSVC</command>
         owns the &product-name; configuration database which normally
-        resides in
-        <computeroutput>~/.config/VirtualBox</computeroutput>, or the
+        resides in <filename>~/.config/VirtualBox</filename>, or the
         appropriate configuration directory for your operating system.
         While it is running, the configuration files are locked.
         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>.
+        <command>VBoxSVC</command> is performed through a local domain
+        socket residing in
+        <filename>/tmp/.vbox-<replaceable>username</replaceable>-ipc</filename>.
         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.
+        <command>VBoxSVC</command>, terminate the daemons and remove the
+        local domain socket directory.
       </para>
 
@@ -2127,9 +1797,8 @@
       <para>
         If USB is not working on your Linux host, make sure that the
-        current user is a member of the
-        <computeroutput>vboxusers</computeroutput> group. Please keep in
-        mind that group membership does not take effect immediately but
-        rather at the next login. If available, the
-        <command>newgrp</command> command may avoid the need for a
+        current user is a member of the <literal>vboxusers</literal>
+        group. Please keep in mind that group membership does not take
+        effect immediately but rather at the next login. If available,
+        the <command>newgrp</command> command may avoid the need for a
         logout and login.
       </para>
@@ -2143,9 +1812,8 @@
       <para>
         Linux kernels including the grsec patch, see
-        <ulink
-      url="http://www.grsecurity.net/">http://www.grsecurity.net/</ulink>,
-        and derivates have to disable PAX_MPROTECT for the VBox binaries
-        to be able to start a VM. The reason is that VBox has to create
-        executable code on anonymous memory.
+        <ulink url="http://www.grsecurity.net/" />, and derivates have
+        to disable PAX_MPROTECT for the <command>VBox</command> binaries
+        to be able to start a VM. The reason is that &product-name; has
+        to create executable code on anonymous memory.
       </para>
 
@@ -2161,12 +1829,11 @@
         fail to start with a kernel error saying that the vmalloc pool
         is exhausted and should be extended. The error message also
-        tells you to specify
-        <computeroutput>vmalloc=256MB</computeroutput> in your kernel
-        parameter list. If adding this parameter to your GRUB or LILO
-        configuration makes the kernel fail to boot, with an error
-        message such as "failed to mount the root partition", then you
-        have probably run into a memory conflict of your kernel and
-        initial RAM disk. This can be solved by adding the following
-        parameter to your GRUB configuration:
+        tells you to specify <literal>vmalloc=256MB</literal> in your
+        kernel parameter list. If adding this parameter to your GRUB or
+        LILO configuration makes the kernel fail to boot, with an error
+        message such as <literal>failed to mount the root
+        partition</literal>, then you have probably run into a memory
+        conflict of your kernel and initial RAM disk. This can be solved
+        by adding the following parameter to your GRUB configuration:
       </para>
 
@@ -2190,7 +1857,8 @@
         lead to a heavy fragmentation of the host memory preventing
         &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.
+        ZFS cache by adding the following line to
+        <filename>/etc/system</filename>, where
+        <replaceable>xxxx</replaceable> bytes is the amount of memory
+        usable for the ZFS cache.
       </para>
 
@@ -2199,68 +1867,4 @@
     </sect2>
 
-    <sect2 id="ts_sol-host-swap-space">
-
-      <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 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 Oracle Solaris hosts,
-          64-bit hosts are not affected.
-        </para>
-      </note>
-
-      <para>
-        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>
-
-      <para>
-        For ZFS, run the following as root user:
-      </para>
-
-<screen>zfs create -V 8gb /_&lt;ZFS volume&gt;_/swap
-swap -a /dev/zvol/dsk/_&lt;ZFS volume&gt;_/swap</screen>
-
-      <para>
-        To mount if after reboot, add the following line to /etc/vfstab:
-      </para>
-
-<screen>/dev/zvol/dsk/_&lt;ZFS volume&gt;_/swap - - swap - no -</screen>
-
-      <para>
-        Alternatively, you could grow the existing swap using:
-      </para>
-
-<screen>zfs set volsize=8G rpool/swap</screen>
-
-      <para>
-        And reboot the system for the changes to take effect.
-      </para>
-
-      <para>
-        For UFS (as root user):
-      </para>
-
-<screen>mkfile 7g /path/to/swapfile.img
-swap -a /path/to/swapfile.img</screen>
-
-      <para>
-        To mount it after reboot, add the following line to /etc/vfstab:
-      </para>
-
-<screen>/path/to/swap.img - - swap - no -</screen>
-
-    </sect2>
-
   </sect1>
 
Index: /trunk/doc/manual/en_US/user_VBoxManage.xml
===================================================================
--- /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 82349)
+++ /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 82350)
@@ -254,27 +254,26 @@
       <listitem>
         <para>
-          <computeroutput>-v|--version</computeroutput>: Show the
-          version of this tool and exit.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <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.
+          <option>-v|--version</option>: Show the version of this tool
+          and exit.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--nologo</option>: Suppress the output of the logo
+          information. This option is useful for scripts.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--settingspw</option>: Specifiy a settings password.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--settingspwfile</option>: Specify a file containing
+          the settings password.
         </para>
       </listitem>
@@ -289,7 +288,7 @@
       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
-      setting cannot be unencrypted.
+      <option>--settingspw|--settingspwfile</option> option once, it
+      must be always used. Otherwise, the encrypted setting cannot be
+      unencrypted.
     </para>
 
@@ -318,8 +317,7 @@
           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 <command>showvminfo</command> command, see
-          <xref linkend="vboxmanage-showvminfo"/>.
+          <option>--long</option> or <option>-l</option>, this will be a
+          detailed list as with the <command>showvminfo</command>
+          command, see <xref linkend="vboxmanage-showvminfo"/>.
         </para>
       </listitem>
@@ -527,7 +525,7 @@
 
     <para>
-      Use the <computeroutput>--machinereadable</computeroutput> option
-      to produce the same output, but in machine readable format with a
-      property=value string on each line. For example:
+      Use the <option>--machinereadable</option> option to produce the
+      same output, but in machine readable format with a property=value
+      string on each line. For example:
     </para>
 
@@ -623,9 +621,9 @@
       <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. Note that the machine folder path name varies based on the
-      OS type and the &product-name; version.
+      <filename>.xml</filename> extension and the machine folder, which
+      is a subfolder of the
+      <filename>.config/VirtualBox/Machines</filename> folder. Note that
+      the machine folder path name varies based on the OS type and the
+      &product-name; version.
     </para>
 
@@ -808,5 +806,7 @@
             PCI bus address]&gt;</computeroutput>: Attaches a specified
             PCI network controller on the host to a specified PCI bus on
-            the guest. See <xref linkend="pcipassthrough" />.
+            the guest.
+
+<!--See <xref linkend="pcipassthrough" />.-->
           </para>
         </listitem>
@@ -817,5 +817,7 @@
             address&gt;</computeroutput>: Detaches a specified PCI
             network controller on the host from the attached PCI bus on
-            the guest. See <xref linkend="pcipassthrough" />.
+            the guest.
+
+<!--See <xref linkend="pcipassthrough" />.-->
           </para>
         </listitem>
@@ -1147,7 +1149,18 @@
           <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" />.
+            Enables or disables 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>
+
+        <listitem>
+          <para>
+            <computeroutput>--system-uuid-le on|off</computeroutput>:
+            Enables or disables representing the system UUID in little
+            endian form. The default value is <literal>on</literal> for
+            new VMs. For old VMs the setting is <literal>off</literal>
+            to keep the content of the DMI/SMBIOS table unchanged, which
+            can be important for Windows license activation.
           </para>
         </listitem>
@@ -1224,7 +1237,8 @@
         <listitem>
           <para>
-            <computeroutput>--vm-process-priority default|flat|low|normal|high
-            </computeroutput>: Specifies the priority scheme of the VM process
-            to be used when starting this VM and during VM execution. See
+            <computeroutput>--vm-process-priority
+            default|flat|low|normal|high</computeroutput>: Specifies the
+            priority scheme of the VM process to be used when starting
+            this VM and during VM execution. See
             <xref linkend="vboxmanage-startvm" />.
           </para>
@@ -1268,6 +1282,5 @@
             (<computeroutput>generic</computeroutput>). These options
             correspond to the modes described in
-            <xref
-            linkend="networkingmodes" />.
+            <xref linkend="networkingmodes" />.
           </para>
         </listitem>
@@ -1276,5 +1289,5 @@
           <para>
             <computeroutput>--nictype&lt;1-N&gt;
-            Am79C970A|Am79C973|82540EM|82543GC|82545EM|virtio</computeroutput>:
+            Am79C970A|Am79C973|Am79C970|82540EM|82543GC|82545EM|virtio</computeroutput>:
             Enables you to specify the networking hardware that
             &product-name; presents to the guest for a specified VM
@@ -1670,5 +1683,5 @@
                 connect the virtual serial device to it. Note that
                 Windows requires that the name of a named pipe begins
-                with <computeroutput>\\.\pipe\</computeroutput>.
+                with <filename>\\.\pipe\</filename>.
               </para>
 
@@ -1729,7 +1742,6 @@
                 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.
+                <filename>/dev/ttyS0</filename> or similar. This enables
+                you to wire up a real serial port to a virtual machine.
               </para>
             </listitem>
@@ -1741,5 +1753,5 @@
           <para>
             <computeroutput>uarttype &lt;1-N&gt;
-            16450|16550A|16750</computeroutput>: Confgures the UART
+            16450|16550A|16750</computeroutput>: Configures the UART
             type for a virtual serial port. The default UART type is
             16550A.
@@ -1831,7 +1843,7 @@
           <para>
             <computeroutput>--clipboard-file-transfers
-            enabled|disabled</computeroutput>:
-            Specifies if clipboard file transfers are allowed between host and
-            guest OSEs or not.
+            enabled|disabled</computeroutput>: Specifies if clipboard
+            file transfers are allowed between host and guest OSes or
+            not.
           </para>
         </listitem>
@@ -2652,5 +2664,5 @@
 
     <para>
-      This command import one or more virtual machines to
+      This command imports one or more virtual machines into
       &product-name;. You can import from either of the following:
     </para>
@@ -2666,5 +2678,6 @@
       <listitem>
         <para>
-          A cloud service, such as &oci;. Only a single cloud instance can be imported.
+          A cloud service, such as &oci;. Only a single cloud instance
+          can be imported.
         </para>
       </listitem>
@@ -2673,5 +2686,5 @@
 
     <para>
-      See <xref linkend="ovf" /> for more details on importing VMs from
+      See <xref linkend="ovf" /> for more details on importing VMs into
       &product-name;.
     </para>
@@ -2684,8 +2697,8 @@
         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.
+        needed, to be in the same directory as the OVF file. Many
+        additional command-line options are supported. These enable you
+        to control in detail what is being imported and to modify the
+        import parameters, depending on the content of the OVF file.
       </para>
 
@@ -2694,8 +2707,8 @@
         <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 &product-name;, together with the optional
-        command-line options to influence the import behavior.
+        <computeroutput>-n</computeroutput> option. This will then print
+        a description of the appliance's contents to the screen how it
+        would be imported into &product-name;, together with the
+        optional command-line options to influence the import behavior.
       </para>
 
@@ -2703,14 +2716,14 @@
         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
+        enables additional fine tuning of the import operation. The
+        first two options enable you to specify 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
         (<computeroutput>keepnatmacs</computeroutput>). If you add
-        <computeroutput>keepdisknames</computeroutput> all new disk images
-        are assigned the same names as the originals, otherwise they are
-        renamed.
+        <computeroutput>keepdisknames</computeroutput> all new disk
+        images are assigned the same names as the originals, otherwise
+        they are renamed.
       </para>
 
@@ -2720,5 +2733,5 @@
       </para>
 
-      <screen>VBoxManage import WindowsXp.ovf --dry-run
+<screen>VBoxManage import WindowsXp.ovf --dry-run
       Interpreting WindowsXp.ovf...
       OK.
@@ -2758,131 +2771,191 @@
 
       <para>
-        The individual configuration items are numbered, and depending on
-        their type support different command-line options. The import
+        The individual configuration items are numbered, and depending
+        on their type support different command-line options. The import
         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 and Y the item
-        number, as printed on the screen. X is zero, unless there are
-        several virtual system descriptions in the appliance.
+        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 &product-name;. Items #9 and #10 specify hard disk
-        controllers, respectively. Item #11 describes a hard disk image.
+        machine in &product-name;. Items #12 and #13 specify hard disk
+        controllers, respectively. Item #14 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
-        coming from the OVF file.
+        which item the disk image should be connected to, with the
+        default coming from the OVF file.
       </para>
 
       <para>
-        You can combine several items for the same virtual system behind
-        the same <computeroutput>--vsys</computeroutput> option. For
-        example, to import a machine as described in the OVF, but without
-        the sound card and without the USB controller, and with the disk
+        You can combine several items for the same virtual system using
+        the <computeroutput>--vsys</computeroutput> option. For example,
+        to import a machine as described in the OVF, but without the
+        sound card and without the USB controller, and with the disk
         image connected to the IDE controller instead of the SCSI
         controller, use the following command:
       </para>
 
-      <screen>VBoxManage import WindowsXp.ovf
-            --vsys 0 --unit 5 --ignore --unit 6 --ignore --unit 11 --controller 10</screen>
+<screen>VBoxManage import WindowsXp.ovf
+  --vsys 0 --unit 8 --ignore --unit 9 --ignore --unit 14 --controller 13</screen>
+
     </sect2>
 
     <sect2 id="vboxmanage-import-cloud">
+
       <title>Import from &oci;</title>
+
       <para>
-        As the result of operation a file with the suffix “.oci” will be downloaded on the local host.
-        This file is a TAR archive which contains a bootable instance image in QCOW2 format and a JSON file with some metadata
-        related to the imported instance. The downloaded file is deleted after successful import. If import fails the VBoxSVC log file
-        may hint a name and place where the downloaded file was stored (in case of failure the file may not be deleted).
-        During import the bootable image is extracted from the archive and converted into VMDK format. The JSON file is also extracted
-        and stored in the VM folder.
+        As the result of this operation, a file with the suffix
+        <filename>.oci</filename> is downloaded to the local host. This
+        file is a TAR archive which contains a bootable instance image
+        in QCOW2 format and a JSON file with some metadata related to
+        the imported instance.
       </para>
+
       <para>
-        The command syntax begins from the "VBoxManage import OCI:// --cloud".
+        The downloaded file is deleted after a successful import. If
+        import fails, the downloaded file may not be deleted and the
+        VBoxSVC log file may indicate the location where the file was
+        stored.
       </para>
+
       <para>
-        List the machines and their ids from Oracle Cloud Infrastructure using the command "VBoxManage cloud --provider=OCI
-        --profile="your profile name" list instances".
+        During import the bootable image is extracted from the archive
+        and converted into VMDK format. The JSON file is also extracted
+        and stored in the VM machine folder.
       </para>
+
       <para>
-        To import a VM from a cloud service such as Oracle Cloud Infrastructure, use the <option>--cloud</option> option to specify the
-        import from the Cloud. Some of the following options are settings for the VM. Somewhere you must enter an Oracle Cloud Identifier (OCID)
-        for a resource. Use the Oracle Cloud Infrastructure Console to view OCIDs.
+        The command syntax for importing an &oci; instance begins with
+        <command>VBoxManage import OCI:// --cloud</command>.
       </para>
+
       <para>
-        Next parameters must be followed:
-        <itemizedlist>
-          <listitem>
-            <para>
-              <option>--vmname</option>: Specifies new name for imported VM. This name is used as the VM name in VirtualBox.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <option>--cloudinstanceid</option>: Id of existing instance in the Cloud.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <option>--cloudprofile</option>: Specifies the cloud profile that is used to connect to the cloud service provider.
-              The cloud profile contains your Oracle Cloud Infrastructure account details, such as your user OCID and the fingerprint for your public key.
-              To use a cloud profile, you must have the required permissions on Oracle Cloud Infrastructure.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <option>--cloudbucket</option>: Specifies the bucket name in which to store the object created from an instance bootable volume.
-              In Oracle Cloud Infrastructure, a bucket is a logical container for storing objects.
-            </para>
-          </listitem>
-        </itemizedlist>
+        You can list the available &oci; VM instances and their IDs by
+        using the following command:
       </para>
+
+<screen>VBoxManage cloud --provider=OCI --profile=<replaceable>cloud-profile-name</replaceable> list instances</screen>
+
       <para>
-        Some other import options have the same meaning as for OVF import:
-        <itemizedlist>
-          <listitem>
-            <para>
-              <option>--ostype</option>: OS type supported by VirtualBox. Use "VBoxManage list ostypes" to see the whole list of supported OSes.
-              If the type wasn't set the "Unknown" type will be used.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <option>--basefolder</option>: folder where new VM will be placed.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <option>--description</option>: VM description string.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <option>--memory</option>: RAM memory assigned for VM in MB.
-              If memory wasn't set the possible memory size will be deduced from the default memory size for this OS type or will be taken from the cloud instance.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <option>--cpus</option>: Number of virtual CPUs assigned for VM.
-              If cpus wasn't set the possible number of CPUs will be deduced from the default settings for this OS type or will be taken from the cloud instance.
-            </para>
-          </listitem>
-        </itemizedlist>
+        To import a VM from a cloud service such as &oci;, use the
+        <option>--cloud</option> option to specify the import from the
+        Cloud. Some of the following options are settings for the VM,
+        for others you must enter an Oracle Cloud Identifier (OCID) for
+        a resource. Use the Oracle Cloud Infrastructure Console to view
+        OCIDs.
       </para>
+
       <para>
-        The import options <option>--disk</option>, <option>--controller</option>, <option>--scsitype</option>, <option>--unit</option>,
-        <option>--settingsfile</option> are invalid for cloud import.
+        The following parameters can be specified:
       </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <option>--vmname</option>: Specifies a new name for the
+            imported VM. This name is used as the VM name by
+            &product-name;.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudinstanceid</option>: The ID of an existing
+            instance in the Cloud.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudprofile</option>: Specifies the cloud profile
+            that is used to connect to the cloud service provider. The
+            cloud profile contains your &oci; account details, such as
+            your user OCID and the fingerprint for your public key. To
+            use a cloud profile, you must have the required permissions
+            on &oci;.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudbucket</option>: Specifies the bucket name in
+            which to store the object created from an instance bootable
+            volume. In &oci;, a bucket is a logical container for
+            storing objects.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
-        The following example shows a typical command line for import an instance from Oracle Cloud Infrastructure:
+        The following import options have the same meaning as for OVF
+        import:
       </para>
-        <screen>
-        # VBoxManage import OCI:// --cloud --vmname import_from_oci --memory 4000
-        --cpus 3 --ostype FreeBSD_64 --cloudprofile "standard user" --cloudinstanceid
-        ocid1.instance.oc1.iad.abuwc... --cloudbucket myBucket
-        </screen>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <option>--ostype</option>: An OS type supported by
+            &product-name;. Use the <command>VBoxManage list
+            ostypes</command> command to see the whole list of supported
+            OSes. If the type was not set, the
+            <literal>Unknown</literal> type is used.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--basefolder</option>: The folder where the new VM
+            is stored.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--description</option>: A string describing the VM.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--memory</option>: The amount of RAM memory assigned
+            for the VM, in MB. If this option is not set either the
+            default memory size for the OS type is used, or the value is
+            taken from the &oci; instance.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cpus</option>: the number of virtual CPUs assigned
+            for the VM. If this option is not set, either the default
+            virtual CPUs setting for the OS type is used, or the value
+            is taken from the &oci; instance.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <para>
+        The import options <option>--disk</option>,
+        <option>--controller</option>, <option>--scsitype</option>,
+        <option>--unit</option>, <option>--settingsfile</option> are not
+        valid for cloud import.
+      </para>
+
+      <para>
+        The following example shows a typical command line for importing
+        an instance from &oci;:
+      </para>
+
+<screen># VBoxManage import OCI:// --cloud --vmname import_from_oci --memory 4000
+  --cpus 3 --ostype FreeBSD_64 --cloudprofile "standard user"
+  --cloudinstanceid ocid1.instance.oc1.iad.abuwc... --cloudbucket myBucket</screen>
 
     </sect2>
@@ -3051,8 +3124,4 @@
             permissions on &oci;.
           </para>
-
-          <remark>
-            Add xref to information about the required permissions.
-          </remark>
         </listitem>
 
@@ -3072,5 +3141,5 @@
             <replaceable>domain</replaceable>: Specifies the
             availability domain to use for the VM instance. Enter the
-            OCID for the availability domain.
+            full name of the availability domain.
           </para>
         </listitem>
@@ -3142,13 +3211,8 @@
       </para>
 
-      <remark>
-        For the next release, describe exactly what this command does in
-        terms of the command line options.
-      </remark>
-
-<screen># VBoxManage export myVM --output OCI:// --cloud 0 --vmname myVM_Cloud
---cloudprofile "standard user" --cloudbucket myBucket
---cloudshape VM.Standard2.1 --clouddomain aaaa:US-ASHBURN-AD-1 --clouddisksize 50
---cloudocivcn ocid1.vcn.oc1.iad.aaaa... --cloudocisubnet ocid1.subnet.oc1.iad.aaaa...
+<screen># VBoxManage export myVM --output OCI:// --cloud 0 --vmname myVM_Cloud \
+--cloudprofile "standard user" --cloudbucket myBucket \
+--cloudshape VM.Standard2.1 --clouddomain US-ASHBURN-AD-1 --clouddisksize 50  \
+--cloudocivcn ocid1.vcn.oc1.iad.aaaa... --cloudocisubnet ocid1.subnet.oc1.iad.aaaa... \
 --cloudkeepobject true --cloudlaunchinstance true --cloudpublicip true</screen>
 
@@ -3375,7 +3439,7 @@
       <listitem>
         <para>
-          <computeroutput>setlinkstate&lt;1-N&gt; on|off</computeroutput>:
-          Connects or disconnects virtual network cables from their
-          network interfaces.
+          <computeroutput>setlinkstate&lt;1-N&gt;
+          on|off</computeroutput>: Connects or disconnects virtual
+          network cables from their network interfaces.
         </para>
       </listitem>
@@ -3399,6 +3463,5 @@
           (<computeroutput>generic</computeroutput>). These options
           correspond to the modes which are described in detail in
-          <xref
-        linkend="networkingmodes" />.
+          <xref linkend="networkingmodes" />.
         </para>
       </listitem>
@@ -3420,9 +3483,8 @@
           trace should be logged. This can be done with the
           <computeroutput>nictracefile&lt;1-N&gt;
-          &lt;filename&gt;</computeroutput> option to <command>VBoxManage
-          controlvm</command> at runtime or with the
-          <computeroutput>--nictracefile&lt;1-N&gt;
-          &lt;filename&gt;</computeroutput> option to <command>VBoxManage
-          modifyvm</command> otherwise.
+          &lt;filename&gt;</computeroutput> option to
+          <command>VBoxManage controlvm</command> at runtime or with the
+          <computeroutput>&lt;filename&gt;</computeroutput> option to
+          <command>VBoxManage modifyvm</command> otherwise.
         </para>
       </listitem>
@@ -3541,7 +3603,6 @@
         <para>
           <computeroutput>clipboard filetransfers
-          enabled|disabled</computeroutput>:
-          Specifies if clipboard file transfers are allowed between host and
-          guest OSEs or not.
+          enabled|disabled</computeroutput>: Specifies if clipboard file
+          transfers are allowed between host and guest OSes or not.
         </para>
       </listitem>
@@ -4053,7 +4114,8 @@
       <listitem>
         <para>
-          <computeroutput>vm-process-priority default|flat|low|normal|high
-          </computeroutput>: Changes the priority scheme of the VM process.
-          See <xref linkend="vboxmanage-startvm" />.
+          <computeroutput>vm-process-priority
+          default|flat|low|normal|high</computeroutput>: Changes the
+          priority scheme of the VM process. See
+          <xref linkend="vboxmanage-startvm" />.
         </para>
       </listitem>
@@ -4277,7 +4339,6 @@
 
     <para>
-      If you have a Saved state file
-      (<computeroutput>.sav</computeroutput>) that is separate from the
-      VM configuration, you can use this command to
+      If you have a Saved state file (<filename>.sav</filename>) that is
+      separate from the 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
@@ -5313,5 +5374,5 @@
   </sect1>
 
-  <sect1 id="vboxmanage-modifyvdi">
+  <sect1 id="vboxmanage-modifymedium">
 
     <title>VBoxManage modifymedium</title>
@@ -5469,5 +5530,5 @@
   </sect1>
 
-  <sect1 id="vboxmanage-clonevdi">
+  <sect1 id="vboxmanage-clonemedium">
 
     <title>VBoxManage clonemedium</title>
@@ -5556,5 +5617,5 @@
         <command>clonevdi</command> and <command>clonehd</command>
         commands are still supported and mapped internally to the
-        <command>clonehd disk</command> command.
+        <command>clonemedium</command> command.
       </para>
     </note>
@@ -5811,5 +5872,5 @@
 
     <para>
-      This command converts a raw disk image to a &product-name; Disk
+      This command converts a raw disk image to an &product-name; Disk
       Image (VDI) file. The syntax is as follows:
     </para>
@@ -5909,5 +5970,5 @@
     <para>
       These commands enable you to attach and retrieve string data for a
-      virtual machine or for a &product-name; configuration, by
+      virtual machine or for an &product-name; configuration, by
       specifying <computeroutput>global</computeroutput> instead of a
       virtual machine name. You must specify a keyword as a text string
@@ -6088,5 +6149,5 @@
           <para>
             Configures the VBoxSVC release logging details. See
-            <ulink url="http://www.virtualbox.org/wiki/VBoxLogging">http://www.virtualbox.org/wiki/VBoxLogging</ulink>.
+            <ulink url="http://www.virtualbox.org/wiki/VBoxLogging" />.
           </para>
         </listitem>
@@ -6395,8 +6456,9 @@
           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.
+          <filename>/media/USER/sf_<replaceable>share-name</replaceable></filename>
+          or
+          <filename>/media/sf_<replaceable>share-name</replaceable></filename>,
+          where <replaceable>share-name</replaceable> is the share
+          named. The actual location depends on the guest OS. Optional.
         </para>
       </listitem>
@@ -6793,5 +6855,5 @@
                 Specifies the absolute path of the executable on the
                 guest OS file system. Mandatory. For example:
-                <computeroutput>C:\Windows\System32\calc.exe</computeroutput>.
+                <filename>C:\Windows\System32\calc.exe</filename>.
               </para>
             </listitem>
@@ -7073,5 +7135,5 @@
                 Specifies the absolute path of the executable on the
                 guest OS file system. Mandatory. For example:
-                <computeroutput>C:\Windows\System32\calc.exe</computeroutput>
+                <filename>C:\Windows\System32\calc.exe</filename>
               </para>
             </listitem>
@@ -7315,5 +7377,5 @@
                 Specifies the absolute path of the host file system
                 destination directory. Mandatory. For example:
-                <computeroutput>C:\Temp</computeroutput>.
+                <filename>C:\Temp</filename>.
               </para>
             </listitem>
@@ -7330,7 +7392,7 @@
                 Specifies the absolute paths of guest file system files
                 to be copied. Mandatory. For example:
-                <computeroutput>C:\Windows\System32\calc.exe</computeroutput>.
+                <filename>C:\Windows\System32\calc.exe</filename>.
                 Wildcards can be used in the expressions. For example:
-                <computeroutput>C:\Windows\System*\*.dll</computeroutput>.
+                <filename>C:\Windows\System*\*.dll</filename>.
               </para>
             </listitem>
@@ -7406,5 +7468,5 @@
                 Specifies the absolute path of the guest file system
                 destination directory. Mandatory. For example:
-                <computeroutput>C:\Temp</computeroutput>.
+                <filename>C:\Temp</filename>.
               </para>
             </listitem>
@@ -7421,7 +7483,7 @@
                 Specifies the absolute paths of host file system files
                 to be copied. Mandatory. For example:
-                <computeroutput>C:\Windows\System32\calc.exe</computeroutput>.
+                <filename>C:\Windows\System32\calc.exe</filename>.
                 Wildcards can be used in the expressions. For example:
-                <computeroutput>C:\Windows\System*\*.dll</computeroutput>.
+                <filename>C:\Windows\System*\*.dll</filename>.
               </para>
             </listitem>
@@ -7473,7 +7535,7 @@
               <para>
                 For example: If specified directory is
-                <computeroutput>D:\Foo\Bar</computeroutput> and
-                <computeroutput>D:\Foo</computeroutput> is absent, it
-                will be created. In such a case, had the
+                <filename>D:\Foo\Bar</filename> and
+                <filename>D:\Foo</filename> is absent, it will be
+                created. In such a case, had the
                 <computeroutput>--parents</computeroutput> option not
                 been used, this command would have failed.
@@ -7508,5 +7570,5 @@
                 Specifies a list of absolute paths of directories to be
                 created on guest file system. Mandatory. For example:
-                <computeroutput>D:\Foo\Bar</computeroutput>.
+                <filename>D:\Foo\Bar</filename>.
               </para>
 
@@ -7515,6 +7577,6 @@
                 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
+                <filename>D:\Foo</filename>. The specified user must
+                have sufficient rights to create the specified
                 directories, and any parents that need to be created.
               </para>
@@ -7578,7 +7640,7 @@
                 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 directories.
+                <filename>D:\Foo\*Bar</filename>. The specified user
+                must have sufficient rights to delete the specified
+                directories.
               </para>
             </listitem>
@@ -7641,7 +7703,7 @@
                 deleted on guest file system. Mandatory. Wildcards are
                 allowed. For example:
-                <computeroutput>D:\Foo\Bar\text*.txt</computeroutput>.
-                The specified user should have sufficient rights to
-                delete the specified files.
+                <filename>D:\Foo\Bar\text*.txt</filename>. The specified
+                user should have sufficient rights to delete the
+                specified files.
               </para>
             </listitem>
@@ -7862,7 +7924,7 @@
                 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 files or file systems.
+                <filename>/home/foo/a.out</filename>. The specified user
+                should have sufficient rights to access the specified
+                files or file systems.
               </para>
             </listitem>
@@ -9016,5 +9078,5 @@
   </sect1>
 
-  <!-- TODO: Figure out how we can generate a file with the includes... The trouble is
+<!-- TODO: Figure out how we can generate a file with the includes... The trouble is
              that xpointer doesn't seem to allow including multiple elements.
 
@@ -9022,17 +9084,29 @@
              don't forget to add it here too.
    -->
-  <xi:include href="user_man_VBoxManage-unattended.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="user_man_VBoxManage-snapshot.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" />
+
+  <xi:include href="user_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
   <xi:include href="user_man_VBoxManage-clonevm.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-dhcpserver.xml"     xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="user_man_VBoxManage-dhcpserver.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-cloudprofile.xml"   xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="user_man_VBoxManage-cloudlist.xml"      xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="user_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="user_man_VBoxManage-cloudlist.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
   <xi:include href="user_man_VBoxManage-cloudinstance.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
   <xi:include href="user_man_VBoxManage-cloudimage.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <!-- TODO: Figure out how we can handle other manpages. The xml is bolted to
+<!-- TODO: Figure out how we can handle other manpages. The xml is bolted to
              sect1, so it's not possible to have them "in place" -->
+
   <xi:include href="user_man_vboximg-mount.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 82349)
+++ /trunk/doc/manual/en_US/user_VirtualBoxAPI.xml	(revision 82350)
@@ -29,5 +29,5 @@
     Development Kit (SDK)</emphasis>. The SDK is available for download
     from
-    <ulink url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>.
+    <ulink url="http://www.virtualbox.org" />.
     In particular, the SDK comes with a Programming Guide and Reference
     manual in PDF format. This manual contains, among other things, the
