Changeset 76786 in vbox for trunk/doc/manual/en_US

Timestamp:

Jan 11, 2019 7:39:06 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128121

Message:

manual: integrate drop #40 with minimal manual adjustments (but everything into one book, with manually applied tweaks to turn the release notes into a pure changelog again, and eliminated trailing whitespace)

Location:

trunk/doc/manual/en_US

Files:

• UserManual.xml (modified) (2 diffs)
• images/dnd-modes.png (modified) ( previous)
• images/snapshots-1.png (modified) ( previous)
• images/virtual-disk-manager2.png (modified) ( previous)
• images/virtualbox-main-empty.png (modified) ( previous)
• images/virtualbox-main.png (modified) ( previous)
• images/vm-close.png (modified) ( previous)
• images/vm-groups.png (modified) ( previous)
• images/vm-settings-harddisk.png (modified) ( previous)
• images/vm-vista-running.png (modified) ( previous)
• user_AdvancedTopics.xml (modified) (22 diffs)
• user_BasicConcepts.xml (modified) (64 diffs)
• user_ChangeLog.xml (modified) (3 diffs)
• user_Frontends.xml (modified) (6 diffs)
• user_GuestAdditions.xml (modified) (17 diffs)
• user_Installation.xml (modified) (28 diffs)
• user_Introduction.xml (modified) (119 diffs)
• user_Networking.xml (modified) (5 diffs)
• user_Preface.xml (modified) (3 diffs)
• user_Security.xml (modified) (1 diff)
• user_Storage.xml (modified) (43 diffs)
• user_Technical.xml (modified) (5 diffs)
• user_ThirdParty.xml (modified) (3 diffs)
• user_Troubleshooting.xml (modified) (7 diffs)
• user_VBoxManage.xml (modified) (24 diffs)
• user_VirtualBoxAPI.xml (modified) (2 diffs)

trunk/doc/manual/en_US/UserManual.xml

@@ -11 +11 @@
 <bookinfo>
 
-    <title>&VBOX_PRODUCT;</title>
+ <title>&VBOX_PRODUCT;</title>
 
     <subtitle>User Manual</subtitle>
 
-    <edition>Version
-   &VBOX_VERSION_STRING;</edition>
+    <edition>Version &VBOX_VERSION_STRING;</edition>
 
     <corpauthor>&VBOX_VENDOR;</corpauthor>
@@ -31 +30 @@
 
   </bookinfo>
-
 
   <xi:include href="user_Preface.xml"

trunk/doc/manual/en_US/user_AdvancedTopics.xml

@@ -1272 +1272 @@
         webcam device remains attached to the guest and must be manually
         detached using the <computeroutput>VBoxManage controlvm "VM
-        name" webcam detach ...</computeroutput> command.
+        name" webcam detach</computeroutput> command.
       </para>
 
@@ -1286 +1286 @@
         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.
+        controlvm "VM name" webcam detach</computeroutput> command.
       </para>
 
@@ -1423 +1423 @@
           Raw hard disk access is for expert users only. Incorrect use
           or use of an outdated configuration can lead to
-          <emphasis
-          role="bold">total loss of data
-          </emphasis>on the physical disk. Most importantly,
-          <emphasis>do not</emphasis> attempt to boot the partition with
-          the currently running host operating system in a guest. This
-          will lead to severe data corruption.
+          <emphasis role="bold">total loss of data</emphasis> on the
+          physical disk. Most importantly, <emphasis>do not</emphasis>
+          attempt to boot the partition with the currently running host
+          operating system in a guest. This will lead to severe data
+          corruption.
         </para>
       </warning>
@@ -1468 +1467 @@
 
 <screen>VBoxManage internalcommands createrawvmdk -filename /path/to/file.vmdk
-      -rawdisk /dev/sda</screen>
+  -rawdisk /dev/sda</screen>
 
         <para>
@@ -1502 +1501 @@
 
 <screen>VBoxManage storageattach WindowsXP --storagectl "IDE Controller"
-      --port 0 --device 0 --type hdd --medium /path/to/file.vmdk</screen>
+ --port 0 --device 0 --type hdd --medium /path/to/file.vmdk</screen>
 
         <para>
@@ -1536 +1535 @@
 
 <screen>VBoxManage internalcommands createrawvmdk -filename /path/to/file.vmdk
-      -rawdisk /dev/sda -partitions 1,5</screen>
+ -rawdisk /dev/sda -partitions 1,5</screen>
 
         <para>
@@ -1598 +1597 @@
 
 <screen>VBoxManage internalcommands createrawvmdk -filename /path/to/file.vmdk
-      -rawdisk /dev/sda -partitions 1,5 -relative</screen>
+ -rawdisk /dev/sda -partitions 1,5 -relative</screen>
 
         <para>
@@ -1625 +1624 @@
 
 <screen>VBoxManage internalcommands createrawvmdk -filename /path/to/file.vmdk
-      -rawdisk /dev/sda -partitions 1,5 -mbr winxp.mbr</screen>
+ -rawdisk /dev/sda -partitions 1,5 -mbr winxp.mbr</screen>
 
         <para>
@@ -1748 +1747 @@
 
 <screen>VBoxManage storageattach ... --medium iscsi
-         --server 10.0.9.30 --target iqn.2008-12.com.sun:sampletarget --intnet</screen>
+--server 10.0.9.30 --target iqn.2008-12.com.sun:sampletarget --intnet</screen>
 
       <para>
@@ -2131 +2130 @@
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiSystemUuid"
-                                               "9852bf98-b83c-49db-a8de-182c42c7226b"</screen>
+       "9852bf98-b83c-49db-a8de-182c42c7226b"</screen>
       </listitem>
 
@@ -2246 +2245 @@
 
 <screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/acpi/0/Config/CustomTable0" "/path/to/table.bin"</screen>
+"VBoxInternal/Devices/acpi/0/Config/CustomTable0" "/path/to/table.bin"</screen>
 
     <para>
@@ -2869 +2868 @@
 
       <para>
-        To disable any of these VM manager customizations use the
-        following command:
+        To disable any of these VirtualBox Manager customizations use
+        the following command:
       </para>
 
@@ -4184 +4183 @@
 
       <para>
-        <xref linkend="table-host-key-customize"/> shows the possible
-        Host key actions, together with their default Host key shortcut.
-        Setting an action to None will disable that Host key action.
-      </para>
-
-      <table id="table-host-key-customize">
+        The following table shows the possible Host key actions,
+        together with their default Host key shortcut. Setting an action
+        to None will disable that Host key action.
+      </para>
+
+      <table id="table-host-key-customize" tabstyle="oracle-all">
         <title>Host Key Customization</title>
         <tgroup cols="3">
@@ -4842 +4841 @@
         <computeroutput>VBOXWEB_USER</computeroutput>, which must be set
         to the user which will later start the VMs. The parameters in
-        <xref linkend="table-websrv-config-params"/> all start with the
+        the following table all start with the
         <computeroutput>VBOXWEB_</computeroutput> prefix string. For
         example: <computeroutput>VBOXWEB_HOST</computeroutput> and
@@ -4848 +4847 @@
       </para>
 
-      <table id="table-websrv-config-params">
+      <table id="table-websrv-config-params" tabstyle="oracle-all">
         <title>Web Service Configuration Parameters</title>
         <tgroup cols="3">
@@ -5397 +5396 @@
 
       <para>
-        The parameters in
-        <xref linkend="table-vboxwatchdog-config-params"/> all start
-        with the <computeroutput>VBOXWATCHDOG_</computeroutput> prefix
-        string. For example:
+        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>.
@@ -5408 +5406 @@
       </para>
 
-      <table id="table-vboxwatchdog-config-params">
+      <table id="table-vboxwatchdog-config-params" tabstyle="oracle-all">
         <title>&product-name; Watchdog Configuration Parameters</title>
         <tgroup cols="3">
@@ -6640 +6638 @@
       offers a collection of options, in an attempt to make this work
       deterministically and reliably on as many Linux distributions and
-      system configurations as possible. These are summarized in
-      <xref linkend="table-pcspeaker-config"/>.
-    </para>
-
-    <table id="table-pcspeaker-config">
+      system configurations as possible. These are summarized in the
+      following table.
+    </para>
+
+    <table id="table-pcspeaker-config" tabstyle="oracle-all">
       <title>PC Speaker Configuration Options</title>
       <tgroup cols="3">
@@ -6666 +6664 @@
               </para></entry>
             <entry><para>
-                <computeroutput>/dev/input/by-path/platform-
-                pcspkr-event-spkr</computeroutput>
+                <computeroutput>/dev/input/by-path/platform-pcspkr-event-spkr</computeroutput>
               </para></entry>
             <entry><para>
@@ -6943 +6940 @@
       No configuration is required. &product-name; detects Hyper-V
       automatically and uses Hyper-V as the virtualization engine for
-      the host. The CPU icon in the VM window status bar indicates that
-      Hyper-V is being used.
+      the host system. The CPU icon in the VM window status bar
+      indicates that Hyper-V is being used.
     </para>
 
@@ -6965 +6962 @@
       passthrough of hardware virtualization functions to the guest VM.
       That means that you can install a hypervisor, such as
-      &product-name; or KVM, on an &product-name; guest. You can then
-      create and run VMs within the guest VM.
+      &product-name;, Oracle VM Server or KVM, on an &product-name;
+      guest. You can then create and run VMs within the guest VM.
     </para>
 
@@ -6980 +6977 @@
           From the VirtualBox Manager, select the
           <emphasis role="bold">Enable Nested VT-x/AMD-V</emphasis>
-          check box on the <emphasis role="bold">System</emphasis> tab.
-          To disable the feature, deselect the check box.
+          check box on the <emphasis role="bold">Processor</emphasis>
+          tab. To disable the feature, deselect the check box.
         </para>
       </listitem>

trunk/doc/manual/en_US/user_BasicConcepts.xml

@@ -90 +90 @@
           2003, Windows Vista, Windows Server 2008, Windows 7, Windows
           Server 2008 R2, Windows 8, Windows Server 2012, Windows 8.1,
-          Windows Server 2012 R2, Windows 10 (non-Insider Preview releases),
-          Windows Server 2016, Windows server 2019:</emphasis>
+          Windows Server 2012 R2, Windows 10 (non-Insider Preview
+          releases), Windows Server 2016, Windows Server
+          2019:</emphasis>
         </para>
 
@@ -528 +529 @@
 
     <para>
-      &product-name; is able to install a guest operating system
-      automatically. You only need to provide the installation medium
-      and a few other parameters, such as the name of the default user.
+      &product-name; can install a guest OS automatically. You only need
+      to provide the installation medium and a few other parameters,
+      such as the name of the default user.
     </para>
 
@@ -542 +543 @@
       <listitem>
         <para>
-          <emphasis role="bold">Create a new VM.</emphasis> You can use
-          either of the following to do this:
+          <emphasis role="bold">Create a new VM.</emphasis> Use one of
+          the following methods:
         </para>
 
@@ -557 +558 @@
           <listitem>
             <para>
-              The <command>VBoxManage</command> command, see
+              The <command>VBoxManage createvm</command> command, see
               <xref linkend="vboxmanage-createvm" />.
             </para>
@@ -565 +566 @@
 
         <para>
-          For the new VM, you can usually just choose the type of the
-          guest operating system and accept the default settings for
-          that operating system. The following sections in this chapter
-          describe how to change the settings for a VM.
+          For the new VM, choose the guest OS type and accept the
+          default settings for that OS. The following sections in this
+          chapter describe how to change the settings for a VM.
         </para>
       </listitem>
@@ -589 +589 @@
       <listitem>
         <para>
-          <emphasis role="bold">Start the VM.</emphasis> You can use the
+          <emphasis role="bold">Start the VM.</emphasis> Use the
           VirtualBox Manager or the <command>VBoxManage
           startvm</command> command.
@@ -600 +600 @@
 
         <para>
-          Note that the boot order is changed during the preparation
-          step, giving the virtual hard disk the highest priority. As
-          this disk is normally empty before an automatic installation
-          is started, the VM will instead boot from the virtual DVD
-          drive as next available boot medium and the installation will
-          start. If the virtual hard disk contains a bootable operating
-          system, then the installation will not start. The boot order
-          must be manually changed, by pressing F12 during the BIOS
-          splash screen.
+          The installation operation changes the boot device order to
+          boot the virtual hard disk first and then the virtual DVD
+          drive. If the virtual hard disk is empty prior to the
+          automatic installation, the VM boots from the virtual DVD
+          drive and begins the installation.
+        </para>
+
+        <para>
+          If the virtual hard disk contains a bootable OS, the
+          installation operation exits. In this case, change the boot
+          device order manually by pressing F12 during the BIOS splash
+          screen.
         </para>
       </listitem>
@@ -626 +629 @@
       <para>
         The following example shows how to perform an unattended guest
-        installation for an Oracle Linux virtual machine. The example
-        uses various <command>VBoxManage</command> commands to prepare
-        the guest VM. The <command>VBoxManage unattended
-        install</command> command is then used to install and configure
-        the guest operating system.
+        installation for an Oracle Linux VM. The example uses various
+        <command>VBoxManage</command> commands to prepare the guest VM.
+        The <command>VBoxManage unattended install</command> command is
+        then used to install and configure the guest OS.
       </para>
 
@@ -652 +654 @@
             <listitem>
               <para>
-                The variable $VM represents the name of the VM.
+                The $VM variable represents the name of the VM.
               </para>
             </listitem>
@@ -659 +661 @@
               <para>
                 The <command>VBoxManage list ostypes</command> command
-                lists the guest operating systems supported by
-                &product-name;, including the name used for each
-                operating system in the <command>VBoxManage</command>
-                commands.
+                lists the guest OSes supported by &product-name;,
+                including the name used for each OS in the
+                <command>VBoxManage</command> commands.
               </para>
             </listitem>
@@ -702 +703 @@
 
           <para>
-            Note the following:
+            The previous commands do the following:
           </para>
 
@@ -709 +710 @@
             <listitem>
               <para>
-                A 32768 MB virtual hard disk is created.
+                Create a 32768 MB virtual hard disk.
               </para>
             </listitem>
@@ -715 +716 @@
             <listitem>
               <para>
-                A SATA storage controller is created and the virtual
-                hard disk is attached.
+                Create a SATA storage controller and attach the virtual
+                hard disk.
               </para>
             </listitem>
@@ -722 +723 @@
             <listitem>
               <para>
-                An IDE storage controller for a virtual DVD drive is
-                created and an Oracle Linux installation ISO is
-                attached.
+                Create an IDE storage controller for a virtual DVD drive
+                and attach an Oracle Linux installation ISO.
               </para>
             </listitem>
@@ -741 +741 @@
 
           <para>
-            Note the following:
+            The previous commands do the following:
           </para>
 
@@ -748 +748 @@
             <listitem>
               <para>
-                I/O APIC is enabled for the motherboard of the VM.
+                Enable I/O APIC for the motherboard of the VM.
               </para>
             </listitem>
@@ -754 +754 @@
             <listitem>
               <para>
-                The boot order for the VM is configured.
+                Configure the boot device order for the VM.
               </para>
             </listitem>
@@ -760 +760 @@
             <listitem>
               <para>
-                8192 MB of RAM and 128 MB of video RAM are allocated to
-                the VM.
+                Allocate 8192 MB of RAM and 128 MB of video RAM to the
+                VM.
               </para>
             </listitem>
@@ -770 +770 @@
         <listitem>
           <para>
-            Perform an unattended install of the operating system.
+            Perform an unattended install of the OS.
           </para>
 
@@ -779 +779 @@
 
           <para>
-            Note the following:
+            The previous command does the following:
           </para>
 
@@ -786 +786 @@
             <listitem>
               <para>
-                An Oracle Linux ISO is specified as the installation
-                ISO.
+                Specifies an Oracle Linux ISO as the installation ISO.
               </para>
             </listitem>
@@ -793 +792 @@
             <listitem>
               <para>
-                Specify a login name, full name, and login password for
-                a default user on the guest operating system.
+                Specifies a login name, full name, and login password
+                for a default user on the guest OS.
               </para>
 
               <para>
-                The specified password is also used for the root user
-                account on the guest.
+                Note that the specified password is also used for the
+                root user account on the guest.
               </para>
             </listitem>
@@ -805 +804 @@
             <listitem>
               <para>
-                The Guest Additions are installed on the VM.
+                Installs the Guest Additions on the VM.
               </para>
             </listitem>
@@ -811 +810 @@
             <listitem>
               <para>
-                The time zone for the guest operating system is set to
-                Central European Time (CET).
+                Sets the time zone for the guest OS to Central European
+                Time (CET).
               </para>
             </listitem>
@@ -825 +824 @@
 
           <para>
-            This step completes the unattended install process.
+            This step completes the unattended installation process.
           </para>
 
@@ -831 +830 @@
 
           <para>
-            The VM is started in headless mode. The VirtualBox Manager
-            window is not displayed.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            (Optional) Update the guest operating system to use the
-            latest Oracle Linux packages.
+            The VM starts in headless mode, which means that the
+            VirtualBox Manager window does not open.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            (Optional) Update the guest OS to use the latest Oracle
+            Linux packages.
           </para>
 
@@ -872 +871 @@
           &product-name; emulates a standard PS/2 keyboard and mouse.
           These devices are supported by almost all past and present
-          operating systems.
+          OSes.
         </para>
 
@@ -922 +921 @@
           <emphasis role="bold">USB.</emphasis> &product-name; emulates
           three USB host controllers: xHCI, EHCI, and OHCI. While xHCI
-          handles all USB transfer speeds, only guest operating systems
-          released approximately after 2011 support xHCI. Note that for
-          Windows 7 guests, 3rd party drivers must be installed for xHCI
-          support.
-        </para>
-
-        <para>
-          Older operating systems typically support OHCI and EHCI. The
-          two controllers are needed because OHCI only handles USB
-          low-speed and full-speed devices (both USB 1.x and 2.0), while
-          EHCI only handles high-speed devices (USB 2.0 only).
+          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
+          controllers are needed because OHCI only handles USB low-speed
+          and full-speed devices (both USB 1.x and 2.0), while EHCI only
+          handles high-speed devices (USB 2.0 only).
         </para>
 
@@ -984 +982 @@
             files. By changing the name, &product-name; renames these
             files as well. As a result, you can only use characters
-            which are allowed in your host operating system's file
-            names.
+            which are allowed in your host OS's file names.
           </para>
 
@@ -998 +995 @@
           <para>
             <emphasis role="bold">Type:</emphasis> The type of the guest
-            operating system for the VM. This is the same setting that
-            is specified in the <emphasis role="bold">New Virtual
-            Machine</emphasis> wizard. See
-            <xref linkend="gui-createvm" />.
+            OS for the VM. This is the same setting that is specified in
+            the <emphasis role="bold">New Virtual Machine</emphasis>
+            wizard. See <xref linkend="gui-createvm" />.
           </para>
 
           <para>
             Whereas the default settings of a newly created VM depend on
-            the selected operating system type, changing the type later
-            has no effect on VM settings. This value is purely
-            informational and decorative.
+            the selected OS type, changing the type later has no effect
+            on VM settings. This value is purely informational and
+            decorative.
           </para>
         </listitem>
@@ -1015 +1011 @@
           <para>
             <emphasis role="bold">Version:</emphasis> The version of the
-            guest operating system for the VM. This is the same setting
-            that is specified in the <emphasis role="bold">New Virtual
+            guest OS for the VM. This is the same setting that is
+            specified in the <emphasis role="bold">New Virtual
             Machine</emphasis> wizard. See
             <xref linkend="gui-createvm" />.
@@ -1050 +1046 @@
           <para>
             <emphasis role="bold">Shared Clipboard:</emphasis> You can
-            select here whether the clipboard of the guest operating
-            system should be shared with that of your host. If you
-            select <emphasis role="bold">Bidirectional</emphasis>, then
+            select here whether the clipboard of the guest OS should be
+            shared with that of your host. If you select
+            <emphasis role="bold">Bidirectional</emphasis>, then
             &product-name; will always make sure that both clipboards
             contain the same data. If you select
@@ -1194 +1190 @@
             amount of RAM that is allocated and given to the VM when it
             is running. The specified amount of memory will be requested
-            from the host operating system, so it must be available or
-            made available as free memory on the host when attempting to
-            start the VM and will not be available to the host while the
-            VM is running. This is the same setting that was specified
-            in the <emphasis role="bold">New Virtual Machine</emphasis>
-            wizard, as described in <xref linkend="gui-createvm" />.
+            from the host OS, so it must be available or made available
+            as free memory on the host when attempting to start the VM
+            and will not be available to the host while the VM is
+            running. This is the same setting that was specified in the
+            <emphasis role="bold">New Virtual Machine</emphasis> wizard,
+            as described in <xref linkend="gui-createvm" />.
           </para>
 
           <para>
             Generally, it is possible to change the memory size after
-            installing the guest operating system. But you must not
-            reduce the memory to an amount where the operating system
-            would no longer boot.
+            installing the guest OS. But you must not reduce the memory
+            to an amount where the OS would no longer boot.
           </para>
         </listitem>
@@ -1213 +1208 @@
           <para>
             <emphasis role="bold">Boot Order:</emphasis> Determines the
-            order in which the guest operating system will attempt to
-            boot from the various virtual boot devices. Analogous to a
-            real PC's BIOS setting, &product-name; can tell a guest OS
-            to start from the virtual floppy, the virtual CD/DVD drive,
-            the virtual hard drive (each of these as defined by the
-            other VM settings), the network, or none of these.
+            order in which the guest OS will attempt to boot from the
+            various virtual boot devices. Analogous to a real PC's BIOS
+            setting, &product-name; can tell a guest OS to start from
+            the virtual floppy, the virtual CD/DVD drive, the virtual
+            hard drive (each of these as defined by the other VM
+            settings), the network, or none of these.
           </para>
 
@@ -1234 +1229 @@
             which chipset will be presented to the virtual machine. In
             legacy versions of &product-name;, PIIX3 was the only
-            available option. For modern guest operating systems such as
-            Mac OS X, that old chipset is no longer well supported. As a
-            result, &product-name; supports an emulation of the more
-            modern ICH9 chipset, which supports PCI express, three PCI
-            buses, PCI-to-PCI bridges and Message Signaled Interrupts
-            (MSI). This enables modern operating systems to address more
-            PCI devices and no longer requires IRQ sharing. Using the
-            ICH9 chipset it is also possible to configure up to 36
-            network cards, up to 8 network adapters with PIIX3. Note
-            that the ICH9 support is experimental and not recommended
-            for guest operating systems which do not require it.
+            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.
           </para>
         </listitem>
@@ -1278 +1273 @@
             hardware feature that have replaced old-style Programmable
             Interrupt Controllers (PICs) in recent years. With an I/O
-            APIC, operating systems can use more than 16 interrupt
-            requests (IRQs) and therefore avoid IRQ sharing for improved
-            reliability.
+            APIC, OSes can use more than 16 interrupt requests (IRQs)
+            and therefore avoid IRQ sharing for improved reliability.
           </para>
 
@@ -1286 +1280 @@
             <para>
               Enabling the I/O APIC is <emphasis>required</emphasis> for
-              64-bit guest operating systems, especially Windows Vista.
-              It is also required if you want to use more than one
-              virtual CPU in a virtual machine.
+              64-bit guest OSes, especially Windows Vista. It is also
+              required if you want to use more than one virtual CPU in a
+              virtual machine.
             </para>
           </note>
@@ -1294 +1288 @@
           <para>
             However, software support for I/O APICs has been unreliable
-            with some operating systems other than Windows. Also, the
-            use of an I/O APIC slightly increases the overhead of
-            virtualization and therefore slows down the guest OS a
-            little.
+            with some OSes other than Windows. Also, the use of an I/O
+            APIC slightly increases the overhead of virtualization and
+            therefore slows down the guest OS a little.
           </para>
 
           <warning>
             <para>
-              All Windows operating systems starting with Windows 2000
-              install different kernels, depending on whether an I/O
-              APIC is available. As with ACPI, the I/O APIC therefore
+              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
               installation</emphasis> of a Windows guest OS. Turning it
@@ -1327 +1320 @@
             UTC format to the guest instead of the local (host) time.
             This affects how the virtual real-time clock (RTC) operates
-            and may be useful for UNIX-like guest operating systems,
-            which typically expect the hardware clock to be set to UTC.
+            and may be useful for UNIX-like guest OSes, which typically
+            expect the hardware clock to be set to UTC.
           </para>
         </listitem>
@@ -1337 +1330 @@
         In addition, you can turn off the <emphasis role="bold">Advanced
         Configuration and Power Interface (ACPI)</emphasis> which
-        &product-name; presents to the guest operating system by
-        default.
-      </para>
-
-      <para>
-        ACPI is the current industry standard to allow operating systems
-        to recognize hardware, configure motherboards and other devices
-        and manage power. As all modern PCs contain this feature and
-        Windows and Linux have been supporting it for years, it is also
-        enabled by default in &product-name;. ACPI can only be turned
-        off using the command line. See
-        <xref linkend="vboxmanage-modifyvm" />.
+        &product-name; presents to the guest OS by default.
+      </para>
+
+      <para>
+        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" />.
       </para>
 
       <warning>
         <para>
-          All Windows operating systems 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 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.
         </para>
       </warning>
@@ -1377 +1368 @@
           <para>
             <emphasis role="bold">Processor(s):</emphasis> Sets the
-            number of virtual CPU cores the guest operating systems can
-            see. &product-name; supports symmetrical multiprocessing
-            (SMP) and can present up to 32 virtual CPU cores to each
-            virtual machine.
+            number of virtual CPU cores the guest OSes can see.
+            &product-name; supports symmetrical multiprocessing (SMP)
+            and can present up to 32 virtual CPU cores to each virtual
+            machine.
           </para>
 
@@ -1412 +1403 @@
             <emphasis role="bold">Enable PAE/NX:</emphasis> Determines
             whether the PAE and NX capabilities of the host CPU will be
-            exposed to the virtual machine. To enable this feature,
-            select the <emphasis role="bold">Extended
-            Features</emphasis> check box.
+            exposed to the virtual machine.
           </para>
 
           <para>
             PAE stands for Physical Address Extension. Normally, if
-            enabled and supported by the operating system, then even a
-            32-bit x86 CPU can access more than 4 GB of RAM. This is
-            made possible by adding another 4 bits to memory addresses,
-            so that with 36 bits, up to 64 GB can be addressed. Some
-            operating systems, such as Ubuntu Server, require PAE
-            support from the CPU and cannot be run in a virtual machine
-            without it.
+            enabled and supported by the OS, then even a 32-bit x86 CPU
+            can access more than 4 GB of RAM. This is made possible by
+            adding another 4 bits to memory addresses, so that with 36
+            bits, up to 64 GB can be addressed. Some OSes, such as
+            Ubuntu Server, require PAE support from the CPU and cannot
+            be run in a virtual machine without it.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Enable Nested VT-x/AMD-V</emphasis>:
+            Enables nested virtualization, with passthrough of hardware
+            virtualization functions to the guest VM.
+          </para>
+
+          <para>
+            This feature is available on host systems that use an AMD
+            CPU. For Intel CPUs, the option is grayed out.
           </para>
         </listitem>
@@ -1432 +1433 @@
 
       <para>
-        With virtual machines running modern server operating systems,
-        &product-name; also supports CPU hot-plugging. For details, see
+        With virtual machines running modern server OSes, &product-name;
+        also supports CPU hot-plugging. For details, see
         <xref linkend="cpuhotplug" />.
       </para>
@@ -1455 +1456 @@
             Interface:</emphasis> &product-name; provides
             paravirtualization interfaces to improve time-keeping
-            accuracy and performance of guest operating systems. The
-            options available are documented under the
+            accuracy and performance of guest OSes. The options
+            available are documented under the
             <computeroutput>paravirtprovider</computeroutput> option in
             <xref linkend="vboxmanage-modifyvm" />. For further details
@@ -1510 +1511 @@
         <emphasis role="bold">Acceleration</emphasis> tab will work
         well. &product-name; selects sensible defaults, depending on the
-        operating system that you selected when you created the virtual
-        machine. In certain situations, however, you may want to change
-        the preconfigured defaults.
+        OS that you selected when you created the virtual machine. In
+        certain situations, however, you may want to change the
+        preconfigured defaults.
       </para>
 
@@ -1564 +1565 @@
             <emphasis role="bold">Monitor Count:</emphasis> With this
             setting, &product-name; can provide more than one virtual
-            monitor to a virtual machine. If a guest operating system
-            supports multiple attached monitors, &product-name; can
-            pretend that multiple virtual monitors are present. Up to
-            eight such virtual monitors are supported.
+            monitor to a virtual machine. If a guest OS supports
+            multiple attached monitors, &product-name; can pretend that
+            multiple virtual monitors are present. Up to eight such
+            virtual monitors are supported.
           </para>
 
@@ -1631 +1632 @@
           <para>
             <emphasis role="bold">Graphics Controller:</emphasis>
-            Specifies the graphics adapter type used by the VM. The
-            following options are available:
+            Specifies the graphics adapter type used by the guest VM.
+            Note that you must install the Guest Additions on the guest
+            VM to specify the VBoxSVGA or VMSVGA graphics controller.
+            The following options are available:
           </para>
 
@@ -1641 +1644 @@
                 <emphasis role="bold">VBoxSVGA:</emphasis> The default
                 graphics controller for new VMs that use Linux or
-                Windows 7 or later. Requires the Guest Additions.
+                Windows 7 or later.
+              </para>
+
+              <para>
+                This graphics controller improves performance and 3D
+                support when compared to the legacy VBoxVGA option.
               </para>
             </listitem>
@@ -1647 +1655 @@
             <listitem>
               <para>
-                <emphasis role="bold">VBoxVGA:</emphasis> Used for
-                legacy guest operating systems. This was the default
-                graphics controller in previous releases.
-              </para>
-
-              <para>
-                For Windows versions before Windows 7, this is the
-                default option. Does not require the Guest Additions.
+                <emphasis role="bold">VBoxVGA:</emphasis> Use this
+                graphics controller for legacy guest OSes. This is the
+                default graphics controller for Windows versions before
+                Windows 7.
               </para>
             </listitem>
@@ -1660 +1664 @@
             <listitem>
               <para>
-                <emphasis role="bold">VMSVGA:</emphasis> Used to emulate
-                a VMware SVGA graphic device. Requires the Guest
-                Additions.
+                <emphasis role="bold">VMSVGA:</emphasis> Use this
+                graphics controller to emulate a VMware SVGA graphics
+                device.
               </para>
             </listitem>
@@ -1668 +1672 @@
             <listitem>
               <para>
-                <emphasis role="bold">None:</emphasis> Do not emulate a
-                graphics adapter type.
+                <emphasis role="bold">None:</emphasis> Does not emulate
+                a graphics adapter type.
               </para>
             </listitem>
@@ -1714 +1718 @@
       <title>Recording Tab</title>
 
-      <remark>
-        Renamed to Recording tab? Check against RC version.
-      </remark>
-
       <para>
         On the <emphasis role="bold">Recording</emphasis> tab you can
@@ -1729 +1729 @@
         <listitem>
           <para>
-            <emphasis role="bold">Enable Capture:</emphasis> Select this
-            check box and select a <emphasis role="bold">Capture
+            <emphasis role="bold">Enable Recording:</emphasis> Select
+            this check box and select a <emphasis role="bold">Recording
             Mode</emphasis> option.
           </para>
@@ -1737 +1737 @@
         <listitem>
           <para>
-            <emphasis role="bold">Capture Mode:</emphasis> You can
+            <emphasis role="bold">Recording Mode:</emphasis> You can
             choose to record video, audio, or both video and audio.
           </para>
@@ -1744 +1744 @@
             Some settings on the
             <emphasis role="bold">Recording</emphasis> tab may be grayed
-            out, depending on the <emphasis role="bold">Capture
+            out, depending on the <emphasis role="bold">Recording
             Mode</emphasis> setting.
           </para>
@@ -1855 +1855 @@
 
     <para>
-      Depending on the guest operating system type that you selected
-      when you created the VM, a new VM includes the following storage
-      devices:
+      Depending on the guest OS type that you selected when you created
+      the VM, a new VM includes the following storage devices:
     </para>
 
@@ -1889 +1888 @@
       IDE controller to which both the CD/DVD drive and the hard disks
       have been attached. This might also apply if you selected an older
-      operating system type when you created the VM. Since older
-      operating systems do not support SATA without additional drivers,
-      &product-name; will make sure that no such devices are present
-      initially. See <xref linkend="harddiskcontrollers" />.
+      OS type when you created the VM. Since older OSes do not support
+      SATA without additional drivers, &product-name; will make sure
+      that no such devices are present initially. See
+      <xref linkend="harddiskcontrollers" />.
     </para>
 
@@ -1938 +1937 @@
           <listitem>
             <para>
-              You can then select to which <emphasis role="bold">device
-              slot</emphasis> of the controller the virtual disk should
-              be connected to. IDE controllers have four slots which
-              have traditionally been called primary master, primary
-              slave, secondary master, and secondary slave. By contrast,
-              SATA and SCSI controllers offer you up to 30 slots for
-              attaching virtual devices.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              You can select which <emphasis role="bold">image
-              file</emphasis> to use.
+              The <emphasis role="bold">device slot</emphasis> of the
+              controller that the virtual disk is connected to. IDE
+              controllers have four slots which have traditionally been
+              called primary master, primary slave, secondary master,
+              and secondary slave. By contrast, SATA and SCSI
+              controllers offer you up to 30 slots for attaching virtual
+              devices.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              The <emphasis role="bold">image file</emphasis> to use.
             </para>
 
@@ -1986 +1984 @@
                   typically be in the standard ISO format instead. Most
                   commonly, you will select this option when installing
-                  an operating system from an ISO file that you have
-                  obtained from the Internet. For example, most Linux
-                  distributions are available in this way.
+                  an OS from an ISO file that you have obtained from the
+                  Internet. For example, most Linux distributions are
+                  available in this way.
                 </para>
 
@@ -2003 +2001 @@
                       Drive</emphasis> from the list, then the physical
                       device of the host computer is connected to the
-                      VM, so that the guest operating system 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.
+                      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>
 
@@ -2187 +2184 @@
 
     <para>
-      If a virtual serial port is enabled, the guest operating system
-      sees a standard 16550A compatible UART device. Other UART types
-      can be configured using the <command>VBoxManage modifyvm</command>
-      command. Both receiving and transmitting data is supported. How
-      this virtual serial port is then connected to the host is
-      configurable, and the details depend on your host operating
-      system.
+      If a virtual serial port is enabled, the guest OS sees a standard
+      16550A compatible UART device. Other UART types can be configured
+      using the <command>VBoxManage modifyvm</command> command. Both
+      receiving and transmitting data is supported. How this virtual
+      serial port is then connected to the host is configurable, and the
+      details depend on your host OS.
     </para>
 
@@ -2294 +2290 @@
               <emphasis role="bold">Host Pipe:</emphasis> Configure
               &product-name; to connect the virtual serial port to a
-              software pipe on the host. This depends on your host
-              operating system, as follows:
+              software pipe on the host. This depends on your host OS,
+              as follows:
             </para>
 
@@ -2441 +2437 @@
         &product-name; can enable virtual machines to access the USB
         devices on your host directly. To achieve this, &product-name;
-        presents the guest operating system with a virtual USB
-        controller. As soon as the guest system starts using a USB
-        device, it will appear as unavailable on the host.
+        presents the guest OS with a virtual USB controller. As soon as
+        the guest system starts using a USB device, it will appear as
+        unavailable on the host.
       </para>
 
@@ -2809 +2805 @@
       <para>
         EFI provides two distinct video interfaces: GOP (Graphics Output
-        Protocol) and UGA (Universal Graphics Adapter). Modern operating
-        systems, such as Mac OS X, generally use GOP, while some older
-        ones still use UGA. &product-name; provides a configuration
-        option to control the graphics resolution for both interfaces,
-        making the difference mostly irrelevant for users.
+        Protocol) and UGA (Universal Graphics Adapter). Modern OSes,
+        such as Mac OS X, generally use GOP, while some older ones still
+        use UGA. &product-name; provides a configuration option to
+        control the graphics resolution for both interfaces, making the
+        difference mostly irrelevant for users.
       </para>
 

trunk/doc/manual/en_US/user_ChangeLog.xml

@@ -10 +10 @@
 
   <para>
-    This section summarizes the changes between VirtualBox versions.
+    This section summarizes the changes between &product-name; versions.
     Note that this change log is not exhaustive and not all changes are
     listed.
@@ -16 +16 @@
 
   <para>
-    VirtualBox version numbers consist of three numbers separated by
+    &product-name; version numbers consist of three numbers separated by
     dots where the first and second number represent the major version
     and the third number the minor version. Minor version numbers of
@@ -33 +33 @@
     <para>
       To view the change log for a legacy version of VirtualBox see the
-      documentation for the relevant VirtualBox release.
+      documentation for the relevant &product-name; release.
     </para>
 

trunk/doc/manual/en_US/user_Frontends.xml

@@ -198 +198 @@
         <listitem>
           <para>
-            The Remmina remote desktop client can be used with VRDP.
+            You can use the Remmina remote desktop client with VRDP.
             This application is included with some Linux distributions,
             such as Debian and Ubuntu.
@@ -404 +404 @@
           <para>
             An RDP viewer on the remote client. See
-            <xref
-            linkend="rdp-viewers" /> for examples.
+            <xref linkend="rdp-viewers" /> for examples.
           </para>
         </listitem>
@@ -469 +468 @@
 
 <screen>VBoxManage storagectl "Windows XP" --name "IDE Controller"
-      --add ide --controller PIIX4</screen>
+  --add ide --controller PIIX4</screen>
         </listitem>
 
@@ -479 +478 @@
 
 <screen>VBoxManage storageattach "Windows XP" --storagectl "IDE Controller"
-      --port 0 --device 0 --type hdd --medium "WinXP.vdi"</screen>
+ --port 0 --device 0 --type hdd --medium "WinXP.vdi"</screen>
         </listitem>
 
@@ -490 +489 @@
 
 <screen>VBoxManage storageattach "Windows XP" --storagectl "IDE Controller"
-      --port 0 --device 1 --type dvddrive --medium /full/path/to/iso.iso</screen>
+ --port 0 --device 1 --type dvddrive --medium /full/path/to/iso.iso</screen>
         </listitem>
 
@@ -1102 +1101 @@
       running. This works regardless of the host operating system that
       is running on the hosts. You can teleport virtual machines between
-      Oracle Solaris and Mac hosts, for example.
+      Oracle Solaris and Mac OS X hosts, for example.
     </para>
 

trunk/doc/manual/en_US/user_GuestAdditions.xml

@@ -1356 +1356 @@
             The guest properties
             <computeroutput>/VirtualBox/GuestAdd/SharedFolders/MountDir</computeroutput>
-            and (more generic)
+            and the more generic
             <computeroutput>/VirtualBox/GuestAdd/SharedFolders/MountPrefix</computeroutput>
             can be used to override the automatic mount directory and
@@ -1433 +1433 @@
       Drop</emphasis> menu item in the
       <emphasis role="bold">Devices</emphasis> menu of the virtual
-      machine, as shown below, or the <command>VBoxManage</command>.
+      machine, as shown below, or the <command>VBoxManage</command>
+      command.
     </para>
 
@@ -1603 +1604 @@
       </para>
 
-      <orderedlist>
+      <itemizedlist>
 
         <listitem>
@@ -1665 +1666 @@
             disabled by default and must be <emphasis>manually
             enabled</emphasis> in the VM settings. See
-            <xref
-            linkend="generalsettings" />.
+            <xref linkend="settings-display" />.
           </para>
 
           <note>
             <para>
-              Untrusted guest systems should not be allowed to use
-              &product-name;'s 3D acceleration features, just as
+              Untrusted guest systems should not be allowed to use the
+              3D acceleration features of &product-name;, just as
               untrusted host software should not be allowed to use 3D
               acceleration. Drivers for 3D hardware are generally too
@@ -1686 +1686 @@
         </listitem>
 
-      </orderedlist>
+      </itemizedlist>
 
       <para>
@@ -1764 +1764 @@
         acceleration hardware instead of performing overlay stretching
         and color conversion in software, which would be slow. This
-        currently works for Windows, Linux and Mac host platforms,
+        currently works for Windows, Linux and Mac OS X host platforms,
         provided that your host operating system can make use of 2D
         video acceleration in the first place.
@@ -1774 +1774 @@
       </para>
 
-      <orderedlist>
+      <itemizedlist>
 
         <listitem>
@@ -1794 +1794 @@
             disabled by default and must be <emphasis>manually
             enabled</emphasis> in the VM settings. See
-            <xref
-            linkend="generalsettings" />.
-          </para>
-        </listitem>
-
-      </orderedlist>
+            <xref linkend="settings-display" />.
+          </para>
+        </listitem>
+
+      </itemizedlist>
 
       <para>
@@ -2037 +2036 @@
 
       <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
+        <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:
       </para>
 
@@ -2046 +2047 @@
 
       <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.
+        Similarly the
+        <computeroutput>/VirtualBox/HostInfo/ResumeCounter</computeroutput>
+        can be used to detect that a VM was resumed from the paused
+        state or saved state.
       </para>
 
@@ -2061 +2064 @@
       The Guest Control File Manager is a feature of the Guest Additions
       that enables easy copying and moving of files between a guest and
-      the host system.
-    </para>
-
-    <para>
-      Other file management operations are supported, such as creating
-      new folders and renaming files or deleting files.
+      the host system. Other file management operations provide support
+      to create new folders and to rename or delete files.
     </para>
 
@@ -2074 +2073 @@
         <imageobject>
           <imagedata align="center" fileref="images/guest-fm.png"
-            width="10cm" />
+            width="12cm" />
         </imageobject>
       </mediaobject>
@@ -2098 +2097 @@
         <listitem>
           <para>
-            Display the Guest Control File Manager.
+            Open the Guest Control File Manager.
           </para>
 
@@ -2108 +2107 @@
 
           <para>
-            The Guest Control File Manager is displayed. Files on the
-            host system are shown in the left pane.
+            The left pane shows the files on the host system.
           </para>
         </listitem>
@@ -2119 +2117 @@
 
           <para>
-            In the panel at the bottom of the Guest Control File
-            Manager, enter authentication credentials for a user on the
-            guest system.
+            At the bottom of the Guest Control File Manager, enter
+            authentication credentials for a user on the guest system.
           </para>
 
@@ -2129 +2126 @@
 
           <para>
-            The guest VM file system is shown in the right pane of the
-            Guest Control File Manager.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Transfer files between the guest and the host.
-          </para>
-
-          <para>
-            Use the file transfer icons to copy or move files between
-            the guest and host.
-          </para>
-
-          <para>
-            You can copy and move files from guest to host, or from host
-            to guest.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Close down the Guest Control File Manager.
-          </para>
-
-          <para>
-            Click <emphasis role="bold">Close</emphasis>. The guest
-            session is ended and the Guest Control File Manager is
-            closed down.
+            The contents of the guest VM file system appears in the
+            right pane of the Guest Control File Manager.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Transfer files between the guest and the host system by
+            using the move and copy file transfer icons.
+          </para>
+
+          <para>
+            You can copy and move files from a guest to the host system
+            or from the host system to the guest.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Close the Guest Control File Manager.
+          </para>
+
+          <para>
+            Click <emphasis role="bold">Close</emphasis> to end the
+            guest session.
           </para>
         </listitem>
@@ -2432 +2424 @@
           Enabling Page Fusion might indirectly increase the chances for
           malicious guests to successfully attack other VMs running on
-          the same host.
-
-<!--See <xref linkend="pot-insecure"/>.-->
+          the same host. See <xref linkend="pot-insecure"/>.
         </para>
       </note>

trunk/doc/manual/en_US/user_Installation.xml

@@ -8 +8 @@
 
   <title>Installation Details</title>
+
   <para>
     As installation of &product-name; varies depending on your host
@@ -76 +77 @@
         Using either way displays the installation
         <emphasis role="bold">Welcome</emphasis> dialog and enables you
-        to choose where to install &product-name;, and which components to
-        install. In addition to the &product-name; application, the
+        to choose where to install &product-name;, and which components
+        to install. In addition to the &product-name; application, the
         following components are available:
       </para>
@@ -87 +88 @@
             <emphasis role="bold">USB support.</emphasis> This package
             contains special drivers for your Windows host that
-            &product-name; requires to fully support USB devices inside your
-            virtual machines.
+            &product-name; requires to fully support USB devices inside
+            your virtual machines.
           </para>
         </listitem>
@@ -96 +97 @@
             <emphasis role="bold">Networking.</emphasis> This package
             contains extra networking drivers for your Windows host that
-            &product-name; needs to support Bridged Networking. This enables
-            your VM's virtual network cards to be accessed from other
-            machines on your physical network.
+            &product-name; needs to support Bridged Networking. This
+            enables your VM's virtual network cards to be accessed from
+            other machines on your physical network.
           </para>
         </listitem>
@@ -105 +106 @@
           <para>
             <emphasis role="bold">Python support.</emphasis> This
-            package contains Python scripting support for the &product-name;
-            API, see <xref linkend="VirtualBoxAPI" />. For this to work,
-            an already working Windows Python installation on the system
-            is required.
+            package contains Python scripting support for the
+            &product-name; API, see <xref linkend="VirtualBoxAPI" />.
+            For this to work, an already working Windows Python
+            installation on the system is required.
           </para>
 
@@ -119 +120 @@
           <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. Since
+              &product-name; 5.1, Python 3 is also supported.
             </para>
           </note>
@@ -151 +152 @@
       <para>
         Then, run either of the following commands on the extracted .MSI
-        files. This will install &product-name; only for the current user.
+        files. This will install &product-name; only for the current
+        user.
       </para>
 
@@ -159 +161 @@
 
       <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 features are available:
+        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
+        features are available:
       </para>
 
@@ -337 +340 @@
 
           <para>
-            Specifies whether or not an &product-name; icon on the desktop
-            should be created.
+            Specifies whether or not an &product-name; icon on the
+            desktop should be created.
           </para>
 
@@ -387 +390 @@
 
           <para>
-            Specifies whether to start &product-name; right
-            after successful installation.
+            Specifies whether to start &product-name; right after
+            successful installation.
           </para>
 
@@ -467 +470 @@
 
       <para>
-        To perform a non-interactive installation of &product-name; you can
-        use the command line version of the installer application.
+        To perform a non-interactive installation of &product-name; you
+        can use the command line version of the installer application.
       </para>
 
@@ -531 +534 @@
           &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 required.
+          VirtualBox Manager, requires both Qt and SDL. If you only want
+          to run <command>VBoxHeadless</command>, neither Qt nor SDL are
+          required.
         </para>
       </note>
@@ -639 +642 @@
 
       <para>
-        &product-name; is available in a number of package formats native to
-        various common Linux distributions. See
+        &product-name; is available in a number of package formats
+        native to various common Linux distributions. See
         <xref linkend="hostossupport"/>. In addition, there is an
         alternative generic installer (.run) which should work on most
@@ -848 +851 @@
 
         <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 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:
         </para>
 
@@ -870 +874 @@
 
         <para>
-          The &product-name; kernel module needs a device node to operate.
-          The above <command>make</command> command will tell you how to
-          create the device node, depending on your Linux system. The
-          procedure is slightly different for a classical Linux setup
-          with a <computeroutput>/dev</computeroutput> directory, a
-          system with the now deprecated <command>devfs</command> and a
-          modern Linux system with <command>udev</command>.
+          The &product-name; kernel module needs a device node to
+          operate. The above <command>make</command> command will tell
+          you how to create the device node, depending on your Linux
+          system. The procedure is slightly different for a classical
+          Linux setup with a <computeroutput>/dev</computeroutput>
+          directory, a system with the now deprecated
+          <command>devfs</command> and a modern Linux system with
+          <command>udev</command>.
         </para>
 
@@ -928 +933 @@
 
         <para>
-          Before updating or uninstalling &product-name;, you must terminate
-          any virtual machines which are currently running and exit the
-          &product-name; or VBoxSVC applications. To update &product-name;,
-          simply run the installer of the updated version. To uninstall
-          &product-name;, run the installer as follows:
+          Before updating or uninstalling &product-name;, you must
+          terminate any virtual machines which are currently running and
+          exit the &product-name; or VBoxSVC applications. To update
+          &product-name;, simply run the installer of the updated
+          version. To uninstall &product-name;, run the installer as
+          follows:
         </para>
 
@@ -1050 +1056 @@
         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:
+        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:
       </para>
 
@@ -1066 +1072 @@
 
       <para>
-        The easiest way to start a &product-name; program is by running the
-        program of your choice (<command>VirtualBox</command>,
+        The easiest way to start a &product-name; program is by running
+        the program of your choice (<command>VirtualBox</command>,
         <command>VBoxManage</command>, or
         <command>VBoxHeadless</command>) from a terminal. These are
@@ -1076 +1082 @@
       <para>
         The following detailed instructions should only be of interest
-        if you wish to execute &product-name; without installing it first.
-        You should start by compiling the
+        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
@@ -1112 +1118 @@
 
     <para>
-      For the specific versions of Oracle Solaris that are supported as host
-      operating systems, see <xref
+      For the specific versions of Oracle Solaris that are supported as
+      host operating systems, see <xref
     linkend="hostossupport" />.
     </para>
 
     <para>
-      If you have a previously installed instance of &product-name; on your
-      Oracle Solaris host, please uninstall it first before installing a new
-      instance. See <xref linkend="uninstall-solaris-host" /> for
-      uninstall instructions.
+      If you have a previously installed instance of &product-name; on
+      your Oracle Solaris host, please uninstall it first before
+      installing a new instance. See
+      <xref linkend="uninstall-solaris-host" /> for uninstall
+      instructions.
     </para>
 
@@ -1129 +1136 @@
 
       <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 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:
+        &product-name; is available as a standard Oracle Solaris
+        package. Download the &product-name; SunOS package which
+        includes the 64-bit versions of &product-name;. <emphasis>The
+        installation must be performed as root and from the global
+        zone</emphasis> as the &product-name; installer loads kernel
+        drivers which cannot be done from non-global zones. To verify
+        which zone you are currently in, execute the
+        <command>zonename</command> command. Execute the following
+        commands:
       </para>
 
@@ -1142 +1150 @@
 
       <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 no longer a separate
+        package and has been integrated into the main package. Install
+        the &product-name; package as follows:
       </para>
 
@@ -1157 +1165 @@
         and proceed, as it is essential to execute this script which
         installs the &product-name; kernel module. Following this
-        confirmation the installer will install &product-name; and execute
-        the postinstall setup script.
+        confirmation the installer will install &product-name; and
+        execute the postinstall setup script.
       </para>
 
@@ -1185 +1193 @@
         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:
+        for Oracle Solaris hosts that support the USB features required
+        by &product-name;. Any system user who is going to use USB
+        devices from &product-name; guests must be a member of this
+        group. A user can be made a member of this group through the GUI
+        user/group management or at the command line by executing as
+        root:
       </para>
 
@@ -1207 +1216 @@
 
       <para>
-        The easiest way to start a &product-name; program is by running the
-        program of your choice (<command>VirtualBox</command>,
+        The easiest way to start a &product-name; program is by running
+        the program of your choice (<command>VirtualBox</command>,
         <command>VBoxManage</command>, or
         <command>VBoxHeadless</command>) from a terminal. These are
@@ -1262 +1271 @@
 
       <para>
-        To perform a non-interactive installation of &product-name; there is
-        a response file named
+        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
@@ -1291 +1300 @@
 
       <para>
-        Assuming that &product-name; has already been installed into your
-        zone, you need to give the zone access to &product-name;'s device
-        node. This is done by performing the following steps. Start a
-        root terminal and run the following command:
+        Assuming that &product-name; has already been installed into
+        your zone, you need to give the zone access to &product-name;'s
+        device node. This is done by performing the following steps.
+        Start a root terminal and run the following command:
       </para>
 
@@ -1320 +1329 @@
 
       <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
+        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.
+        that shown above. This does not apply to Oracle Solaris 10
+        hosts, due to lack of USB support.
       </para>
 

trunk/doc/manual/en_US/user_Introduction.xml

@@ -16 +16 @@
     &product-name; is a cross-platform virtualization application. What
     does that mean? For one thing, it installs on your existing Intel or
-    AMD-based computers, whether they are running Windows, Mac, Linux or
-    Oracle Solaris operating systems. Secondly, it extends the
-    capabilities of your existing computer so that it can run multiple
-    operating systems, inside multiple virtual machines, at the same
-    time. So, for example, you can run Windows and Linux on your Mac,
-    run Windows Server 2008 on your Linux server, run Linux on your
-    Windows PC, and so on, all alongside your existing applications. You
-    can install and run as many virtual machines as you like. The only
+    AMD-based computers, whether they are running Windows, Mac OS X,
+    Linux, or Oracle Solaris operating systems (OSes). Secondly, it
+    extends the capabilities of your existing computer so that it can
+    run multiple OSes, inside multiple virtual machines, at the same
+    time. As an example, you can run Windows and Linux on your Mac, run
+    Windows Server 2016 on your Linux server, run Linux on your Windows
+    PC, and so on, all alongside your existing applications. You can
+    install and run as many virtual machines as you like. The only
     practical limits are disk space and memory.
   </para>
@@ -35 +35 @@
 
   <para>
-    The following screenshot shows how &product-name;, installed on a
-    Mac computer, is running Windows 8 in a virtual machine window:
+    The following screenshot shows how &product-name;, installed on an
+    Apple Mac OS X computer, is running Windows Server 2016 in a virtual
+    machine window.
   </para>
 
-  <figure id="fig-win8-intro">
-    <title>Windows 8 Virtual Machine, Displayed on a Mac OS X Host</title>
+  <figure id="fig-win2016-intro">
+    <title>Windows Server 2016 Virtual Machine, Displayed on a Mac OS X Host</title>
     <mediaobject>
       <imageobject>
@@ -62 +63 @@
     <xref linkend="features-overview" />. For existing &product-name;
     users who just want to find out what is new in this release, see the
-    <emphasis>&product-name; Release Notes</emphasis>.
+    <xref linkend="ChangeLog"/>.
   </para>
 
@@ -80 +81 @@
           <emphasis role="bold">Running multiple operating systems
           simultaneously.</emphasis> &product-name; enables you to run
-          more than one operating system at a time. This way, you can
-          run software written for one operating system on another, such
-          as Windows software on Linux or a Mac, without having to
-          reboot to use it. Since you can configure what kinds of
-          <emphasis>virtual</emphasis> hardware should be presented to
-          each such operating system, you can install an old operating
-          system such as DOS or OS/2 even if your real computer's
-          hardware is no longer supported by that operating system.
+          more than one OS at a time. This way, you can run software
+          written for one OS on another, such as Windows software on
+          Linux or a Mac, without having to reboot to use it. Since you
+          can configure what kinds of <emphasis>virtual</emphasis>
+          hardware should be presented to each such OS, you can install
+          an old OS such as DOS or OS/2 even if your real computer's
+          hardware is no longer supported by that OS.
         </para>
       </listitem>
@@ -166 +166 @@
         <para>
           <emphasis role="strong">Host operating system (host
-          OS).</emphasis> This is the operating system of the physical
-          computer on which &product-name; was installed. There are
-          versions of &product-name; for Windows, Mac OS X, Linux, and
-          Oracle Solaris hosts. See <xref linkend="hostossupport" />.
+          OS).</emphasis> This is the OS of the physical computer on
+          which &product-name; was installed. There are versions of
+          &product-name; for Windows, Mac OS X, Linux, and Oracle
+          Solaris hosts. See <xref linkend="hostossupport" />.
         </para>
 
@@ -181 +181 @@
       <listitem>
         <para>
-          <emphasis role="strong"> Guest operating system (guest
-          OS).</emphasis> This is the operating system that is running
-          inside the virtual machine. Theoretically, &product-name; can
-          run any x86 operating system. such as DOS, Windows, OS/2,
-          FreeBSD, and OpenBSD. But to achieve near-native performance
-          of the guest code on your machine, we had to go through a lot
-          of optimizations that are specific to certain operating
-          systems. So while your favorite operating system
+          <emphasis role="strong">Guest operating system (guest
+          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
+          achieve near-native performance of the guest code on your
+          machine, we had to go through a lot of optimizations that are
+          specific to certain OSes. So while your favorite OS
           <emphasis>may</emphasis> run as a guest, we officially support
           and optimize for a select few, which include the most common
-          operating systems.
+          OSes.
         </para>
 
@@ -203 +202 @@
           <emphasis role="strong">Virtual machine (VM).</emphasis> This
           is the special environment that &product-name; creates for
-          your guest operating system while it is running. In other
-          words, you run your guest operating system
-          <emphasis>in</emphasis> a VM. Normally, a VM will be shown as
-          a window on your computer's desktop, but depending on which of
-          the various frontends of &product-name; you use, it can be
-          displayed in full screen mode or remotely on another computer.
+          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>
 
@@ -256 +255 @@
         <para>
           <emphasis role="bold">Portability.</emphasis> &product-name;
-          runs on a large number of 32-bit and 64-bit host operating
-          systems See <xref linkend="hostossupport" />.
+          runs on a large number of 32-bit and 64-bit host OS. See
+          <xref
+          linkend="hostossupport" />.
         </para>
 
@@ -266 +266 @@
           <emphasis>bare-metal</emphasis> or <emphasis>type 1</emphasis>
           hypervisor would run directly on the hardware, &product-name;
-          requires an existing operating system to be installed. It can
-          thus run alongside existing applications on that host.
+          requires an existing OS to be installed. It can thus run
+          alongside existing applications on that host.
         </para>
 
@@ -275 +275 @@
           image formats are used. This enables you to run virtual
           machines created on one host on another host with a different
-          host operating system. For example, you can create a virtual
-          machine on Windows and then run it under Linux.
+          host OS. For example, you can create a virtual machine on
+          Windows and then run it under Linux.
         </para>
 
@@ -374 +374 @@
               into &product-name;. With its unique <emphasis>ACPI power
               status support</emphasis>, &product-name; can even report
-              to ACPI-aware guest operating systems the power status of
-              the host. For mobile systems running on battery, the guest
-              can thus enable energy saving and notify the user of the
-              remaining power, for example in full screen modes.
+              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>
@@ -480 +480 @@
           Microsoft Windows. Instead, the VRDE is plugged directly into
           the virtualization layer. As a result, it works with guest
-          operating systems other than Windows, even in text mode, and
-          does not require application support in the virtual machine
-          either. The VRDE is described in detail in
-          <xref linkend="vrde" />.
+          OSes other than Windows, even in text mode, and does not
+          require application support in the virtual machine either. The
+          VRDE is described in detail in <xref linkend="vrde" />.
         </para>
 
@@ -527 +526 @@
 
     <para>
-      Currently, &product-name; runs on the following host operating
-      systems:
+      Currently, &product-name; runs on the following host OSes:
     </para>
 
@@ -669 +667 @@
       <listitem>
         <para>
-          <emphasis role="bold">Linux hosts (64-bit).</emphasis> Includes the following:
+          <emphasis role="bold">Linux hosts (64-bit).</emphasis>
+          Includes the following:
         </para>
 
@@ -734 +733 @@
 
         <para>
-          Note that Linux 2.4-based host operating systems are no longer
-          supported.
+          Note that Linux 2.4-based host OSes are no longer supported.
         </para>
       </listitem>
@@ -762 +760 @@
       Note that the above list is informal. Oracle support for customers
       who have a support contract is limited to a subset of the listed
-      host operating systems. Also, any feature which is marked as
+      host OSes. Also, any feature which is marked as
       <emphasis>experimental</emphasis> is not supported. Feedback and
       suggestions about such features are welcome.
@@ -786 +784 @@
     <para>
       &product-name; comes in many different packages, and installation
-      depends on your host operating system. If you have installed
-      software before, installation should be straightforward. On each
-      host platform, &product-name; uses the installation method that is
-      most common and easy to use. If you run into trouble or have
-      special requirements, see <xref linkend="installation" /> for
-      details about the various installation methods.
+      depends on your host OS. If you have installed software before,
+      installation should be straightforward. On each host platform,
+      &product-name; uses the installation method that is most common
+      and easy to use. If you run into trouble or have special
+      requirements, see <xref linkend="installation" /> for details
+      about the various installation methods.
     </para>
 
@@ -964 +962 @@
     <para>
       This window is called the <emphasis role="bold">VirtualBox
-      Manager</emphasis>. On the left, you can see a pane that will
-      later list all your virtual machines. Since you have not created
-      any, the list is empty. A row of buttons above it enables you to
-      create new VMs and work on existing VMs, once you have some. The
-      pane on the right displays the properties of the virtual machine
-      currently selected, if any. Again, since you do not have any
-      machines yet, the pane displays a welcome message.
-    </para>
-
-    <para>
-      To give you an idea what &product-name; might look like later,
-      after you have created many machines, here is another example:
+      Manager</emphasis>. The left pane will later list all your virtual
+      machines. Since you have not yet created any virtual machines,
+      this list is empty. The <emphasis role="bold">Tools</emphasis>
+      button provides access to user tools, such as the Virtual Media
+      Manager.
+    </para>
+
+    <para>
+      The pane on the right displays the properties of the currently
+      selected virtual machine. Since you do not have any machines yet,
+      the pane displays a welcome message.
+    </para>
+
+    <para>
+      The buttons on the right pane are used to create and work with
+      VMs.
+    </para>
+
+    <para>
+      The following figure gives an idea of what &product-name; might
+      look like after you have created some VMs.
     </para>
 
@@ -983 +990 @@
         <imageobject>
           <imagedata align="center" fileref="images/virtualbox-main.png"
-                     width="10cm" />
+                     width="12cm" />
         </imageobject>
       </mediaobject>
@@ -995 +1002 @@
 
     <para>
-      Click the <emphasis role="bold">New</emphasis> button at the top
-      of the VirtualBox Manager window. A wizard is shown, to guide you
-      through setting up a new virtual machine (VM):
+      Click <emphasis role="bold">New</emphasis> in the VirtualBox
+      Manager window. A wizard is shown, to guide you through setting up
+      a new virtual machine (VM).
     </para>
 
@@ -1032 +1039 @@
       <listitem>
         <para>
+          The <emphasis role="bold">Machine Folder</emphasis> is the
+          location where VMs are stored on your computer. The default
+          folder location is shown.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           For <emphasis role="bold">Operating System Type</emphasis>
-          select the operating system that you want to install later.
-          The supported operating systems are grouped. If you want to
-          install something very unusual that is not listed, select
+          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 operating system may require. This is
-          particularly important for 64-bit guests. See
+          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.
@@ -1051 +1066 @@
           time the virtual machine is started. The amount of memory
           given here will be taken away from your host machine and
-          presented to the guest operating system, which will report
-          this size as the virtual computer's installed RAM.
+          presented to the guest OS, which will report this size as the
+          virtual computer's installed RAM.
         </para>
 
@@ -1083 +1098 @@
           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 operating system. Otherwise you
-          may cause your host OS to excessively swap out memory to your
-          hard disk, effectively bringing your host system to a
-          standstill.
+          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.
         </para>
 
@@ -1214 +1228 @@
           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
-          operating system and the applications you want to install. For
-          a modern Windows or Linux guest, you will probably need
-          several gigabytes for any serious use. The limit of the image
-          file size can be changed later, see
-          <xref linkend="vboxmanage-modifyvdi"/>.
+          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"/>.
         </para>
 
@@ -1320 +1333 @@
         displayed. This wizard helps you to select an installation
         medium. Since the VM is created empty, it would otherwise behave
-        just like a real computer with no operating system installed. It
-        will do nothing and display an error message that no bootable
-        operating system was found.
+        just like a real computer with no OS installed. It will do
+        nothing and display an error message that no bootable OS was
+        found.
       </para>
 
       <para>
         For this reason, the wizard helps you to select a medium to
-        install an operating system from.
+        install an OS from.
       </para>
 
@@ -1335 +1348 @@
           <para>
             If you have physical CD or DVD media from which you want to
-            install your guest operating system, such as a Windows
-            installation CD or DVD, put the media into your host's CD or
-            DVD drive.
+            install your guest OS, such as a Windows installation CD or
+            DVD, put the media into your host's CD or DVD drive.
           </para>
 
@@ -1380 +1392 @@
       <para>
         After completing the choices in the wizard, you will be able to
-        install your operating system.
+        install your OS.
       </para>
 
@@ -1392 +1404 @@
         &product-name; provides a virtual USB tablet device to new
         virtual machines through which mouse events are communicated to
-        the guest operating system. If you are running a modern guest
-        operating system that can handle such devices, mouse support may
-        work out of the box without the mouse being
-        <emphasis>captured</emphasis> as described below. See
-        <xref linkend="settings-motherboard" />.
+        the guest OS. If you are running a modern guest OS that can
+        handle such devices, mouse support may work out of the box
+        without the mouse being <emphasis>captured</emphasis> as
+        described below. See <xref linkend="settings-motherboard" />.
       </para>
 
       <para>
         Otherwise, if the virtual machine only sees standard PS/2 mouse
-        and keyboard devices, since the operating system 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>
-
-      <para>
-        After installing a guest operating system and before you install
-        the Guest Additions, described later, either your VM or the rest
-        of your computer can "own" the keyboard and the mouse. Both
-        cannot own the keyboard and mouse at the same time. You will see
-        a <emphasis>second</emphasis> mouse pointer which is always
+        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>
+
+      <para>
+        After installing a guest OS and before you install the Guest
+        Additions, described later, either your VM or the rest of your
+        computer can "own" the keyboard and the mouse. Both cannot own
+        the keyboard and mouse at the same time. You will see a
+        <emphasis>second</emphasis> mouse pointer which is always
         confined to the limits of the VM window. You activate the VM by
         clicking inside it.
@@ -1420 +1431 @@
 
       <para>
-        To return ownership of keyboard and mouse to your host operating
-        system, &product-name; reserves a special key on your keyboard:
-        the <emphasis>Host key</emphasis>. By default, this is the
+        To return ownership of keyboard and mouse to your host OS,
+        &product-name; reserves a special key on your keyboard: the
+        <emphasis>Host key</emphasis>. By default, this is the
         <emphasis>right Ctrl key</emphasis> on your keyboard. On a Mac
         host, the default Host key is the left Command key. You can
@@ -1452 +1463 @@
             the VM if the VM window on your host desktop has the
             keyboard focus. If you have many windows open in your guest
-            operating system, the window that has the focus in your VM
-            is used. This means that if you want to enter text within
-            your VM, click on the title bar of your VM window first.
+            OS, the window that has the focus in your VM is used. This
+            means that if you want to enter text within your VM, click
+            on the title bar of your VM window first.
           </para>
 
@@ -1518 +1529 @@
 
       <para>
-        Operating systems 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 operating
-        system, &product-name;, or the guest operating system. Which of
-        these three receives keypresses depends on a number of factors,
-        including the key itself.
+        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.
       </para>
 
@@ -1531 +1541 @@
         <listitem>
           <para>
-            Host operating systems reserve certain key combinations for
-            themselves. For example, it is impossible to enter the
+            Host OSes reserve certain key combinations for themselves.
+            For example, it is impossible to enter the
             <emphasis role="bold">Ctrl+Alt+Delete</emphasis> combination
-            if you want to reboot the guest operating system in your
-            virtual machine, because this key combination is usually
-            hard-wired into the host OS, both Windows and Linux
-            intercept this, and pressing this key combination will
-            therefore reboot your <emphasis>host</emphasis>.
+            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>.
           </para>
 
@@ -1559 +1569 @@
             normally enables you to switch between virtual terminals. As
             with Ctrl+Alt+Delete, these combinations are intercepted by
-            the host operating system and therefore always switch
-            terminals on the <emphasis>host</emphasis>.
+            the host OS and therefore always switch terminals on the
+            <emphasis>host</emphasis>.
           </para>
 
           <para>
             If, instead, you want to send these key combinations to the
-            <emphasis>guest</emphasis> operating system in the virtual
-            machine, you will need to use one of the following methods:
+            <emphasis>guest</emphasis> OS in the virtual machine, you
+            will need to use one of the following methods:
           </para>
 
@@ -1656 +1666 @@
         media in the <emphasis role="bold">Devices</emphasis> menu of
         the VM's window. Here you can select in detail what
-        &product-name; presents to your VM as a CD, DVD, or floppy.
-      </para>
-
-      <para>
-        The settings are the same as would be available for the VM in
-        the <emphasis role="bold">Settings</emphasis> dialog of the
+        &product-name; presents to your VM as a CD, DVD, or floppy
+        drive.
+      </para>
+
+      <para>
+        The settings are the same as those available for the VM in the
+        <emphasis role="bold">Settings</emphasis> dialog of the
         &product-name; main window. But as the
         <emphasis role="bold">Settings</emphasis> dialog is disabled
-        while the VM is in the Running or Saved state, this extra menu
-        saves you from having to shut down and restart the VM every time
-        you want to change media.
-      </para>
-
-      <para>
-        Hence, in the <emphasis role="bold">Devices</emphasis> menu,
-        &product-name; enables you to attach the host drive to the guest
-        or select a floppy or DVD image using the Disk Image Manager, as
-        described in <xref linkend="configbasics" />.
+        while the VM is in the Running or Saved state, the
+        <emphasis role="bold">Devices</emphasis> menu saves you from
+        having to shut down and restart the VM every time you want to
+        change media.
+      </para>
+
+      <para>
+        Using the <emphasis role="bold">Devices</emphasis> menu, you can
+        attach the host drive to the guest or select a floppy or DVD
+        image, as described in <xref linkend="settings-storage" />.
+      </para>
+
+      <para>
+        The <emphasis role="bold">Devices</emphasis> menu also includes
+        an option for creating a virtual ISO (VISO) from selected files
+        on the host.
       </para>
 
@@ -1691 +1708 @@
         <listitem>
           <para>
-            If you have <emphasis role="bold">scale mode</emphasis>
+            If you have <emphasis role="bold">scaled mode</emphasis>
             enabled, then the virtual machine's screen will be scaled to
             the size of the window. This can be useful if you have many
@@ -1698 +1715 @@
             might be useful to enlarge a window if the VM's output
             screen is very small, for example because you are running an
-            old operating system in it.
-          </para>
-
-          <para>
-            To enable scale mode, press the <emphasis role="bold">Host
-            key + C</emphasis>, or select <emphasis role="bold">Scale
-            mode</emphasis> from the
-            <emphasis role="bold">Machine</emphasis> menu in the VM
-            window. To leave scale mode, press the Host key + C again.
+            old OS in it.
+          </para>
+
+          <para>
+            To enable scaled mode, press <emphasis role="bold">Host key
+            + C</emphasis>, or select <emphasis role="bold">Scaled
+            Mode</emphasis> from the
+            <emphasis role="bold">View</emphasis> menu in the VM window.
+            To leave scaled mode, press <emphasis role="bold">Host key +
+            C </emphasis>again.
           </para>
 
@@ -1726 +1744 @@
             automatic <emphasis role="bold">resizing</emphasis>, the
             Guest Additions will automatically adjust the screen
-            resolution of the guest operating system. For example, if
-            you are running a Windows guest with a resolution of
-            1024x768 pixels and you then resize the VM window to make it
-            100 pixels wider, the Guest Additions will change the
-            Windows display resolution to 1124x768.
+            resolution of the guest OS. For example, if you are running
+            a Windows guest with a resolution of 1024x768 pixels and you
+            then resize the VM window to make it 100 pixels wider, the
+            Guest Additions will change the Windows display resolution
+            to 1124x768.
           </para>
 
@@ -1768 +1786 @@
           <imageobject>
             <imagedata align="center" fileref="images/vm-close.png"
-                       width="11cm" />
+                       width="10cm" />
           </imageobject>
         </mediaobject>
@@ -1803 +1821 @@
             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 operating system, this should
-            trigger a proper shutdown mechanism from within the VM.
+            running a fairly modern OS, this should trigger a proper
+            shutdown mechanism from within the VM.
           </para>
         </listitem>
@@ -1819 +1837 @@
               This is equivalent to pulling the power plug on a real
               computer without shutting it down properly. If you start
-              the machine again after powering it off, your operating
-              system will have to reboot completely and may begin a
-              lengthy check of its virtual system disks. As a result,
-              this should not normally be done, since it can potentially
-              cause data loss or an inconsistent state of the guest
-              system on disk.
+              the machine again after powering it off, your OS will have
+              to reboot completely and may begin a lengthy check of its
+              virtual system disks. As a result, this should not
+              normally be done, since it can potentially cause data loss
+              or an inconsistent state of the guest system on disk.
             </para>
           </warning>
@@ -1859 +1876 @@
       VM groups enable the user to create ad hoc groups of VMs, and to
       manage and perform functions on them collectively, as well as
-      individually. There are a number of features relating to groups.
-    </para>
-
-    <orderedlist>
-
-      <listitem>
-        <para>
-          Create a group using the GUI. Do one of the following:
+      individually.
+    </para>
+
+    <para>
+      The following figure shows VM groups displayed in VirtualBox
+      Manager.
+    </para>
+
+    <figure id="fig-vm-groups">
+      <title>Groups of Virtual Machines</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="images/vm-groups.png"
+            width="10cm" />
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <para>
+      The following features are available for groups:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          Create a group using the VirtualBox Manager. Do one of the
+          following:
         </para>
 
@@ -1881 +1918 @@
               Select multiple VMs and select
               <emphasis role="bold">Group</emphasis> from the
-              right-click menu, as shown in the following image.
-            </para>
-
-            <figure id="fig-vm-groups">
-              <title>Creating a Group of Virtual Machines</title>
-              <mediaobject>
-                <imageobject>
-                  <imagedata align="center" fileref="images/vm-groups.png"
-                 width="10cm" />
-                </imageobject>
-              </mediaobject>
-            </figure>
+              right-click menu.
+            </para>
           </listitem>
 
@@ -1911 +1938 @@
             </para>
 
-<screen>VBoxManage modifyvm "Fred" --groups "/TestGroup"</screen>
+<screen>VBoxManage modifyvm "vm01" --groups "/TestGroup"</screen>
 
             <para>
               This command creates a group "TestGroup" and attaches the
-              VM "Fred" to that group.
+              VM "vm01" to that group.
             </para>
           </listitem>
@@ -1925 +1952 @@
             </para>
 
-<screen>VBoxManage modifyvm "Fred" --groups ""</screen>
-
-            <para>
-              This command detaches all groups from the VM "Fred" and
+<screen>VBoxManage modifyvm "vm01" --groups ""</screen>
+
+            <para>
+              This command detaches all groups from the VM "vm01" and
               deletes the empty group.
             </para>
@@ -1941 +1968 @@
         </para>
 
-<screen>VBoxManage modifyvm "Fred" --groups "/TestGroup,/TestGroup2"</screen>
+<screen>VBoxManage modifyvm "vm01" --groups "/TestGroup,/TestGroup2"</screen>
 
         <para>
           This command creates the groups "TestGroup" and "TestGroup2",
-          if they do not exist, and attaches the VM "Fred" to both of
+          if they do not exist, and attaches the VM "vm01" to both of
           them.
         </para>
@@ -1955 +1982 @@
         </para>
 
-<screen>VBoxManage modifyvm "Fred" --groups "/TestGroup/TestGroup2"</screen>
-
-        <para>
-          This command attaches the VM "Fred" to the subgroup
+<screen>VBoxManage modifyvm "vm01" --groups "/TestGroup/TestGroup2"</screen>
+
+        <para>
+          This command attaches the VM "vm01" to the subgroup
           "TestGroup2" of the "TestGroup" group.
         </para>
@@ -1971 +1998 @@
       </listitem>
 
-    </orderedlist>
+    </itemizedlist>
 
   </sect1>
@@ -1989 +2016 @@
 
     <para>
-      You can see the snapshots of a virtual machine by first selecting
-      a machine in the VirtualBox Manager and then clicking
-      <emphasis role="bold">Snapshots</emphasis> at the top right. Until
+      To see the snapshots of a virtual machine, click on the machine
+      name in VirtualBox Manager. Then click the
+      <emphasis role="bold">List</emphasis> icon next to the machine
+      name, and select <emphasis role="bold">Snapshots</emphasis>. Until
       you take a snapshot of the machine, the list of snapshots will be
       empty except for the <emphasis role="bold">Current
@@ -2019 +2047 @@
             <listitem>
               <para>
-                If your VM is currently running, select
-                <emphasis role="bold">Take Snapshot</emphasis> from the
+                If your VM is running, select <emphasis role="bold">Take
+                Snapshot</emphasis> from the
                 <emphasis role="bold">Machine</emphasis> pull-down menu
                 of the VM window.
@@ -2028 +2056 @@
             <listitem>
               <para>
-                If your VM is currently in either the Saved or the
-                Powered Off state, as displayed next to the VM in the
-                &product-name; main window, click on the
-                <emphasis role="bold">Snapshots </emphasis>tab on the
-                top right of the main window. Do one of the following:
+                If your VM is in either the Saved or the Powered Off
+                state, as displayed next to the VM name in the
+                &product-name; main window, click the
+                <emphasis role="bold">List</emphasis> icon next to the
+                machine name and select
+                <emphasis role="bold">Snapshots</emphasis>. The
+                snapshots window is shown. Do one of the following:
               </para>
 
@@ -2039 +2069 @@
                 <listitem>
                   <para>
-                    Click on the small camera icon.
+                    Click the <emphasis role="bold">Take</emphasis>
+                    icon.
                   </para>
                 </listitem>
@@ -2047 +2078 @@
                     Right-click on the <emphasis role="bold">Current
                     State </emphasis>item in the list and select
-                    <emphasis role="bold">Take Snapshot</emphasis> from
-                    the menu.
+                    <emphasis role="bold">Take</emphasis>.
                   </para>
                 </listitem>
@@ -2070 +2100 @@
             Your new snapshot will then appear in the snapshots list.
             Underneath your new snapshot, you will see an item called
-            Current State, signifying that the current state of your VM
-            is a variation based on the snapshot you took earlier. If
-            you later take another snapshot, you will see that they will
-            be displayed in sequence, and each subsequent snapshot is
-            derived from an earlier one.
+            <emphasis role="bold">Current State</emphasis>, signifying
+            that the current state of your VM is a variation based on
+            the snapshot you took earlier. If you later take another
+            snapshot, you will see that they are displayed in sequence,
+            and that each subsequent snapshot is derived from an earlier
+            one.
           </para>
 
           <figure id="fig-snapshots-list">
-            <title>Snapshots List for a Virtual Machine</title>
+            <title>Snapshots List For a Virtual Machine</title>
             <mediaobject>
               <imageobject>
                 <imagedata align="center" fileref="images/snapshots-1.png"
-                             width="12cm" />
+                             width="10cm" />
               </imageobject>
             </mediaobject>
@@ -2099 +2130 @@
         <listitem>
           <para>
-            <emphasis role="bold">Restore a snapshot</emphasis>. You do
-            this by right-clicking on any snapshot you have taken in the
-            list of snapshots. By restoring a snapshot, you go back or
-            forward in time. The current state of the machine is lost,
-            and the machine is restored to the exact state it was in
-            when the snapshot was taken.
+            <emphasis role="bold">Restore a snapshot</emphasis>. In the
+            list of snapshots, right-click on any snapshot you have
+            taken and select <emphasis role="bold">Restore</emphasis>.
+            By restoring a snapshot, you go back or forward in time. The
+            current state of the machine is lost, and the machine is
+            restored to the exact state it was in when the snapshot was
+            taken.
           </para>
 
@@ -2122 +2154 @@
               <emphasis>not</emphasis> included in snapshots, they
               remain unaltered when a machine is reverted. See
-              <xref
-              linkend="hdimagewrites" />.
+              <xref linkend="hdimagewrites" />.
             </para>
           </note>
@@ -2129 +2160 @@
           <para>
             To avoid losing the current state when restoring a snapshot,
-            you can create a new snapshot before the restore.
+            you can create a new snapshot before the restore operation.
           </para>
 
@@ -2148 +2179 @@
             releases the files on disk that &product-name; used to store
             the snapshot data, thus freeing disk space. To delete a
-            snapshot, right-click on it in the snapshots tree and select
-            <emphasis role="bold">Delete</emphasis>. Snapshots can be
-            deleted even while a machine is running.
+            snapshot, right-click on the snapshot name in the snapshots
+            tree and select <emphasis role="bold">Delete</emphasis>.
+            Snapshots can be deleted even while a machine is running.
           </para>
 
@@ -2182 +2213 @@
       <para>
         Think of a snapshot as a point in time that you have preserved.
-        More formally, a snapshot consists of the following three
-        things:
+        More formally, a snapshot consists of the following:
       </para>
 
@@ -2219 +2249 @@
             in "normal" mode. You can configure disks to behave
             differently with snapshots, see
-            <xref linkend="hdimagewrites" />. Even more formally and
-            technically correct, it is not the virtual disk itself that
-            is restored when a snapshot is restored. Instead, when a
-            snapshot is taken, &product-name; creates differencing
-            images which contain only the changes since the snapshot
-            were taken, and when the snapshot is restored,
-            &product-name; throws away that differencing image, thus
-            going back to the previous state. This is both faster and
-            uses less disk space. For the details, which can be complex,
-            see <xref linkend="diffimages" />.
+            <xref linkend="hdimagewrites" />. In technical terms, it is
+            not the virtual disk itself that is restored when a snapshot
+            is restored. Instead, when a snapshot is taken,
+            &product-name; creates differencing images which contain
+            only the changes since the snapshot were taken. When the
+            snapshot is restored, &product-name; throws away that
+            differencing image, thus going back to the previous state.
+            This is both faster and uses less disk space. For the
+            details, which can be complex, see
+            <xref linkend="diffimages" />.
           </para>
 
@@ -2275 +2305 @@
 
     <para>
-      Clicking on the <emphasis role="bold">Settings</emphasis> button
-      in the toolbar at the top brings up a detailed window where you
-      can configure many of the properties of the selected VM. But be
-      careful. Even though it is possible to change all VM settings
-      after installing a guest operating system, certain changes might
-      prevent a guest operating system from functioning correctly if
-      done after installation.
+      Clicking on <emphasis role="bold">Settings</emphasis> displays a
+      window, where you can configure many of the properties of the
+      selected VM. But be careful when changing VM settings. It is
+      possible to change all VM settings after installing a guest OS,
+      but certain changes might prevent a guest OS from functioning
+      correctly if done after installation.
     </para>
 
@@ -2290 +2319 @@
         because the <emphasis role="bold">Settings</emphasis> dialog
         enables you to change fundamental characteristics of the virtual
-        computer that is created for your guest operating system, and
-        this operating system may perform well when, for example, half
-        of its memory is taken away. As a result, if the
+        machine that is created for your guest OS. For example, the
+        guest OS may not perform well if half of its memory is taken
+        away. As a result, if the
         <emphasis role="bold">Settings</emphasis> button is disabled,
         shut down the current VM first.
@@ -2303 +2332 @@
       changed in the <emphasis role="bold">Settings</emphasis> window
       are described in detail in <xref linkend="BasicConcepts" />. Even
-      more parameters are available with the &product-name; command line
-      interface. See <xref linkend="vboxmanage" />.
+      more parameters are available when using the
+      <command>VBoxManage</command> command line interface. See
+      <xref linkend="vboxmanage" />.
     </para>
 
@@ -2314 +2344 @@
 
     <para>
-      You can easily remove a virtual machine from &product-name;.
-      Alternatively, you can move the virtual machine and associated
-      files, such as a disk image, to another location on the host.
+      You can remove a VM from &product-name; or move the VM and its
+      associated files, such as disk images, to another location on the
+      host.
     </para>
 
@@ -2324 +2354 @@
         <para>
           <emphasis role="bold">Removing a VM.</emphasis> To remove a
-          virtual machine which you no longer need, right-click on the
-          VM in the VirtualBox Manager's machine list and select
-          <emphasis role="bold">Remove</emphasis>.
-        </para>
-
-        <para>
-          A confirmation dialog is displayed that enables you to select
-          whether the virtual machine should only be removed from the
-          list of machines, or whether the files associated with it
-          should also be deleted.
-        </para>
-
-        <para>
-          The <emphasis role="bold">Remove</emphasis> menu item is
-          disabled while a VM is running.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Moving a VM.</emphasis> To move a
-          virtual machine to a new location on the host, right-click on
-          the VM in the VirtualBox Manager's machine list and select
-          <emphasis role="bold">Move</emphasis>.
-        </para>
-
-        <para>
-          A file dialog prompts you to select a new location for the
-          virtual machine.
+          VM, right-click on the VM in the VirtualBox Manager's machine
+          list and select <emphasis role="bold">Remove</emphasis>.
+        </para>
+
+        <para>
+          The confirmation dialog enables you to specify whether to only
+          remove the VM from the list of machines or to remove the files
+          associated with the VM.
+        </para>
+
+        <para>
+          Note that the <emphasis role="bold">Remove</emphasis> menu
+          item is disabled while a VM is running.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Moving a VM.</emphasis> To move a VM to
+          a new location on the host, right-click on the VM in the
+          VirtualBox Manager's machine list and select
+          <emphasis
+          role="bold">Move</emphasis>.
+        </para>
+
+        <para>
+          The file dialog prompts you to specify a new location for the
+          VM.
         </para>
 
@@ -2361 +2390 @@
 
         <para>
-          The <emphasis role="bold">Move</emphasis> menu item is
-          disabled while a VM is running.
-        </para>
-
-        <para>
-          You can also use the <command>VBoxManage</command> command to
-          move a VM. See <xref linkend="vboxmanage-movevm"/>.
+          Note that the <emphasis role="bold">Move</emphasis> menu item
+          is disabled while a VM is running.
+        </para>
+
+        <para>
+          You can also use the <command>VBoxManage movevm</command>
+          command to move a VM. See <xref linkend="vboxmanage-movevm"/>.
         </para>
       </listitem>
@@ -2374 +2403 @@
 
     <para>
-      For details of removing or moving a disk image file from
+      For information about removing or moving a disk image file from
       &product-name;, see <xref linkend="vdis"/>.
     </para>
@@ -2385 +2414 @@
 
     <para>
-      To experiment with a VM configuration, test different guest OS
-      levels or to simply backup a VM, &product-name; can create a full
-      or a linked copy of an existing VM. This is called
-      <emphasis>cloning</emphasis> a virtual machine.
+      You can create a full copy or a linked copy of an existing VM.
+      This copy is called a <emphasis>clone</emphasis>. You might use a
+      cloned VM to experiment with a VM configuration, to test different
+      guest OS levels, or to back up a VM.
     </para>
 
@@ -2409 +2438 @@
       Start the wizard by clicking
       <emphasis role="bold">Clone</emphasis> in the right-click menu of
-      the VirtualBox Manager's machine list, or in the
+      the VirtualBox Manager's machine list or in the
       <emphasis role="bold">Snapshots</emphasis> view of the selected
       VM.
@@ -2415 +2444 @@
 
     <para>
-      Enter a new <emphasis role="bold">Name</emphasis> for the clone.
+      Specify a new <emphasis role="bold">Name</emphasis> for the clone.
       You can choose a <emphasis role="bold">Path</emphasis> for the
-      cloned virtual machine, otherwise the default machines folder is
-      used.
-    </para>
-
-    <para>
-      The <emphasis role="bold">Clone Type</emphasis> option is used to
-      specify if the clone should be linked to the source VM, or if a
-      fully independent clone should be created, as follows:
+      cloned virtual machine, otherwise &product-name; uses the default
+      machines folder.
+    </para>
+
+    <para>
+      The <emphasis role="bold">Clone Type</emphasis> option specifies
+      whether to create a clone linked to the source VM or to create a
+      fully independent clone:
     </para>
 
@@ -2431 +2460 @@
       <listitem>
         <para>
-          <emphasis role="bold">Full Clone:</emphasis> In this mode, all
-          dependent disk images are copied to the new VM folder. The
-          clone can fully operate without the source VM.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Linked Clone:</emphasis> In this mode,
-          new differencing disk images are created where the parent disk
-          images are the source disk images. If you selected the current
-          state of the source VM as clone point, a new snapshot will be
-          created implicitly.
+          <emphasis role="bold">Full Clone:</emphasis> Copies all
+          dependent disk images to the new VM folder. A full clone can
+          operate fully without the source VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Linked Clone:</emphasis> Creates new
+          differencing disk images based on the source VM disk images.
+          If you select the current state of the source VM as the clone
+          point, &product-name; creates a new snapshot.
         </para>
       </listitem>
@@ -2450 +2478 @@
 
     <para>
-      The <emphasis role="bold">Snapshots</emphasis> option determines
-      what should be cloned. You can create a clone of the
-      <emphasis role="bold">Current Machine State</emphasis> only or
-      <emphasis role="bold">Everything</emphasis>. When you select
-      <emphasis role="bold">Everything</emphasis>, the current machine
-      state and additionally all snapshots are cloned. If you started
-      from a snapshot which has additional children, you can also clone
-      the <emphasis role="bold">Current Machine State and All
-      Children</emphasis>. This creates a clone starting with this
-      snapshot and includes all child snapshots.
-    </para>
+      The <emphasis role="bold">Snapshots</emphasis> option specifies
+      whether to create a clone of the current machine state only or of
+      everything.
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Everything:</emphasis> Clones the
+          current machine state and all its snapshots.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Current Machine State and All
+          Children:</emphasis>. Clones a VM snapshot and all its child
+          snapshots.
+        </para>
+      </listitem>
+
+    </itemizedlist>
 
     <para>
@@ -2470 +2510 @@
       <listitem>
         <para>
-          <emphasis role="bold">MAC Address Policy:</emphasis> Select an
-          option for retaining network card MAC addresses when cloning
-          the VM.
-        </para>
-
-        <para>
-          For example, when you select <emphasis role="bold">Generate
-          New MAC Addresses For All Network Adapters</emphasis> every
-          network card is assigned a new MAC address during cloning.
-          This is the default setting, and is useful when both the
-          source VM and the cloned VM have to operate on the same
-          network. Other options enable you to retain existing MAC
-          addresses in the cloned VM.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Keep Disk Names:</emphasis> The names of
-          disk images are retained when cloning the VM.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Keep Hardware UUIDs:</emphasis> Hardware
-          UUIDs are retained when cloning the VM.
+          <emphasis role="bold">MAC Address Policy:</emphasis> Specifies
+          how to retain network card MAC addresses when cloning the VM.
+        </para>
+
+        <para>
+          For example, the <emphasis role="bold">Generate New MAC
+          Addresses For All Network Adapters</emphasis> value assigns a
+          new MAC address to each network card during cloning. This is
+          the default setting. This is the best option when both the
+          source VM and the cloned VM must operate on the same network.
+          Other values enable you to retain the existing MAC addresses
+          in the cloned VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Keep Disk Names:</emphasis> Retains the
+          disk image names when cloning the VM.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Keep Hardware UUIDs:</emphasis> Retains
+          the hardware universally unique identifiers (UUIDs) when
+          cloning the VM.
         </para>
       </listitem>
@@ -2503 +2543 @@
 
     <para>
-      The clone operation itself can be a lengthy operation depending on
-      the size and count of the attached disk images. Also keep in mind
-      that every snapshot has differencing disk images attached, which
-      need to be cloned as well.
-    </para>
-
-    <para>
-      The <emphasis role="bold">Clone</emphasis> menu item is disabled
-      while a machine is running.
-    </para>
-
-    <para>
-      To clone a VM from the command line, see
-      <xref linkend="vboxmanage-clonevm" />.
+      The duration of the clone operation depends on the size and number
+      of attached disk images. In addition, the clone operation saves
+      all the differencing disk images of a snapshot.
+    </para>
+
+    <para>
+      Note that the <emphasis role="bold">Clone</emphasis> menu item is
+      disabled while a machine is running.
+    </para>
+
+    <para>
+      You can also use the <command>VBoxManage clonevm</command> command
+      to clone a VM. See <xref linkend="vboxmanage-clonevm" />.
     </para>
 
@@ -2568 +2607 @@
         configuration settings that can be distributed easily. This way
         one can offer complete ready-to-use software packages, including
-        operating systems with applications, that need no configuration
-        or installation except for importing into &product-name;.
+        OSes with applications, that need no configuration or
+        installation except for importing into &product-name;.
       </para>
 
@@ -2632 +2671 @@
 
       <para>
-        To import an appliance in OVF format, use the following steps.
+        The following steps show how to import an appliance in OVF
+        format.
       </para>
 
@@ -2644 +2684 @@
           <para>
             &product-name; creates file type associations automatically
-            for any OVF and OVA files on your host operating system.
+            for any OVF and OVA files on your host OS.
           </para>
         </listitem>
@@ -2651 +2691 @@
           <para>
             Select <emphasis role="bold">File</emphasis>,
-            <emphasis role="bold">Import Appliance</emphasis> in the
-            VirtualBox Manager window. In the displayed file dialog,
-            navigate to the file with either the
+            <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.
@@ -2659 +2703 @@
 
           <para>
-            Click <emphasis role="bold">Import</emphasis>. The
-            <emphasis role="bold">Appliance Settings</emphasis> screen
-            is shown.
+            Click <emphasis role="bold">Import</emphasis> to open the
+            <emphasis role="bold">Appliance Settings</emphasis> screen.
           </para>
 
@@ -2675 +2718 @@
 
           <para>
-            This screen shows the virtual machines described in the OVF
-            or OVA file and enables you to change the virtual machine
-            settings.
+            This screen shows the VMs described in the OVF or OVA file
+            and enables you to change the VM settings.
           </para>
 
@@ -2683 +2725 @@
             By default, membership of VM groups is preserved on import
             for VMs that were initially exported from &product-name;.
-            This can be changed using the <emphasis role="bold">Primary
-            Group</emphasis> setting for the VM.
-          </para>
-
-          <para>
-            The following global settings apply for all of the VMs that
-            you are importing:
+            You can change this behavior by using the
+            <emphasis
+            role="bold">Primary Group</emphasis>
+            setting for the VM.
+          </para>
+
+          <para>
+            The following global settings apply to all of the VMs that
+            you import:
           </para>
 
@@ -2696 +2740 @@
             <listitem>
               <para>
-                <emphasis role="bold">Base Folder:</emphasis> The
-                directory on the host where the imported VMs are stored.
+                <emphasis role="bold">Base Folder:</emphasis> Specifies
+                the directory on the host in which to store the imported
+                VMs.
               </para>
 
               <para>
-                If there are multiple VMs in an appliance, you can
-                specify a different directory for each VM by editing the
+                If an appliance has multiple VMs, you can specify a
+                different directory for each VM by editing the
                 <emphasis role="bold">Base Folder</emphasis> setting for
                 the VM.
@@ -2710 +2755 @@
             <listitem>
               <para>
-                <emphasis role="bold">MAC Address Policy</emphasis>: By
-                default, MAC addresses of network cards on your VMs are
-                reinitialized before import. You can choose to preserve
-                MAC addresses on import.
+                <emphasis role="bold">MAC Address Policy:</emphasis>
+                Reinitializes the MAC addresses of network cards in your
+                VMs prior to import, by default. You can override the
+                default behavior and preserve the MAC addresses on
+                import.
               </para>
             </listitem>
@@ -2720 +2766 @@
               <para>
                 <emphasis role="bold">Import Hard Drives as
-                VDI:</emphasis> By default, hard drives are imported in
-                VMDK format. This option enables import in VDI format.
+                VDI:</emphasis> Imports hard drives in the VDI format
+                rather that in the defalut VMDK format.
               </para>
             </listitem>
@@ -2735 +2781 @@
 
           <para>
-            &product-name; copies the disk images and creates local
-            virtual machines with the settings described in the
+            &product-name; copies the disk images and creates local VMs
+            with the settings described on the
             <emphasis role="bold">Appliance Settings</emphasis> screen.
-            The imported VMs are shown in the list of virtual machines
-            in VirtualBox Manager.
-          </para>
-
-          <para>
-            Note that since disk images tend to be big, and VMDK images
-            that come with virtual appliances are typically shipped in a
-            special compressed format that is unsuitable for being used
-            by virtual machines directly, the images are unpacked and
-            copied first, which can take a few minutes.
+            The imported VMs are shown in the list of VMs in VirtualBox
+            Manager.
+          </para>
+
+          <para>
+            Because disk images are large, the VMDK images that are
+            included with virtual appliances are shipped in a compressed
+            format that cannot be used directly by VMs. So, the images
+            are first unpacked and copied, which might take several
+            minutes.
           </para>
         </listitem>
@@ -2754 +2800 @@
 
       <para>
-        To import an appliance using the command line, see
-        <xref linkend="vboxmanage-import" />.
+        You can use the <command>VBoxManage import</command> command to
+        import an appliance. See <xref linkend="vboxmanage-import" />.
       </para>
 
@@ -2765 +2811 @@
 
       <para>
-        To export an appliance in OVF format, use the following steps.
+        The following steps show how to export an appliance in OVF
+        format.
       </para>
 
@@ -2773 +2820 @@
           <para>
             Select <emphasis role="bold">File</emphasis>,
-            <emphasis role="bold"> Export Appliance</emphasis>.
-          </para>
-
-          <para>
-            The <emphasis role="bold">Export Virtual
-            Appliance</emphasis> wizard is shown. The initial window
-            enables you to combine several virtual machines into an OVF
-            appliance.
-          </para>
-
-          <para>
-            Select one or more VMs to export and click
+            <emphasis role="bold"> Export Appliance</emphasis> to open
+            the <emphasis role="bold">Export Virtual
+            Appliance</emphasis> wizard.
+          </para>
+
+          <para>
+            From the initial window, you can combine several VMs into an
+            OVF appliance.
+          </para>
+
+          <para>
+            Select one or more VMs to export, and click
             <emphasis role="bold">Next</emphasis>.
           </para>
@@ -2792 +2839 @@
           <para>
             The <emphasis role="bold">Appliance Settings</emphasis>
-            screen is shown, where you can choose the following
-            settings:
+            screen enables you to select the following settings:
           </para>
 
@@ -2800 +2846 @@
             <listitem>
               <para>
-                <emphasis role="bold">Format:</emphasis> Select an
+                <emphasis role="bold">Format:</emphasis> Selects the
                 <emphasis role="bold">Open Virtualization
-                Format</emphasis> option for the output files.
+                Format</emphasis> value for the output files.
               </para>
 
               <para>
-                The <emphasis role="bold">&oci;</emphasis> option is
-                used for export to &oci;. See
-                <xref linkend="ovf-export-oci"/>.
+                The <emphasis role="bold">&oci;</emphasis> value exports
+                export to &oci;. See <xref linkend="ovf-export-oci"/>.
               </para>
             </listitem>
@@ -2814 +2859 @@
             <listitem>
               <para>
-                <emphasis role="bold">File:</emphasis> Select the
-                location where the exported files are to be stored.
+                <emphasis role="bold">File:</emphasis> Selects the
+                location in which to store the exported files.
               </para>
             </listitem>
@@ -2822 +2867 @@
               <para>
                 <emphasis role="bold">MAC Address Policy:</emphasis>
-                Select an option for retaining network card MAC
+                Specifies whether to retain or reassign network card MAC
                 addresses on export.
               </para>
@@ -2848 +2893 @@
         <listitem>
           <para>
-            Click <emphasis role="bold">Next</emphasis> to display the
+            Click <emphasis role="bold">Next</emphasis> to show the
             <emphasis role="bold">Virtual System Settings</emphasis>
             screen.
@@ -2855 +2900 @@
           <para>
             You can edit settings for the virtual appliance. For
-            example, you can change the name and add product information
-            such as vendor details or license text.
-          </para>
-
-          <para>
-            To change a setting, double-click on the required field.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Click <emphasis role="bold">Export</emphasis> and the export
-            process begins. Note that this can take a while.
+            example, you can change the name of the virtual appliance or
+            add product information, such as vendor details or license
+            text.
+          </para>
+
+          <para>
+            Double-click the appropriate field to change its value.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Click <emphasis role="bold">Export</emphasis> to begin the
+            export process. Note that this operation might take several
+            minutes.
           </para>
         </listitem>
@@ -2874 +2921 @@
 
       <para>
-        To export an appliance using the command line, see
-        <xref linkend="vboxmanage-export" />.
+        You can use the <command>VBoxManage export</command> command to
+        export an appliance. See <xref linkend="vboxmanage-export" />.
       </para>
 
     </sect2>
 
-<!-- New content for 6.0 -->
-
     <sect2 id="ovf-export-oci">
 
@@ -2891 +2936 @@
 
       <para>
-        Before you export a VM to &oci;, you need to do the following:
+        Before you can export a VM to &oci;, ensure that you perform the
+        following configuration steps:
       </para>
 
@@ -2898 +2944 @@
         <listitem>
           <para>
-            Generate an API signing key pair. This is used for API
+            Generate an API signing key pair that is used for API
             requests to &oci;.
           </para>
@@ -2916 +2962 @@
             <listitem>
               <para>
-                The public key of the key pair must be uploaded to the
-                cloud service.
+                Upload the public key of the key pair to the cloud
+                service.
               </para>
             </listitem>
@@ -2924 +2970 @@
 
           <para>
-            Instructions for creating and uploading an API signing key
-            for &oci; are at:
+            For step-by-step instructions for creating and uploading an
+            API signing key for &oci;, see:
           </para>
 
@@ -2949 +2995 @@
             <listitem>
               <para>
-                Automatically, using the <emphasis role="bold">Cloud
+                Automatically by using the <emphasis role="bold">Cloud
                 Profile Manager</emphasis>. See
                 <xref linkend="ovf-cloud-profile-manager"/>.
@@ -2957 +3003 @@
             <listitem>
               <para>
-                Manually, by creating an
+                Manually by creating an
                 <computeroutput>oci_config</computeroutput> file in your
                 &product-name; global configuration directory. For
@@ -2968 +3014 @@
             <listitem>
               <para>
-                Manually, by creating a
+                Manually by creating a
                 <computeroutput>config</computeroutput> file in your
                 &oci; configuration directory. For example, this is
@@ -2976 +3022 @@
 
               <para>
-                This is the same file that is used by the &oci; Command
-                Line Interface.
+                This is the same file that is used by the &oci; command
+                line interface.
               </para>
 
               <para>
-                &product-name; uses this file automatically if a cloud
-                profile file is not present in your global configuration
+                &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.
@@ -2991 +3038 @@
 
           <para>
-            For information on cloud profile settings used by &oci; see
-            the following:
+            For more information about the cloud profile settings used
+            by &oci; see:
           </para>
 
@@ -3002 +3049 @@
         <listitem>
           <para>
-            Ensure that the subnet used by source VMs are available in
-            the target compartment on the cloud service.
+            Ensure that the subnets that are used by source VMs are
+            available in the target compartment on the cloud service.
           </para>
         </listitem>
@@ -3010 +3057 @@
 
       <para>
-        To export a VM to &oci;, use the following steps.
+        Perform the following steps to export a VM to &oci;:
       </para>
 
@@ -3018 +3065 @@
           <para>
             Select <emphasis role="bold">File</emphasis>,
-            <emphasis role="bold"> Export Appliance</emphasis>.
-          </para>
-
-          <para>
-            The <emphasis role="bold">Export Virtual
-            Appliance</emphasis> wizard is shown.
+            <emphasis role="bold">Export Appliance</emphasis> to open
+            the <emphasis role="bold">Export Virtual
+            Appliance</emphasis> wizard.
           </para>
 
           <para>
             Select a VM to export and click
-            <emphasis role="bold">Next</emphasis>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            The <emphasis role="bold">Appliance Settings</emphasis>
-            screen is shown.
-          </para>
-
-          <para>
-            In the <emphasis role="bold">Format</emphasis> drop-down
+            <emphasis role="bold">Next</emphasis> to open the
+            <emphasis role="bold">Appliance Settings</emphasis> screen.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            From the <emphasis role="bold">Format</emphasis> drop-down
             list, select <emphasis role="bold">&oci;</emphasis>.
           </para>
@@ -3049 +3089 @@
 
           <para>
-            &oci; accounts can be set up using the Cloud Profile
+            You can set up &oci; accounts by using the Cloud Profile
             Manager.
           </para>
 
           <para>
-            The window below the
-            <emphasis role="bold">Account</emphasis> field displays the
-            profile settings for your cloud account.
+            The list after the <emphasis role="bold">Account</emphasis>
+            field shows the profile settings for your cloud account.
           </para>
 
@@ -3070 +3109 @@
 
           <para>
-            Click <emphasis role="bold">Next</emphasis>. &product-name;
-            makes an API request to the &oci; service.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            The <emphasis role="bold">Virtual System Settings</emphasis>
-            screen is shown.
-          </para>
-
-          <para>
-            You can edit settings used for the virtual machine on &oci;.
+            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.
@@ -3089 +3130 @@
           <para>
             Click <emphasis role="bold">Export</emphasis> to export the
-            virtual machines to the cloud service.
-          </para>
-        </listitem>
-
-        <listitem>
+            VMs to the cloud service.
+          </para>
+
           <para>
             The VMs are uploaded to &oci;.
@@ -3103 +3142 @@
 
           <para>
-            If the <emphasis role="bold">Launch Instance</emphasis>
-            setting was enabled on the <emphasis role="bold">Virtual
-            System Settings</emphasis> screen, the VM instance is
-            started.
-          </para>
-
-          <para>
-            You can monitor the export process using the &oci; Console.
+            By default, the VM instance is started after upload to
+            &oci;.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Monitor the export process by using the &oci; Console.
           </para>
         </listitem>
 
       </orderedlist>
+
+      <para>
+        You can also use the <command>VBoxManage export</command>
+        command to export a VM to &oci;. See
+        <xref linkend="vboxmanage-export-cloud"/>.
+      </para>
 
     </sect2>
@@ -3139 +3184 @@
 
       <para>
-        To display the Cloud Profile Manager select
+        To open the Cloud Profile Manager select
         <emphasis role="bold">File</emphasis>,
-        <emphasis role="bold">Cloud Profile Manager</emphasis> in the
+        <emphasis role="bold">Cloud Profile Manager</emphasis> from the
         VirtualBox Manager window.
       </para>
 
       <para>
-        You can use the Cloud Profile Manager to create a new cloud
-        profile automatically, or you can create a cloud profile by
-        importing settings from your &oci; configuration file into the
-        Cloud Profile Manager.
-      </para>
-
-      <para>
-        To create a new cloud profile, do the following:
+        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:
       </para>
 
@@ -3168 +3213 @@
         <listitem>
           <para>
-            Click <emphasis role="bold">Properties</emphasis> and enter
-            the following settings for the profile:
+            Click <emphasis role="bold">Properties</emphasis> and
+            specify the following property values for the profile:
           </para>
 
@@ -3220 +3265 @@
 
           <para>
-            Some of these are settings for your &oci; account. They can
-            be viewed using the &oci; Console.
+            Some of these are settings for your &oci; account, which you
+            can view from the &oci; Console.
           </para>
         </listitem>
@@ -3232 +3277 @@
 
           <para>
-            Settings for your cloud profile are added to the
+            The cloud profile settings are saved in the
             <computeroutput>oci_config</computeroutput> file in your
             &product-name; global settings directory.
@@ -3241 +3286 @@
 
       <para>
-        To import an existing &oci; configuration file, do the
-        following:
+        Perform the following steps to import an existing &oci;
+        configuration file:
       </para>
 
@@ -3259 +3304 @@
         <listitem>
           <para>
-            Click the <emphasis role="bold">Import</emphasis> icon.
-          </para>
-
-          <para>
-            A dialog prompting you to import cloud profiles from
-            external files is shown.
+            Click the <emphasis role="bold">Import</emphasis> icon to
+            open a dialog that prompts you to import cloud profiles from
+            external files.
           </para>
 
           <warning>
             <para>
-              The dialog warns you that any cloud profiles in your
-              &product-name; global settings directory will be
-              overwritten.
+              This action overwrites any cloud profiles that are in your
+              &product-name; global settings directory.
             </para>
           </warning>
@@ -3282 +3323 @@
 
           <para>
-            Settings for your cloud profile are added to the
+            Your cloud profile settings are saved to the
             <computeroutput>oci_config</computeroutput> file in your
             &product-name; global settings directory.
@@ -3290 +3331 @@
         <listitem>
           <para>
-            Click <emphasis role="bold">Properties</emphasis> to display
-            settings for the cloud profile.
-          </para>
-
-          <para>
-            To change a setting, double-click on the required field.
+            Click <emphasis role="bold">Properties</emphasis> to show
+            the cloud profile settings.
+          </para>
+
+          <para>
+            Double-click on the appropriate field to change the value.
           </para>
         </listitem>
@@ -3344 +3385 @@
           <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
-          operating system windows, see
-          <xref linkend="keyb_mouse_normal"/>, and which is also used to
-          trigger certain VM actions, see
+          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
           <xref linkend="specialcharacters"/>.
         </para>

trunk/doc/manual/en_US/user_Networking.xml

@@ -287 +287 @@
 
     <para>
-      <xref linkend="table-networking-modes"/> provides a quick overview
-      of the most important networking modes.
-    </para>
-
-    <table id="table-networking-modes">
+      The following table provides an overview of the most important
+      networking modes.
+    </para>
+
+    <table id="table-networking-modes" tabstyle="oracle-all">
       <title>Overview of Networking Modes</title>
       <tgroup cols="6">
@@ -302 +302 @@
         <thead valign="middle">
           <row>
-            <entry></entry>
+            <entry><emphasis role="bold">Mode</emphasis></entry>
             <entry><para>
                 <emphasis role="bold">VM&rarr;Host</emphasis>
@@ -1470 +1470 @@
     </para>
 
-    <orderedlist>
+    <itemizedlist>
 
       <listitem>
@@ -1496 +1496 @@
       <listitem>
         <para>
-          Perform a full, detailed analysis of network traffic on the
+          Perform a full detailed analysis of network traffic on the
           VM's network adaptor using a third party tool such as
           Wireshark. To do this, a promiscuous mode policy needs to be
@@ -1545 +1545 @@
       </listitem>
 
-    </orderedlist>
+    </itemizedlist>
 
   </sect1>

trunk/doc/manual/en_US/user_Preface.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
 [
@@ -11 +11 @@
 
   <para>
-    The <emphasis>&product-name;</emphasis> User Manual provides an
+    The <emphasis>&product-name; User Manual</emphasis> provides an
     introduction to using &product-name;. The manual provides
     information on how to install &product-name; and use it to create
@@ -101 +101 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/oracle-legal-notices/oracle-support-en.xml"
+    href="../common/oracle-support-en.xml"
     xpointer="xpointer(simplesect/title/following-sibling::node())" />
 

trunk/doc/manual/en_US/user_Security.xml

@@ -516 +516 @@
 
   <sect1 id="security-recommendations">
+
     <title>Security Recommendations</title>
 
-    <para>This section contains security recommendations for specific issues.
-    By default VirtualBox will configure the VMs to run in a secure manner,
-    however this may not always be possible without additional user actions (e.g.
-    host OS / firmware configuration changes).</para>
+    <para>
+      This section contains security recommendations for specific
+      issues. By default VirtualBox will configure the VMs to run in a
+      secure manner, however this may not always be possible without
+      additional user actions (e.g. host OS / firmware configuration
+      changes).
+    </para>
 
     <sect2 id="sec-rec-cve-2018-3646">
+
       <title>CVE-2018-3646</title>
 
-      <para>This security issue affect a range of Intel CPUs with nested paging.
-      AMD CPUs are expected not to be impacted (pending direct confirmation by AMD).
-      Also the issue does not affect VMs running with hardware virtualization
-      disabled or with nested paging disabled.</para>
-
-      <para>For more information about nested paging, see <xref linkend="nestedpaging" />.</para>
-
-      <para>Mitigation options:</para>
+      <para>
+        This security issue affect a range of Intel CPUs with nested
+        paging. AMD CPUs are expected not to be impacted (pending direct
+        confirmation by AMD). Also the issue does not affect VMs running
+        with hardware virtualization disabled or with nested paging
+        disabled.
+      </para>
+
+      <para>
+        For more information about nested paging, see
+        <xref linkend="nestedpaging" />.
+      </para>
+
+      <para>
+        Mitigation options:
+      </para>
 
       <sect3>
+
         <title>Disable nested paging</title>
 
-        <para>By disabling nested paging (EPT), the VMM will construct page tables
-        shadowing the ones in the guest.  It is no possible for the guest to insert
-        anything fishy into the page tables, since the VMM carefully validates each
-        entry before shadowing it.</para>
-
-        <para>As a side effect of disabling nested paging, several CPU features
-        will not be made available to the guest.  Among these features are AVX,
-        AVX2, XSAVE, AESNI, and POPCNT.  Not all 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 disabling nested paging.  Finally, some workloads may experience a
-        performance degradation.</para>
+        <para>
+          By disabling nested paging (EPT), the VMM will construct page
+          tables shadowing the ones in the guest. It is no possible for
+          the guest to insert anything fishy into the page tables, since
+          the VMM carefully validates each entry before shadowing it.
+        </para>
+
+        <para>
+          As a side effect of disabling nested paging, several CPU
+          features will not be made available to the guest. Among these
+          features are AVX, AVX2, XSAVE, AESNI, and POPCNT. Not all
+          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
+          disabling nested paging. Finally, some workloads may
+          experience a performance degradation.
+        </para>
+
       </sect3>
 
       <sect3>
+
         <title>Flushing the level 1 data cache</title>
 
-        <para>This aims at removing potentially sensitive data from the level 1
-        data cache when running guest code.  However, it is made difficult by
-        hyper-threading setups sharing the level 1 cache and thereby potentially
-        letting the other thread in a pair refill the cache with data the user
-        does not want the guest to see.  In addition, flushing the level 1 data
-        cache is usually not without performance side effects.</para>
-
-        <para>Up to date CPU microcode is a prerequisite for the cache flushing
-        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>We recommend disabling hyper threading on the host.  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 flush the level 1
-        data cache 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>--l1d-flush-on-vm-entry</computeroutput>.
-        When enabled the level 1 data cache will be flushed 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 --l1d-flush-on-sched off</computeroutput></para>
+        <para>
+          This aims at removing potentially sensitive data from the
+          level 1 data cache when running guest code. However, it is
+          made difficult by hyper-threading setups sharing the level 1
+          cache and thereby potentially letting the other thread in a
+          pair refill the cache with data the user does not want the
+          guest to see. In addition, flushing the level 1 data cache is
+          usually not without performance side effects.
+        </para>
+
+        <para>
+          Up to date CPU microcode is a prerequisite for the cache
+          flushing 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>
+          We recommend disabling hyper threading on the host. 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 flush the level 1
+          data cache 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>--l1d-flush-on-vm-entry</computeroutput>. When
+          enabled the level 1 data cache will be flushed 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 --l1d-flush-on-sched
+          off</computeroutput>
+        </para>
+
       </sect3>
 

trunk/doc/manual/en_US/user_Storage.xml

@@ -90 +90 @@
 
         <para>
-          Even if your guest operating system has no support for SCSI or
-          SATA devices, it should always be able to see an IDE
-          controller.
+          Even if your guest OS has no support for SCSI or SATA devices,
+          it should always be able to see an IDE controller.
         </para>
 
@@ -100 +99 @@
           PIIX3, PIIX4, or ICH6. This makes no difference in terms of
           performance, but if you import a virtual machine from another
-          virtualization product, the operating system in that machine
-          may expect a particular controller type and crash if it is not
-          found.
+          virtualization product, the OS in that machine may expect a
+          particular controller type and crash if it is not found.
         </para>
 
@@ -136 +134 @@
 
         <para>
-          For this reason, depending on the selected guest operating
-          system, &product-name; uses SATA as the default for newly
-          created virtual machines. One virtual SATA controller is
-          created by default, and the default disk that is created with
-          a new VM is attached to this controller.
+          For this reason, depending on the selected guest OS,
+          &product-name; uses SATA as the default for newly created
+          virtual machines. One virtual SATA controller is created by
+          default, and the default disk that is created with a new VM is
+          attached to this controller.
         </para>
 
@@ -147 +145 @@
             The entire SATA controller and the virtual disks attached to
             it, including those in IDE compatibility mode, will not be
-            seen by operating systems that do not have device support
-            for AHCI. In particular, <emphasis>there is no support for
-            AHCI in Windows before Windows Vista</emphasis>. So Windows
-            XP, even SP3, will not see such disks unless you install
-            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
+            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
             <emphasis role="bold">Settings</emphasis> dialog.
           </para>
@@ -169 +167 @@
           been enabled by default, either because it was created by an
           earlier version of &product-name;, or because SATA is not
-          supported by default by the selected guest operating system,
-          do the following. Go to the
-          <emphasis role="bold">Storage</emphasis> page of the machine's
+          supported by default by the selected guest OS, do the
+          following. Go to the <emphasis role="bold">Storage</emphasis>
+          page of the machine's
           <emphasis role="bold">Settings</emphasis> dialog, click
           <emphasis role="bold">Add Controller</emphasis> under the
@@ -218 +216 @@
           <para>
             As with the other controller types, a SCSI controller will
-            only be seen by operating systems with device support for
-            it. Windows 2003 and later ships with drivers for the LSI
-            Logic controller, while Windows NT 4.0 and Windows 2000
-            ships with drivers for the BusLogic controller. Windows XP
-            ships with drivers for neither.
+            only be seen by OSes with device support for it. Windows
+            2003 and later ships with drivers for the LSI Logic
+            controller, while Windows NT 4.0 and Windows 2000 ships with
+            drivers for the BusLogic controller. Windows XP ships with
+            drivers for neither.
           </para>
         </warning>
@@ -248 +246 @@
         <warning>
           <para>
-            As with SATA, the SAS controller will only be seen by
-            operating systems with device support for it. In particular,
-            <emphasis>there is no support for SAS in Windows before
-            Windows Vista</emphasis>. So Windows XP, even SP3, will not
-            see such disks unless you install additional drivers.
+            As with SATA, the SAS controller will only be seen by OSes
+            with device support for it. In particular, <emphasis>there
+            is no support for SAS in Windows before Windows
+            Vista</emphasis>. So Windows XP, even SP3, will not see such
+            disks unless you install additional drivers.
           </para>
         </warning>
@@ -262 +260 @@
           class</emphasis> is a standard to connect external storage
           devices like hard disks or flash drives to a host through USB.
-          All major operating systems support these devices for a long
-          time and ship generic drivers making third-party drivers
-          superfluous. In particular, legacy operating systems without
-          support for SATA controllers may benefit from USB mass storage
-          devices.
+          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.
         </para>
 
@@ -290 +287 @@
         <para>
           <emphasis role="bold">Non volatile memory express
-          (NVMe)</emphasis> is a very recent standard which emerged in
-          2011 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 compatible with ATA or SCSI. Operating systems need to
-          support NVMe devices to make use of them. For example, Windows
-          8.1 added native NVMe support. For Windows 7, native support
-          was added with an update.
+          (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
+          compatible with ATA or SCSI. OSes need to support NVMe devices
+          to make use of them. For example, Windows 8.1 added native
+          NVMe support. For Windows 7, native support was added with an
+          update.
         </para>
 
@@ -333 +330 @@
         <para>
           30 slots attached to the SATA controller, if enabled and
-          supported by the guest operating system.
+          supported by the guest OS.
         </para>
       </listitem>
@@ -340 +337 @@
         <para>
           15 slots attached to the SCSI controller, if enabled and
-          supported by the guest operating system.
+          supported by the guest OS.
         </para>
       </listitem>
@@ -347 +344 @@
         <para>
           Eight slots attached to the SAS controller, if enabled and
-          supported by the guest operating system.
+          supported by the guest OS.
         </para>
       </listitem>
@@ -354 +351 @@
         <para>
           Eight slots attached to the virtual USB controller, if enabled
-          and supported by the guest operating system.
+          and supported by the guest OS.
         </para>
       </listitem>
@@ -361 +358 @@
         <para>
           Up to 255 slots attached to the NVMe controller, if enabled
-          and supported by the guest operating system.
+          and supported by the guest OS.
         </para>
       </listitem>
@@ -384 +381 @@
     <para>
       Disk image files reside on the host system and are seen by the
-      guest systems as hard disks of a certain geometry. When a guest
-      operating system reads from or writes to a hard disk,
-      &product-name; redirects the request to the image file.
+      guest systems as hard disks of a certain geometry. When a guest OS
+      reads from or writes to a hard disk, &product-name; redirects the
+      request to the image file.
     </para>
 
@@ -581 +578 @@
       <listitem>
         <para>
-          <emphasis role="bold">Copy</emphasis> a virtual hard disk, to
-          create another one. The target type can be different.
-          Available options are: VDI, VHD, or VMDK.
+          <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>
@@ -590 +591 @@
         <para>
           <emphasis role="bold">Move</emphasis> an image that is
-          currently in the registry. A file dialog prompts you for the
-          new image file location.
-        </para>
-
-        <para>
-          When you move a disk image using the Virtual Media Manager,
-          any related &product-name; configuration files are updated
+          currently in the registry to another location.
+        </para>
+
+        <para>
+          A file dialog prompts you for the new image file location.
+        </para>
+
+        <para>
+          When you use the Virtual Media Manager to move a disk image,
+          &product-name; updates all related configuration files
           automatically.
         </para>
@@ -602 +606 @@
         <note>
           <para>
-            If possible, always use the Virtual Media Manager or the
+            Always use the Virtual Media Manager or the
             <command>VBoxManage modifymedium</command> command to move a
             disk image.
@@ -608 +612 @@
 
           <para>
-            If you move a disk image to a new location by using a file
-            management feature of the host operating system, use the
-            <computeroutput>--setlocation</computeroutput> option of the
-            <command>VBoxManage modifymedium</command> command to
-            configure the new path of the disk image on the host file
-            system. This updates the &product-name; configuration
-            automatically.
+            If you use a file management feature of the host OS to move
+            a disk image to a new location, run the <command>VBoxManage
+            modifymedium</command> <option>--setlocation</option>
+            command to configure the new path of the disk image on the
+            host file system. This command updates the &product-name;
+            configuration automatically.
           </para>
         </note>
@@ -622 +625 @@
         <para>
           <emphasis role="bold">Remove</emphasis> an image from the
-          registry. You can optionally delete the image file when doing
-          so.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Release</emphasis> an image. Detach it
-          from a virtual machine, if it is currently attached to one as
-          a virtual hard disk.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Display and edit the
-          <emphasis role="bold">Properties</emphasis> of a disk image.
+          registry. You can optionally delete the image file when
+          removing the image.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <emphasis role="bold">Release</emphasis> an image to detach it
+          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>
+          View and edit the <emphasis role="bold">Properties</emphasis>
+          of a disk image.
         </para>
 
@@ -649 +652 @@
           <listitem>
             <para>
-              <emphasis role="bold">Type:</emphasis> Defines the
+              <emphasis role="bold">Type:</emphasis> Specifies the
               snapshot behavior of the disk. See
               <xref linkend="hdimagewrites"/>.
@@ -657 +660 @@
           <listitem>
             <para>
-              <emphasis role="bold">Location:</emphasis> The location of
-              the disk image file on the host system. A file dialog
-              selector is available.
+              <emphasis role="bold">Location:</emphasis> Specifies the
+              location of the disk image file on the host system. You
+              can use a file dialog to browse for the disk image
+              location.
             </para>
           </listitem>
@@ -665 +669 @@
           <listitem>
             <para>
-              <emphasis role="bold">Description:</emphasis> A short
-              description of the disk image.
+              <emphasis role="bold">Description:</emphasis> Specifies a
+              short description of the disk image.
             </para>
           </listitem>
@@ -672 +676 @@
           <listitem>
             <para>
-              <emphasis role="bold">Size:</emphasis> The size of the
-              disk image. Use the slider to increase or decrease the
-              disk image size.
+              <emphasis role="bold">Size:</emphasis> Specifies the size
+              of the disk image. You can use the slider to increase or
+              decrease the disk image size.
             </para>
           </listitem>
@@ -680 +684 @@
           <listitem>
             <para>
-              <emphasis role="bold">Information:</emphasis> Further
-              details about the disk image can be added on the
-              <emphasis role="bold">Information</emphasis> tab.
+              <emphasis role="bold">Information:</emphasis> Specifies
+              detailed information about the disk image.
             </para>
           </listitem>
@@ -691 +694 @@
       <listitem>
         <para>
-          <emphasis role="bold">Refresh</emphasis> the values for the
-          displayed attributes of the currently-selected disk image.
+          <emphasis role="bold">Refresh</emphasis> the property values
+          of the selected disk image.
         </para>
       </listitem>
@@ -700 +703 @@
     <para>
       To perform these actions, highlight the medium in the Virtual
-      Media Manager. Then do either of the following:
+      Media Manager and then do one of the following:
     </para>
 
@@ -720 +723 @@
 
     <para>
-      To create a new disk image, you use the
-      <emphasis role="bold">Storage</emphasis> page in a virtual
-      machine's <emphasis role="bold">Settings</emphasis> dialog. This
-      is because disk images are by default stored in each machine's own
-      folder.
-    </para>
-
-    <para>
-      Hard disk image files can be copied to other host systems and
-      imported into virtual machines there. However, certain guest
-      operating systems, such as Windows 2000 and Windows XP, require
-      that the new virtual machine be set up in a similar way to the old
-      one.
+      Use the <emphasis role="bold">Storage</emphasis> page in a VM's
+      <emphasis role="bold">Settings</emphasis> dialog to create a new
+      disk image. By default, disk images are stored in the VM's folder.
+    </para>
+
+    <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.
     </para>
 
@@ -738 +738 @@
       <para>
         Do not simply make copies of virtual disk images. If you import
-        such a second copy into a virtual machine, &product-name; will
-        complain with an error, since &product-name; assigns a unique
-        identifier (UUID) to each disk image to make sure it is only
-        used once. See <xref linkend="cloningvdis" />. Also, if you want
-        to copy a virtual machine to another system, &product-name; has
-        import and export features that might be better suited for your
-        needs. See <xref linkend="ovf" />.
+        such a second copy into a VM, &product-name; issues an error
+        because &product-name; assigns a universally unique identifier
+        (UUID) to each disk image to ensure that it is only used one
+        time. See <xref linkend="cloningvdis" />. Also, if you want to
+        copy a VM to another system, use the &product-name; import and
+        export features. See <xref linkend="ovf" />.
       </para>
     </note>
@@ -954 +953 @@
 
     <para>
-      Assume you have installed your guest operating system in your VM,
-      and you have taken a snapshot. Later, your VM is infected with a
-      virus and you would like to go back to the snapshot. With a normal
-      hard disk image, you simply restore the snapshot, and the earlier
-      state of your hard disk image will be restored as well and your
-      virus infection will be undone. With an immutable hard disk, all
-      it takes is to shut down and power on your VM, and the virus
+      Assume you have installed your guest OS in your VM, and you have
+      taken a snapshot. Later, your VM is infected with a virus and you
+      would like to go back to the snapshot. With a normal hard disk
+      image, you simply restore the snapshot, and the earlier state of
+      your hard disk image will be restored as well and your virus
+      infection will be undone. With an immutable hard disk, all it
+      takes is to shut down and power on your VM, and the virus
       infection will be discarded. With a write-through image however,
       you cannot easily undo the virus infection by means of
@@ -971 +970 @@
       critical data irrespective of snapshots. As you can attach more
       than one image to a VM, you may want to have one immutable image
-      for the operating system and one write-through image for your data
-      files.
+      for the OS and one write-through image for your data files.
     </para>
 
@@ -1086 +1084 @@
         </para>
 
-        <orderedlist>
+        <itemizedlist>
 
           <listitem>
@@ -1121 +1119 @@
           </listitem>
 
-        </orderedlist>
+        </itemizedlist>
 
         <para>
@@ -1163 +1161 @@
     <para>
       You can duplicate hard disk image files on the same host to
-      quickly produce a second virtual machine with the same operating
-      system setup. However, you should <emphasis>only</emphasis> make
-      copies of virtual disk images using the utility supplied with
+      quickly produce a second virtual machine with the same OS setup.
+      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 unique identity number (UUID)
-      to each disk image, which is also stored inside the image, and
-      &product-name; will refuse to work with two images that use the
-      same number. If you do accidentally try to reimport a disk image
-      which you copied normally, you can make a second copy using
-      &product-name;'s utility and import that instead.
+      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
+      clonevm</command> command and import that instead.
     </para>
 
@@ -1184 +1182 @@
       loader script, for example
       <computeroutput>/boot/grub/menu.lst</computeroutput>. The disk ID
-      looks like this:
+      looks like the following:
     </para>
 
@@ -1190 +1188 @@
 
     <para>
-      The ID for the copied image can be determined with:
+      The ID for the copied image can be determined as follows:
     </para>
 
@@ -1203 +1201 @@
     <para>
       &product-name; can optionally disable the I/O caching that the
-      host operating system would otherwise perform on disk image files.
+      host OS would otherwise perform on disk image files.
     </para>
 
     <para>
       Traditionally, &product-name; has opened disk image files as
-      normal files, which results in them being cached by the host
-      operating system like any other file. The main advantage of this
-      is speed: when the guest OS writes to disk and the host OS cache
-      uses delayed writing, the write operation can be reported as
-      completed to the guest OS quickly while the host OS can perform
-      the operation asynchronously. Also, when you start a VM a second
-      time and have enough memory available for the OS to use for
-      caching, large parts of the virtual disk may be in system memory,
-      and the VM can access the data much faster.
+      normal files, which results in them being cached by the host OS
+      like any other file. The main advantage of this is speed: when the
+      guest OS writes to disk and the host OS cache uses delayed
+      writing, the write operation can be reported as completed to the
+      guest OS quickly while the host OS can perform the operation
+      asynchronously. Also, when you start a VM a second time and have
+      enough memory available for the OS to use for caching, large parts
+      of the virtual disk may be in system memory, and the VM can access
+      the data much faster.
     </para>
 
@@ -1260 +1258 @@
       <listitem>
         <para>
-          Physical memory is often wasted as guest operating systems
-          typically have their own I/O caches, which may result in the
-          data being cached twice, in both the guest and the host
-          caches, for little effect.
+          Physical memory is often wasted as guest OSes typically have
+          their own I/O caches, which may result in the data being
+          cached twice, in both the guest and the host caches, for
+          little effect.
         </para>
       </listitem>
@@ -1274 +1272 @@
       read caching since this is typically already performed by the
       guest OS. In addition, &product-name; fully supports asynchronous
-      I/O for its virtual SATA, SCSI and SAS controllers through
+      I/O for its virtual SATA, SCSI, and SAS controllers through
       multiple I/O threads.
     </para>
@@ -1389 +1387 @@
       Changing between the above, or changing a medium in the host drive
       that is accessed by a machine, or changing an image file will
-      signal a medium change to the guest operating system. The guest OS
-      can then react to the change, for example by starting an
-      installation program.
+      signal a medium change to the guest OS. The guest OS can then
+      react to the change, for example by starting an installation
+      program.
     </para>
 
@@ -1412 +1410 @@
         Manager, is always VBOX CD-ROM, irrespective of the current
         configuration of the virtual drive. This is to prevent hardware
-        detection from being triggered in the guest operating system
-        every time the configuration is changed.
+        detection from being triggered in the guest OS every time the
+        configuration is changed.
       </para>
     </note>
@@ -1490 +1488 @@
     <para>
       &product-name; can transparently present iSCSI remote storage to a
-      virtual machine as a virtual hard disk. The guest operating system
-      will not see any difference between a virtual disk image (VDI
-      file) and an iSCSI target. To achieve this, &product-name; has an
-      integrated iSCSI initiator.
+      virtual machine as a virtual hard disk. The guest OS will not see
+      any difference between a virtual disk image (VDI file) and an
+      iSCSI target. To achieve this, &product-name; has an integrated
+      iSCSI initiator.
     </para>
 
@@ -1505 +1503 @@
   </sect1>
 
+  <sect1 id="vboximg-mount">
+
+    <title>vboximg-mount: A Utility for FUSE Mounting a Virtual Disk Image</title>
+
+    <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.
+    </para>
+
+    <para>
+      The utility is based on Filesystem in Userspace (FUSE) technology
+      and uses the VirtualBox runtime engine. Ensure that &product-name;
+      is running on the host system.
+    </para>
+
+    <note>
+      <para>
+        When using <command>vboximg-mount</command>, ensure that the
+        following conditions apply:
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            The disk image is not being used by any other systems, such
+            as by guest VMs.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            No VMs are running on the host system.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+    </note>
+
+    <para>
+      Raw access using FUSE is preferred over direct loopback mounting
+      of virtual disk images, because it is snapshot aware. It can
+      selectively merge disk differencing images in an exposed virtual
+      hard disk, providing historical or up-to-date representations of
+      the virtual disk contents.
+    </para>
+
+    <para>
+      <command>vboximg-mount</command> enables you to view information
+      about registered VMs, their attached disk media, and any
+      snapshots. Also, you can view partition information for a disk
+      image.
+    </para>
+
+    <para>
+      Use the <option>--help</option> option to view information about
+      the <command>vboximg-mount</command> command usage.
+    </para>
+
+    <para>
+      When <command>vboximg-mount</command> mounts an &product-name;
+      disk image, it creates a one level deep file system at a mount
+      point that you specify. The file system includes a device node
+      that represents the synthesized disk image as a readable or
+      readable-writeable bytestream. This bytestream can be mounted
+      either by using the host OS or by using other FUSE-based file
+      systems.
+    </para>
+
+    <sect2 id="vboximg-mount-display">
+
+      <title>Viewing Detailed Information About a Virtual Disk Image</title>
+
+      <para>
+        The following examples show how to use the
+        <command>vboximg-mount</command> command to view information
+        about virtual disk images.
+      </para>
+
+      <para>
+        The following command outputs detailed information about all
+        registered VMs and associated snapshots:
+      </para>
+
+<screen>$ vboximg-mount --list --verbose
+
+    ------------------------------------------------------
+    VM Name:   "macOS High Sierra 10.13"
+    UUID:      3887d96d-831c-4187-a55a-567c504ff0e1
+    Location:  /Volumes/work/vm_guests/macOS High Sierra 10.13/macOS High Sierra 10.13.vbox
+       -----------------------
+       HDD base:   "macOS High Sierra 10.13.vdi"
+       UUID:       f9ea7173-6869-4aa9-b487-68023a655980
+       Location:   /Volumes/work/vm_guests/macOS High Sierra 10.13/macOS High Sierra 10.13.vdi
+
+         Diff 1:
+              UUID:       98c2bac9-cf37-443d-a935-4e879b70166d
+              Location:   /Volumes/work/vm_guests/macOS High Sierra 10.13/
+              Snapshots/{98c2bac9-cf37-443d-a935-4e879b70166d}.vdi
+         Diff 2:
+              UUID:       f401f381-7377-40b3-948e-3c61241b1a42
+              Location:   /Volumes/work/vm_guests/macOS High Sierra 10.13/
+              Snapshots/{f401f381-7377-40b3-948e-3c61241b1a42}.vdi
+       -----------------------
+       HDD base:   "simple_fixed_disk.vdi"
+       UUID:       ffba4d7e-1277-489d-8173-22ca7660773d
+       Location:   /Volumes/work/vm_guests/macOS High Sierra 10.13/simple_fixed_disk.vdi
+
+         Diff 1:
+              UUID:       aecab681-0d2d-468b-8682-93f79dc97a48
+              Location:   /Volumes/work/vm_guests/macOS High Sierra 10.13/
+              Snapshots/{aecab681-0d2d-468b-8682-93f79dc97a48}.vdi
+         Diff 2:
+              UUID:       70d6b34d-8422-47fa-8521-3b6929a1971c
+              Location:   /Volumes/work/vm_guests/macOS High Sierra 10.13/
+              Snapshots/{70d6b34d-8422-47fa-8521-3b6929a1971c}.vdi
+      ------------------------------------------------------
+      VM Name:   "debian"
+      UUID:      5365ab5f-470d-44c0-9863-dad532ee5905
+      Location:  /Volumes/work/vm_guests/debian/debian.vbox
+         -----------------------
+         HDD base:   "debian.vdi"
+         UUID:       96d2e92e-0d4e-46ab-a0f1-008fdbf997e7
+         Location:   /Volumes/work/vm_guests/debian/ol7.vdi
+
+            Diff 1:
+                UUID:       f9cc866a-9166-42e9-a503-bbfe9b7312e8
+                Location:   /Volumes/work/vm_guests/debian/Snapshots/
+                {f9cc866a-9166-42e9-a503-bbfe9b7312e8}.vdi</screen>
+
+      <para>
+        The following command outputs partition information about the
+        specified disk image:
+      </para>
+
+<screen>$ vboximg-mount --image=f9ea7173-6869-4aa9-b487-68023a655980 --list
+
+    Virtual disk image:
+
+       Path: /Volumes/work/vm_guests/macOS High Sierra 10.13/macOS High Sierra 10.13.vdi
+       UUID: f9ea7173-6869-4aa9-b487-68023a655980
+
+      #     Start  Sectors     Size       Offset  Type
+      1        40  409599    199.9M        20480  EFI System
+      2    409640  67453071   32.1G    209735680  Hierarchical File System Plus (HFS+)
+      3  67862712  1269535   107.8M  34745708544  Apple Boot (Recovery HD)</screen>
+
+    </sect2>
+
+    <sect2 id="vboximg-mount-steps">
+
+      <title>Mounting a Virtual Disk Image</title>
+
+      <para>
+        The following steps show how to use the
+        <command>vboximg-mount</command> command to mount a partition of
+        a virtual disk image on the host OS.
+      </para>
+
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Create a mount point on the host OS. For example:
+          </para>
+
+<screen>$ mkdir macOS_sysdisk</screen>
+        </listitem>
+
+        <listitem>
+          <para>
+            Show partition information about the virtual disk image.
+          </para>
+
+<screen>$ vboximg-mount --image=<replaceable>uuid</replaceable> --list</screen>
+
+          <para>
+            where <replaceable>uuid</replaceable> is the UUID of the
+            disk image.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Use <command>vboximg-mount</command> to perform a FUSE mount
+            of a partition on the virtual disk image. For example:
+          </para>
+
+<screen>$ vboximg-mount --image=<replaceable>uuid</replaceable> -p 2 macos_sysdisk</screen>
+
+          <para>
+            where <replaceable>uuid</replaceable> is the UUID for the
+            disk image.
+          </para>
+
+          <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.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Use the host OS to mount the
+            <computeroutput>vhdd</computeroutput> device node. The
+            FUSE-mounted device node represents the virtual disk image.
+          </para>
+
+<screen>$ ls macOS_sysdisk
+   macOS High Sierra 10.13.vdi  vhdd
+$ sudo mount macos_sysdisk/vhdd /mnt</screen>
+        </listitem>
+
+      </orderedlist>
+
+    </sect2>
+
+  </sect1>
+
 </chapter>

trunk/doc/manual/en_US/user_Technical.xml

@@ -317 +317 @@
 
       <para>
-        <xref linkend="table-version4-config-changes"/> gives a brief
-        overview of the configuration changes between legacy versions
-        and version 4.0 or later.
-      </para>
-
-      <table id="table-version4-config-changes">
+        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">
@@ -510 +509 @@
           application based on the cross-platform Qt library. When
           started without the <computeroutput>--startvm</computeroutput>
-          option, this application acts as the &product-name; manager,
+          option, this application acts as the VirtualBox Manager,
           displaying the VMs and their settings. It then communicates
           settings and state changes to
@@ -551 +550 @@
         <para>
           <computeroutput>VirtualBoxVM</computeroutput>: The Qt front
-          end implementing the manager and running VMs.
+          end implementing the VirtualBox Manager and running VMs.
         </para>
       </listitem>
@@ -1328 +1327 @@
           also use <emphasis>large pages</emphasis> to reduce TLB usage
           and overhead. This can yield a performance improvement of up
-          to 5%. To enable this feature for a VM, you need to use the
-          <computeroutput>VBoxManage modifyvm --largepages</computeroutput>
-          command. See <xref linkend="vboxmanage-modifyvm" />.
+          to 5%. To enable this feature for a VM, you use the
+          <computeroutput>VBoxManage modifyvm
+          --largepages</computeroutput> command. See
+          <xref linkend="vboxmanage-modifyvm" />.
         </para>
 
@@ -1349 +1349 @@
 
         <para>
-          To enable these features for a VM, you need to use the
+          To enable these features for a VM, you use the
           <computeroutput>VBoxManage modifyvm --vtxvpid</computeroutput>
           and <computeroutput>--largepages</computeroutput> commands.

trunk/doc/manual/en_US/user_ThirdParty.xml

@@ -550 +550 @@
       <listitem>
         <para>
-          &product-name; may contain portions of FUSE for macOS which is governed by
-          the licenses in
+          &product-name; may contain portions of FUSE for macOS which is
+          governed by the licenses in
           <xref linkend="licOsxFuse" xrefstyle="template: %n" /> and
           <xref linkend="licLGPL" xrefstyle="template: %n"/> and
@@ -557 +557 @@
 
         <para>
-          Copyright (c) 2011-2017 Benjamin Fleischer;
-          Copyright (c) 2011-2012 Erik Larsson
-          All rights reserved.
+          Copyright (c) 2011-2017 Benjamin Fleischer; Copyright (c)
+          2011-2012 Erik Larsson All rights reserved.
         </para>
       </listitem>
@@ -4786 +4785 @@
         <listitem>
           <para>
-            Neither the name of the copyright holder nor the names of its
-            contributors may be used to endorse or promote products derived
-            from this software without specific prior written permission.
+            Neither the name of the copyright holder nor the names of
+            its contributors may be used to endorse or promote products
+            derived from this software without specific prior written
+            permission.
           </para>
         </listitem>

trunk/doc/manual/en_US/user_Troubleshooting.xml

@@ -159 +159 @@
         Manager window can show these logs in a window. To access it,
         select a virtual machine from the list on the left and select
-        <emphasis role="bold">Show logs...</emphasis> from the
+        <emphasis role="bold">Show Log</emphasis> from the
         <emphasis role="bold">Machine</emphasis> menu.
       </para>
@@ -685 +685 @@
 
 <screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/piix3ide/0/LUN#[x]/Config/FlushInterval" [b]</screen>
+"VBoxInternal/Devices/piix3ide/0/LUN#[x]/Config/FlushInterval" [b]</screen>
 
       <para>
@@ -692 +692 @@
 
 <screen>VBoxManage setextradata "VM name"
-      "VBoxInternal/Devices/ahci/0/LUN#[x]/Config/FlushInterval" [b]</screen>
+"VBoxInternal/Devices/ahci/0/LUN#[x]/Config/FlushInterval" [b]</screen>
 
       <para>
@@ -1294 +1294 @@
           <para>
             Download and install the latest version of 7-Zip File
-            Manager. See
-            <ulink
-          url="http//www.7-zip.org">http//www.7-zip.org</ulink>.
+            Manager.
           </para>
         </listitem>
@@ -1345 +1343 @@
           <para>
             Download and install the latest version of 7-Zip File
-            Manager. See
-            <ulink
-              url="http//www.7-zip.org">http//www.7-zip.org</ulink>.
+            Manager.
           </para>
         </listitem>
@@ -1396 +1392 @@
           <para>
             Download and install the latest version of 7-Zip File
-            Manager. See
-            <ulink
-          url="http//www.7-zip.org">http//www.7-zip.org</ulink>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Browse into the installation CD. for example E:\sources.
+            Manager.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Browse into the installation CD. For example E:\sources.
           </para>
         </listitem>
@@ -1907 +1901 @@
       <para>
         If a host-only adapter cannot be created, either with the
-        VirtualBox Manager or the <command>VBoxManage</command>
-        command, then the INF cache is probably corrupt. In this case,
-        the install log
+        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

trunk/doc/manual/en_US/user_VBoxManage.xml

@@ -1003 +1003 @@
             enables or disables the use of the nested paging feature in
             the processor of your host system. See
-            <xref
-            linkend="hwvirt" /> and <xref linkend="sec-rec-cve-2018-3646" />.
+            <xref linkend="hwvirt" /> and
+            <xref linkend="sec-rec-cve-2018-3646" />.
           </para>
         </listitem>
@@ -1397 +1397 @@
             option. Use this option to specify which host-only
             networking interface the given virtual network interface
-            will use. See
-            <xref
-            linkend="network_hostonly" />.
+            will use. See <xref linkend="network_hostonly" />.
           </para>
         </listitem>
@@ -1410 +1408 @@
             the <computeroutput>--nic</computeroutput> option. Use this
             option to specify the name of the internal network. See
-            <xref
-            linkend="network_internal" />.
+            <xref linkend="network_internal" />.
           </para>
         </listitem>
@@ -1836 +1833 @@
             <computeroutput>--usb on|off</computeroutput>: Enables and
             disables the VM's virtual USB controller. See
-            <xref
-          linkend="settings-usb" />.
+            <xref linkend="settings-usb" />.
           </para>
         </listitem>
@@ -2022 +2018 @@
                 standard port for RDP. See the description for the
                 <computeroutput>--vrdeport</computeroutput> option in
-                <xref
-                linkend="vboxmanage-modifyvm-vrde" />.
+                <xref linkend="vboxmanage-modifyvm-vrde" />.
               </para>
             </listitem>
@@ -2035 +2030 @@
                 interface. See the description for the
                 <computeroutput>--vrdeaddress</computeroutput> option in
-                <xref
-                linkend="vboxmanage-modifyvm-vrde" />.
+                <xref linkend="vboxmanage-modifyvm-vrde" />.
               </para>
             </listitem>
@@ -2321 +2315 @@
             <listitem>
               <para>
-                Only IPv4: <computeroutput>--vrdeaddress "0.0.0.0"</computeroutput>
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Only IPv6: <computeroutput>--vrdeaddress "::"</computeroutput>
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Both IPv6 and IPv4: <computeroutput>--vrdeaddress ""</computeroutput>
+                Only IPv4: <computeroutput>--vrdeaddress
+                "0.0.0.0"</computeroutput>
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Only IPv6: <computeroutput>--vrdeaddress
+                "::"</computeroutput>
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Both IPv6 and IPv4: <computeroutput>--vrdeaddress
+                ""</computeroutput>
               </para>
 
@@ -2358 +2355 @@
             default|&lt;name&gt;</computeroutput>: Specifies the library
             used for RDP authentication. See
-            <xref
-            linkend="vbox-auth" />.
+            <xref linkend="vbox-auth" />.
           </para>
         </listitem>
@@ -2368 +2364 @@
             Enables multiple connections to be made to the same VRDE
             server, if the server supports this feature. See
-            <xref
-            linkend="vrde-multiconnection" />.
+            <xref linkend="vrde-multiconnection" />.
           </para>
         </listitem>
@@ -2398 +2393 @@
             &lt;percent&gt;</computeroutput>: Specifies the image
             quality for video redirection. See
-            <xref
-            linkend="vrde-videochannel" />.
+            <xref linkend="vrde-videochannel" />.
           </para>
         </listitem>
@@ -2756 +2750 @@
           <option>--register</option> automatically registers the new
           clone in this &product-name; installation. You can manually
-          register the new VM later by using the <command>VMBoxManage
-          registervm</command> command. See the
-          <xref linkend="vboxmanage-registervm" /> man page.
+          register the new VM later by using the <command>VBoxManage
+          registervm</command> command. See
+          <xref linkend="vboxmanage-registervm" />.
         </para>
       </listitem>
@@ -2804 +2798 @@
       virtual machine which should be moved.
     </para>
-
-    <remark>
-      What does the --type basic setting do?
-    </remark>
 
     <para>
@@ -2958 +2948 @@
         <para>
           A virtual appliance in OVF format, including copying their
-          virtual disk images to compressed VMDK
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          A cloud service, such as &oci;.
+          virtual disk images to compressed VMDK.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          A cloud service, such as &oci;. A single VM can be exported in
+          VMDK format.
         </para>
       </listitem>
@@ -3037 +3028 @@
       <title>Export to &oci;</title>
 
-      <note>
-        <para>
-          By default an exported image is converted into "stream vmdk"
-          to comply OCI requirement.
-        </para>
-      </note>
+      <para>
+        By default, an exported disk image is converted into stream VMDK
+        format. This ensures compatibility with &oci;.
+      </para>
 
       <para>
         List the machine that you want to export to &oci; and specify
-        output to &oci; by using the
+        the target cloud service provider by using the
         <computeroutput>--output</computeroutput> or
         <computeroutput>-o</computeroutput> option.
@@ -3052 +3041 @@
 
       <para>
-        To export a VM to a cloud service such as &oci;, you must use
-        the <option>--cloud</option> option to identify the virtual
-        machine that you want to export. This option works in the same
-        way as the <option>--vsys</option> option for OVF export.
+        To export a VM to a cloud service such as &oci;, use the
+        <option>--cloud</option> option to specify the VM to export.
+        This option works in the same way as the <option>--vsys</option>
+        option for OVF export.
       </para>
 
       <para>
-        Specify the following options. Some of these are settings for
-        the VM instance and require you to enter an Oracle Cloud
-        Identifier (OCID) for a resource. OCIDs can be viewed using the
-        &oci; Console.
+        Some of the following options are settings for the VM instance.
+        As a result, you must enter an Oracle Cloud Identifier (OCID)
+        for a resource. Use the &oci; Console to view OCIDs.
       </para>
 
@@ -3069 +3057 @@
         <listitem>
           <para>
-            <computeroutput>--output</computeroutput>: The short name
-            for the cloud service you are exporting to. For &oci;, enter
-            <computeroutput>OCI://</computeroutput>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cloud &lt;number of virtual
-            system&gt;</computeroutput>: A number identifying the VM
-            that you are exporting. Numbering starts at
+            <option>--output/-o</option>: Specifies the short name of
+            the cloud service provider to which you export. For &oci;,
+            enter <computeroutput>OCI://</computeroutput>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloud</option>
+            <replaceable>number-of-virtual-system</replaceable>:
+            Specifies a number that identifies the VM that you are
+            exporting. Numbering starts at
             <computeroutput>0</computeroutput> for the first VM.
           </para>
@@ -3086 +3075 @@
         <listitem>
           <para>
-            <computeroutput>--vmname &lt;name&gt;</computeroutput>:
-            The exported VM gets this name in the cloud service.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cloudprofile &lt;cloud profile
-            name&gt;</computeroutput>: The cloud profile contains data for
-            communication with a cloud provider or service. The cloud profile contains details
-            for your &oci; account, such as your user OCID, and the fingerprint for
-            your public key. See <xref linkend="ovf-export-oci"/>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cloudshape &lt;shape&gt;</computeroutput>:
-            The shape is used for the VM instance. Usually, determines the
-            number of CPUs and the amount of memory allocated to a
-            VM instance. The shape must be compatible with the exported image.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--clouddomain
-            &lt;domain&gt;</computeroutput>: The availability domain
-            used for the VM instance. Enter the OCID for the
-            availability domain.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--clouddisksize &lt;disk
-            size&gt;</computeroutput>: The disk size used for the exported
-            image, in gigabytes. Minimum is 50GB, maximum - 300GB.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cloudbucket &lt;bucket
-            name&gt;</computeroutput>: A bucket is a kind of storage for the uploaded
-            objects. In the &oci; a bucket is used to store the uploaded files.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cloudocivcn &lt;OCI vcn
-            id&gt;</computeroutput>: The virtual cloud network (VCN)
-            used for the VM instance. Enter the OCID for the VCN.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cloudocisubnet &lt;OCI subnet
-            ID&gt;</computeroutput>: The subnet of the VCN used for the
-            VM instance. Enter the OCID for the subnet.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cloudkeepobject
-            &lt;true/false&gt;</computeroutput>: Whether to store the
-            exported image in Oracle Object Storage or not.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cloudlaunchinstance
-            &lt;true/false&gt;</computeroutput>: Whether to start the VM
-            instance after export to &oci; or not.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <computeroutput>--cloudpublicip
-            &lt;true/false&gt;</computeroutput>: Whether to enable a
-            public IP address for the VM instance or not.
+            <option>--vmname</option> <replaceable>name</replaceable>:
+            Specifies the name of the exported VM. This name is used as
+            the VM instance name in &oci;.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudprofile</option>
+            <replaceable>cloud-profile-name</replaceable>: 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. See <xref linkend="ovf-export-oci"/>.
+          </para>
+
+          <para>
+            To use a cloud profile, you must have the required
+            permissions on &oci;.
+          </para>
+
+          <remark>
+            Add xref to information about the required permissions.
+          </remark>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudshape</option>
+            <replaceable>shape</replaceable>: Specifies the shape used
+            for the VM instance. The shape defines the number of CPUs
+            and the amount of memory allocated to the VM instance. The
+            shape must be compatible with the exported image.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--clouddomain</option>
+            <replaceable>domain</replaceable>: Specifies the
+            availability domain to use for the VM instance. Enter the
+            OCID for the availability domain.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--clouddisksize</option>
+            <replaceable>disk-size-in-GB</replaceable>: Specifies the
+            disk size used for the exported disk image in gigabytes. The
+            minimum value is 50 GB and the maximum value is 300 GB.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudbucket</option>
+            <replaceable>bucket-name</replaceable>: Specifies the bucket
+            in which to store the uploaded files. In &oci;, a bucket is
+            a logical container for storing objects.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudocivcn</option>
+            <replaceable>OCI-vcn-ID</replaceable>: Specifies the virtual
+            cloud network (VCN) to use for the VM instance. Enter the
+            OCID for the VCN.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudocisubnet</option>
+            <replaceable>OCI-subnet-ID</replaceable>: Specifies the
+            subnet of the VCN to use for the VM instance. Enter the OCID
+            for the subnet.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudkeepobject true | false</option>: Specifies
+            whether to store the exported disk image in Oracle Object
+            Storage.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudlaunchinstance true | false</option>:
+            Specifies whether to start the VM instance after the export
+            to &oci; completes.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--cloudpublicip true | false</option>: Specifies
+            whether to enable a public IP address for the VM instance.
           </para>
         </listitem>
@@ -3182 +3186 @@
       </para>
 
-<screen>VBoxManage export "OCI_Export" --output OCI:// --cloud 0 --vmname OCI_export \
---cloudshape VM.Standard2.1 --clouddomain abcd:US-ASHBURN-AD-1 --clouddisksize 50 \
---cloudbucket test_bucket --cloudocivcn ocid1.vcn.oc1.iad.aaaa... \
---cloudpublicip true --cloudprofile "standard user" --cloudocisubnet ocid1.subnet.oc1.iad.aaaa... \
---cloudkeepobject true --cloudlaunchinstance true</screen>
+      <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... \
+--cloudkeepobject true --cloudlaunchinstance true --cloudpublicip true</screen>
 
     </sect2>
@@ -3479 +3488 @@
           <computeroutput>nicproperty&lt;1-N&gt;
           &lt;paramname&gt;="paramvalue"</computeroutput>: This option,
-          in combination with <computeroutput>nicgenericdrv</computeroutput>
-          enables you to pass parameters to rarely-used
-          network backends.
+          in combination with
+          <computeroutput>nicgenericdrv</computeroutput> enables you to
+          pass parameters to rarely-used network backends.
         </para>
 
@@ -3872 +3881 @@
           <computeroutput>vrdevideochannelquality
           &lt;percent&gt;</computeroutput>: Sets the image quality for
-          video redirection. See
-          <xref
-        linkend="vrde-videochannel" />.
+          video redirection. See <xref linkend="vrde-videochannel" />.
         </para>
       </listitem>
@@ -4229 +4236 @@
 
         <para>
-          For a headless encrypted VM start, use the folowing command:
+          For a headless encrypted VM start, use the following command:
         </para>
 
@@ -6919 +6926 @@
           <varlistentry>
             <term>
-              <computeroutput>-E|--putenv &lt;NAME&gt;=&lt;VALUE&gt;</computeroutput>
+              <computeroutput>-E|--putenv
+              &lt;NAME&gt;=&lt;VALUE&gt;</computeroutput>
             </term>
 
@@ -7196 +7204 @@
           <varlistentry>
             <term>
-              <computeroutput>-E|--putenv &lt;NAME&gt;=&lt;VALUE&gt;</computeroutput>
+              <computeroutput>-E|--putenv
+              &lt;NAME&gt;=&lt;VALUE&gt;</computeroutput>
             </term>
 
@@ -8380 +8389 @@
       Metric collection can only be enabled for started VMs. Collected
       data and collection settings for a particular VM will disappear as
-      soon as it shuts down. Use <command>VBoxManage metrics list</command>
-      subcommand to see which metrics are currently
-      available. You can also use <option>--list</option> option with
-      any subcommand that modifies metric settings to find out which
-      metrics were affected.
+      soon as it shuts down. Use the <command>VBoxManage metrics
+      list</command> subcommand to see which metrics are currently
+      available. You can also use the <option>--list</option> option
+      with any subcommand that modifies metric settings to find out
+      which metrics were affected.
     </para>
 

trunk/doc/manual/en_US/user_VirtualBoxAPI.xml

@@ -11 +11 @@
   <para>
     &product-name; comes with comprehensive support for third-party
-    developers. The so-called "Main API" of &product-name; exposes the
-    entire feature set of the virtualization engine. It is completely
-    documented and available to anyone who wishes to control
-    &product-name; programmatically.
+    developers. The so-called <emphasis>Main API</emphasis> of
+    &product-name; exposes the entire feature set of the virtualization
+    engine. It is completely documented and available to anyone who
+    wishes to control &product-name; programmatically.
   </para>
 
@@ -29 +29 @@
     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">http://www.virtualbox.org</ulink>.
     In particular, the SDK comes with a Programming Guide and Reference
     manual in PDF format. This manual contains, among other things, the