Index: /trunk/doc/manual/en_US/user_AdvancedTopics.xml
===================================================================
--- /trunk/doc/manual/en_US/user_AdvancedTopics.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_AdvancedTopics.xml	(revision 56451)
@@ -621,17 +621,17 @@
       versions <itemizedlist>
           <listitem>
-            X11R6.8/X11R6.9 and XFree86 version 4.3 (vboxvideo_drv_68.o and vboxmouse_drv_68.o)
+            <para>X11R6.8/X11R6.9 and XFree86 version 4.3 (vboxvideo_drv_68.o and vboxmouse_drv_68.o)</para>
           </listitem>
 
           <listitem>
-            X11R7.0 (vboxvideo_drv_70.so and vboxmouse_drv_70.so)
+            <para>X11R7.0 (vboxvideo_drv_70.so and vboxmouse_drv_70.so)</para>
           </listitem>
 
           <listitem>
-            X11R7.1 (vboxvideo_drv_71.so and vboxmouse_drv_71.so)
+            <para>X11R7.1 (vboxvideo_drv_71.so and vboxmouse_drv_71.so)</para>
           </listitem>
 
           <listitem>
-            X.Org Server versions 1.3 and later (vboxvideo_drv_13.so and vboxmouse_drv_13.so and so on).
+            <para>X.Org Server versions 1.3 and later (vboxvideo_drv_13.so and vboxmouse_drv_13.so and so on).</para>
           </listitem>
         </itemizedlist> By default these drivers can be found in the
@@ -840,17 +840,17 @@
     limitations apply: <orderedlist>
         <listitem>
-           Only PCI cards with non-shared interrupts (such as using MSI on host) are supported at the moment.
+           <para>Only PCI cards with non-shared interrupts (such as using MSI on host) are supported at the moment.</para>
         </listitem>
 
         <listitem>
-           No guest state can be reliably saved/restored (as the internal state of the PCI card could not be retrieved).
+           <para>No guest state can be reliably saved/restored (as the internal state of the PCI card could not be retrieved).</para>
         </listitem>
 
         <listitem>
-           Teleportation (live migration) doesn't work (for the same reason).
+           <para>Teleportation (live migration) doesn't work (for the same reason).</para>
         </listitem>
 
         <listitem>
-           No lazy physical memory allocation. The host will preallocate the whole RAM required for the VM on startup (as we cannot catch physical hardware accesses to the physical memory).
+           <para>No lazy physical memory allocation. The host will preallocate the whole RAM required for the VM on startup (as we cannot catch physical hardware accesses to the physical memory).</para>
         </listitem>
       </orderedlist></para>
@@ -900,15 +900,15 @@
             <itemizedlist>
               <listitem>
-                <computeroutput>MaxFramerate</computeroutput> The highest rate at which video frames
+                <para><computeroutput>MaxFramerate</computeroutput> The highest rate at which video frames
                 are sent to the guest. A higher frame rate requires more CPU power. Therefore sometimes
                 it is useful to set a lower limit. Default is no limit and allow the guest to use all
-                frame rates supported by the host webcam.
+                frame rates supported by the host webcam.</para>
               </listitem>
               <listitem>
-                <computeroutput>MaxPayloadTransferSize</computeroutput> How many bytes the emulated
+                <para><computeroutput>MaxPayloadTransferSize</computeroutput> How many bytes the emulated
                 webcam can send to the guest at a time. Default value is 3060 bytes, which is used by
                 some webcams. Higher values can slightly reduce CPU load, if the guest is able to use
                 larger buffers. However, a high <computeroutput>MaxPayloadTransferSize</computeroutput>
-                might be not supported by some guests.
+                might be not supported by some guests.</para>
               </listitem>
             </itemizedlist>
@@ -1478,7 +1478,10 @@
     replace <code>pcbios</code> by <code>efi</code> in the keys.</para>
 
-    <sect2>
-      <title>DMI BIOS information (type 0)</title>
-      <screen>VBoxManage setextradata "VM name"
+    <glosslist>
+      <glossentry>
+        <glossterm>DMI BIOS information</glossterm>
+        <glossdef>
+          <para>(type 0)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSVendor"        "BIOS Vendor"
 VBoxManage setextradata "VM name"
@@ -1494,8 +1497,12 @@
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSFirmwareMinor" 4</screen>
-    </sect2>
-    <sect2>
-      <title>DMI system information (type 1)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI system information</glossterm>
+        <glossdef>
+          <para>(type 1)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiSystemVendor"      "System Vendor"
 VBoxManage setextradata "VM name"
@@ -1512,8 +1519,12 @@
       "VBoxInternal/Devices/pcbios/0/Config/DmiSystemUuid"
                                                "9852bf98-b83c-49db-a8de-182c42c7226b"</screen>
-    </sect2>
-    <sect2>
-      <title>DMI board information (type 2)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI board information</glossterm>
+        <glossdef>
+          <para>(type 2)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBoardVendor"       "Board Vendor"
 VBoxManage setextradata "VM name"
@@ -1529,8 +1540,12 @@
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBoardBoardType"    10</screen>
-    </sect2>
-    <sect2>
-      <title>DMI system enclosure or chassis (type 3)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI system enclosure or chassis</glossterm>
+        <glossdef>
+          <para>(type 3)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiChassisVendor"     "Chassis Vendor"
 VBoxManage setextradata "VM name"
@@ -1542,19 +1557,30 @@
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiChassisAssetTag"   "Chassis Tag"</screen>
-    </sect2>
-    <sect2>
-      <title>DMI processor informatiion (type 4)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI processor information</glossterm>
+        <glossdef>
+          <para>(type 4)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiProcManufacturer"  "GenuineIntel"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiProcVersion"       "Pentium(R) III"</screen>
-    </sect2>
-    <sect2>
-      <title>DMI OEM strings (type 11)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI OEM strings</glossterm>
+        <glossdef>
+          <para>(type 11)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiOEMVBoxVer"        "vboxVer_1.2.3"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiOEMVBoxRev"        "vboxRev_12345"</screen>
-    </sect2>
+        </glossdef>
+      </glossentry>
+    </glosslist>
+
     <para>If a DMI string is not set, the default value of VirtualBox is used.
     To set an empty string use
@@ -1664,70 +1690,70 @@
       following:</para>
 
-      <para><glosslist>
-          <glossentry>
-            <glossterm><computeroutput>--timesync-interval</computeroutput></glossterm>
-            <glossdef>
-              <para>Specifies the interval at which to synchronize the time
-              with the host. The default is 10000 ms (10 seconds).</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><computeroutput>--timesync-min-adjust</computeroutput></glossterm>
-            <glossdef>
-              <para>The minimum absolute drift value measured in milliseconds
-              to make adjustments for. The default is 1000 ms on OS/2 and 100
-              ms elsewhere.</para>
-            </glossdef>
-          </glossentry>
-          <glossentry>
-            <glossterm><computeroutput>--timesync-latency-factor</computeroutput></glossterm>
-            <glossdef>
-              <para>The factor to multiply the time query latency with to
-              calculate the dynamic minimum adjust time. The default is 8
-              times, that means in detail: Measure the time it takes to
-              determine the host time (the guest has to contact the VM host
-              service which may take some time), multiply this value by 8 and
-              do an adjustment only if the time difference between host and
-              guest is bigger than this value. Don't do any time adjustment
-              otherwise.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><computeroutput>--timesync-max-latency</computeroutput></glossterm>
-            <glossdef>
-              <para>The max host timer query latency to accept. The default is
-              250 ms.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><computeroutput>--timesync-set-threshold</computeroutput></glossterm>
-            <glossdef>
-              <para>The absolute drift threshold, given as milliseconds where
-              to start setting the time instead of trying to smoothly adjust
-              it. The default is 20 minutes.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><computeroutput>--timesync-set-start</computeroutput></glossterm>
-            <glossdef>
-              <para>Set the time when starting the time sync service.</para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm><computeroutput>--timesync-set-on-restore
-            0|1</computeroutput></glossterm>
-            <glossdef>
-              <para>Set the time after the VM was restored from a saved state
-              when passing 1 as parameter (default). Disable by passing 0. In
-              the latter case, the time will be adjusted smoothly which can
-              take a long time.</para>
-            </glossdef>
-          </glossentry>
-        </glosslist></para>
+      <glosslist>
+        <glossentry>
+          <glossterm><computeroutput>--timesync-interval</computeroutput></glossterm>
+          <glossdef>
+            <para>Specifies the interval at which to synchronize the time
+            with the host. The default is 10000 ms (10 seconds).</para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><computeroutput>--timesync-min-adjust</computeroutput></glossterm>
+          <glossdef>
+            <para>The minimum absolute drift value measured in milliseconds
+            to make adjustments for. The default is 1000 ms on OS/2 and 100
+            ms elsewhere.</para>
+          </glossdef>
+        </glossentry>
+        <glossentry>
+          <glossterm><computeroutput>--timesync-latency-factor</computeroutput></glossterm>
+          <glossdef>
+            <para>The factor to multiply the time query latency with to
+            calculate the dynamic minimum adjust time. The default is 8
+            times, that means in detail: Measure the time it takes to
+            determine the host time (the guest has to contact the VM host
+            service which may take some time), multiply this value by 8 and
+            do an adjustment only if the time difference between host and
+            guest is bigger than this value. Don't do any time adjustment
+            otherwise.</para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><computeroutput>--timesync-max-latency</computeroutput></glossterm>
+          <glossdef>
+            <para>The max host timer query latency to accept. The default is
+            250 ms.</para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><computeroutput>--timesync-set-threshold</computeroutput></glossterm>
+          <glossdef>
+            <para>The absolute drift threshold, given as milliseconds where
+            to start setting the time instead of trying to smoothly adjust
+            it. The default is 20 minutes.</para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><computeroutput>--timesync-set-start</computeroutput></glossterm>
+          <glossdef>
+            <para>Set the time when starting the time sync service.</para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><computeroutput>--timesync-set-on-restore
+          0|1</computeroutput></glossterm>
+          <glossdef>
+            <para>Set the time after the VM was restored from a saved state
+            when passing 1 as parameter (default). Disable by passing 0. In
+            the latter case, the time will be adjusted smoothly which can
+            take a long time.</para>
+          </glossdef>
+        </glossentry>
+      </glosslist>
 
       <para>All these parameters can be specified as command line parameters
@@ -1790,5 +1816,5 @@
       </footnote> A VirtualBox VNIC template is a VNIC whose name starts with
     "vboxvnic_template" (case-sensitive).</para>
- 
+
     <para>On Solaris 11 hosts<footnote><para>When Crossbow based bridged
     networking is used.</para></footnote>, a VNIC template may be used to
@@ -1849,5 +1875,5 @@
 
     <screen>rem_drv vboxnet</screen>
-    
+
     <para>Edit the file <computeroutput>/platform/i86pc/kernel/drv/vboxnet.conf</computeroutput>
     and add a line for the new interface we want to add as shown below:</para>
@@ -2962,5 +2988,5 @@
       </para>
       <para><screen>VBoxManage setextradata "VM name" GUI/MouseCapturePolicy MODE</screen></para>
-      
+
       <para>where <computeroutput>MODE</computeroutput> is one of the
         following keywords:</para><glosslist>
@@ -3685,7 +3711,7 @@
     <screen>VBoxManage setextradata "VM name" VBoxInternal/Devices/usb-ehci/LUN#0/Config/CaptureFilename "filename"</screen>
 
-    The command above enables capturing on the root hub attached to the EHCI controller.
+    <para>The command above enables capturing on the root hub attached to the EHCI controller.
     To enable it for the OHCI or XHCI controller replace <computeroutput>usb-ehci</computeroutput>
-    with <computeroutput>usb-ohci</computeroutput> or <computeroutput>usb-xhci</computeroutput> respectively.
+    with <computeroutput>usb-ohci</computeroutput> or <computeroutput>usb-xhci</computeroutput> respectively.</para>
 
   </sect1>
Index: /trunk/doc/manual/en_US/user_BasicConcepts.xml
===================================================================
--- /trunk/doc/manual/en_US/user_BasicConcepts.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_BasicConcepts.xml	(revision 56451)
@@ -421,12 +421,11 @@
               installed on the guest.</para>
 
-              <note>Drag'n drop is disabled by default. This setting can be
+              <para><note><para>Drag'n drop is disabled by default. This setting can be
               changed at any time using the "Drag'n'Drop" menu item in the
-              "Devices" menu of the virtual machine.</note>
-
-              <para>See <xref linkend="guestadd-dnd"/> for more information.</para>
-
+              "Devices" menu of the virtual machine.</para></note></para>
+
+              <para>See <xref linkend="guestadd-dnd"/> for more information.
               <footnote><para>Experimental support for drag and drop was added
-              with VirtualBox 4.2.</para></footnote>
+              with VirtualBox 4.2.</para></footnote></para>
             </glossdef>
           </glossentry>
Index: /trunk/doc/manual/en_US/user_ChangeLog.xml
===================================================================
--- /trunk/doc/manual/en_US/user_ChangeLog.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_ChangeLog.xml	(revision 56451)
@@ -16,7 +16,10 @@
 <!--$VIRTUALBOX_CHANGELOG_IMPL-->
 
-  <para>With VirtualBox 3.2, changelog information for versions before 2.0 was removed in
-  order to save space. To access this information, please consult the User Manual of
-  VirtualBox version 3.1 or earlier.</para>
+  <sect1>
+    <title>Older Change log details</title>
+    <para>With VirtualBox 3.2, changelog information for versions before 2.0
+    was removed in order to save space. To access this information, please
+    consult the User Manual of VirtualBox version 3.1 or earlier.</para>
+  </sect1>
 
 </chapter>
Index: /trunk/doc/manual/en_US/user_Frontends.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Frontends.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_Frontends.xml	(revision 56451)
@@ -582,19 +582,19 @@
             generate a server certificate.<orderedlist>
                 <listitem>
-                Create a CA self signed certificate:
+                <para>Create a CA self signed certificate:
                 <screen>openssl req -new -x509 -days 365 -extensions v3_ca \
-  -keyout ca_key_private.pem -out ca_cert.pem</screen>
+  -keyout ca_key_private.pem -out ca_cert.pem</screen></para>
                 </listitem>
 
                 <listitem>
-                Generate a server private key and a request for signing:
+                <para>Generate a server private key and a request for signing:
                 <screen>openssl genrsa -out server_key_private.pem
-openssl req -new -key server_key_private.pem -out server_req.pem</screen>
+openssl req -new -key server_key_private.pem -out server_req.pem</screen></para>
                 </listitem>
 
                 <listitem>
-                Generate the server certificate:
+                <para>Generate the server certificate:
                 <screen>openssl x509 -req -days 365 -in server_req.pem \
-  -CA ca_cert.pem -CAkey ca_key_private.pem -set_serial 01 -out server_cert.pem</screen>
+  -CA ca_cert.pem -CAkey ca_key_private.pem -set_serial 01 -out server_cert.pem</screen></para>
                 </listitem>
             </orderedlist>
Index: /trunk/doc/manual/en_US/user_GuestAdditions.xml
===================================================================
--- /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 56451)
@@ -362,6 +362,6 @@
         will undermine a silent installation.</para>
 
-        <note>On some Windows versions like Windows 2000 and Windows XP the user intervention
-        popups mentioned above always will be displayed, even after importing the Oracle certificates.</note>
+        <note><para>On some Windows versions like Windows 2000 and Windows XP the user intervention
+        popups mentioned above always will be displayed, even after importing the Oracle certificates.</para></note>
 
         <para>Since VirtualBox 4.2 installing those CA certificates on a Windows
@@ -402,62 +402,70 @@
         Windows Guest Additions installer on the CD-ROM:</para>
 
-        <sect4>
-          <title>VeriSign Code Signing CA</title>
-          <itemizedlist>
-            <listitem>
-              <para>In the Windows Explorer, right click on VBoxWindowsAdditions-&lt;Architecture&gt;.exe,
-              click on "Properties"</para>
-            </listitem>
-            <listitem>
-              <para>Go to tab "Digital Signatures", choose "Oracle Corporation" and click on "Details"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "General" click on "View Certificate"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "Certification Path" select "VeriSign Class 3 Public Primary CA"</para>
-            </listitem>
-            <listitem>
-              <para>Click on "View Certificate"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "Details" click on "Copy to File ..."</para>
-            </listitem>
-            <listitem>
-              <para>In the upcoming wizard choose "DER encoded binary X.509 (.CER)"
-              and save the certificate file to a local path, finish the wizard</para>
-            </listitem>
-            <listitem>
-              <para>Close certificate dialog for "Verisign Class 3 Code Signing
-              2010 CA"</para>
-            </listitem>
-          </itemizedlist>
-        </sect4>
-
-        <sect4>
-          <title>Oracle Corporation</title>
-          <itemizedlist>
-            <listitem>
-              <para>In the Windows Explorer, right click on VBoxWindowsAdditions-&lt;Architecture&gt;.exe,
-              click on "Properties"</para>
-            </listitem>
-            <listitem>
-              <para>Go to tab "Digital Signatures", choose "Oracle Corporation" and click on "Details"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "General" click on "View Certificate"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "Details" click on "Copy to File ..."</para>
-            </listitem>
-            <listitem>
-              <para>In the upcoming wizard choose "DER encoded binary X.509 (.CER)"
-              and save the certificate file to a local path, finish the wizard</para>
-            </listitem>
-            <listitem>
-              <para>Close certificate dialog for "Oracle Corporation"</para>
-            </listitem>
-          </itemizedlist>
-        </sect4>
+        <glosslist>
+          <glossentry>
+            <glossterm>VeriSign Code Signing CA</glossterm>
+            <glossdef>
+              <para>Open the Windows Explorer.</para>
+              <itemizedlist>
+                <listitem>
+                  <para>Right click on VBoxWindowsAdditions-&lt;Architecture&gt;.exe,
+                  click on "Properties"</para>
+                </listitem>
+                <listitem>
+                  <para>Go to tab "Digital Signatures", choose "Oracle Corporation" and click on "Details"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "General" click on "View Certificate"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "Certification Path" select "VeriSign Class 3 Public Primary CA"</para>
+                </listitem>
+                <listitem>
+                  <para>Click on "View Certificate"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "Details" click on "Copy to File ..."</para>
+                </listitem>
+                <listitem>
+                  <para>In the upcoming wizard choose "DER encoded binary X.509 (.CER)"
+                  and save the certificate file to a local path, finish the wizard</para>
+                </listitem>
+                <listitem>
+                  <para>Close certificate dialog for "Verisign Class 3 Code Signing
+                  2010 CA"</para>
+                </listitem>
+              </itemizedlist>
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>Oracle Corporation</glossterm>
+            <glossdef>
+              <para>Open the Windows Explorer.</para>
+              <itemizedlist>
+                <listitem>
+                  <para>Right click on VBoxWindowsAdditions-&lt;Architecture&gt;.exe,
+                  click on "Properties"</para>
+                </listitem>
+                <listitem>
+                  <para>Go to tab "Digital Signatures", choose "Oracle Corporation" and click on "Details"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "General" click on "View Certificate"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "Details" click on "Copy to File ..."</para>
+                </listitem>
+                <listitem>
+                  <para>In the upcoming wizard choose "DER encoded binary X.509 (.CER)"
+                  and save the certificate file to a local path, finish the wizard</para>
+                </listitem>
+                <listitem>
+                  <para>Close certificate dialog for "Oracle Corporation"</para>
+                </listitem>
+              </itemizedlist>
+            </glossdef>
+          </glossentry>
+        </glosslist>
 
         <para>After exporting the two certificates above they can be imported into the
@@ -647,5 +655,5 @@
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>yum update</screen></para> as root.
+                terminal and run <screen>yum update</screen> as root.</para>
               </listitem>
 
@@ -668,5 +676,5 @@
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>zypper update</screen></para> as root.
+                terminal and run <screen>zypper update</screen> as root.</para>
               </listitem>
 
@@ -706,5 +714,5 @@
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>zypper update</screen></para> as root.
+                terminal and run <screen>zypper update</screen> as root.</para>
               </listitem>
 
@@ -748,6 +756,6 @@
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>urpmi --auto-update</screen></para>
-                as root.
+                terminal and run <screen>urpmi --auto-update</screen>
+                as root.</para>
               </listitem>
 
@@ -779,5 +787,5 @@
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>yum update</screen></para> as root.
+                terminal and run <screen>yum update</screen> as root.</para>
               </listitem>
 
@@ -1275,12 +1283,14 @@
     implemented.</para></footnote></para>
 
-    <para>When transferring data from the host to the guest OS, the host in this
-    case is the source, whereas the guest OS is the target. However, when doing
-    it the other way around, that is, transferring data from the guest OS to the
-    host, the guest OS this time became the source and the host is the target.</para>
-
-    <para>For security reasons drag'n drop can be configured at runtime
-    on a per-VM basis either using the "Drag'n'Drop" menu item in the "Devices" menu
-    of the virtual machine or VBoxManage: The following four modes are available:
+    <para>When transferring data from the host to the guest OS, the host in
+    this case is the source, whereas the guest OS is the target. However, when
+    doing it the other way around, that is, transferring data from the guest OS
+    to the host, the guest OS this time became the source and the host is the
+    target.</para>
+
+    <para>For security reasons drag'n drop can be configured at runtime on a
+    per-VM basis either using the "Drag'n'Drop" menu item in the "Devices" menu
+    of the virtual machine or VBoxManage: The following four modes are
+    available:</para>
 
     <para><mediaobject>
@@ -1309,5 +1319,5 @@
         and vice versa.</para>
       </listitem>
-    </itemizedlist></para>
+    </itemizedlist>
 
     <note><para>Drag'n drop support depends on the frontend being used; at the
@@ -1449,17 +1459,20 @@
       <note><para>Unlike the current basic Direct3D support, the WDDM video
       driver installation does <emphasis role="bold">not</emphasis> require
-      the "Safe Mode".</para></note>
-      <para>The Aero theme is not enabled by default. To enable it<itemizedlist>
+      the "Safe Mode".</para></note></para>
+
+      <para>The Aero theme is not enabled by default. To enable it
+        <itemizedlist>
           <listitem>
             <para>In Windows Vista guest: right-click on the desktop, in the
             context menu select "Personalize", then select "Windows Color and Appearance"
             in the "Personalization" window, in the "Appearance Settings" dialog select
-            "Windows Aero" and press "OK"</para></listitem>
+            "Windows Aero" and press "OK"</para>
+          </listitem>
           <listitem>
             <para>In Windows 7 guest: right-click on the desktop, in the
             context menu select "Personalize" and select any Aero theme
-            in the "Personalization" window</para></listitem>
-          </itemizedlist>
-        </para>
+            in the "Personalization" window</para>
+          </listitem>
+        </itemizedlist>
       </para>
 
Index: /trunk/doc/manual/en_US/user_Introduction.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Introduction.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_Introduction.xml	(revision 56451)
@@ -1567,6 +1567,6 @@
     <para>To experiment with a VM configuration, test different guest OS levels
     or to simply backup a VM, VirtualBox can create a full or a linked copy of
-    an existing VM.<footnote>Cloning support was introduced with VirtualBox
-    4.1.</footnote></para>
+    an existing VM.<footnote><para>Cloning support was introduced with VirtualBox
+    4.1.</para></footnote></para>
     
     <para>A wizard will guide you through the clone process:</para>
Index: /trunk/doc/manual/en_US/user_KnownIssues.xml
===================================================================
--- /trunk/doc/manual/en_US/user_KnownIssues.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_KnownIssues.xml	(revision 56451)
@@ -12,34 +12,34 @@
         <itemizedlist>
             <listitem>
-                WDDM Direct3D video driver for Windows guests
-            </listitem>
-            <listitem>
-                Hardware 3D acceleration support for Windows, Linux, and Solaris 
-                guests
-            </listitem>
-            <listitem>
-                Hardware 2D video playback acceleration support for Windows 
-                guests
-            </listitem>
-            <listitem>
-                PCI pass-through (Linux hosts only)
-            </listitem>
-            <listitem>
-                Mac OS X guests (Mac hosts only)
-            </listitem>
-            <listitem>
-                ICH9 chipset emulation
-            </listitem>
-            <listitem>
-                EFI firmware
-            </listitem>
-            <listitem>
-                Host CD/DVD drive pass-through
-            </listitem>
-            <listitem>
-                Support of iSCSI via internal networking
-            </listitem>
-            <listitem>
-                Synthetic CPU reporting
+                <para>WDDM Direct3D video driver for Windows guests</para>
+            </listitem>
+            <listitem>
+                <para>Hardware 3D acceleration support for Windows, Linux, and Solaris 
+                guests</para>
+            </listitem>
+            <listitem>
+                <para>Hardware 2D video playback acceleration support for Windows 
+                guests</para>
+            </listitem>
+            <listitem>
+                <para>PCI pass-through (Linux hosts only)</para>
+            </listitem>
+            <listitem>
+                <para>Mac OS X guests (Mac hosts only)</para>
+            </listitem>
+            <listitem>
+                <para>ICH9 chipset emulation</para>
+            </listitem>
+            <listitem>
+                <para>EFI firmware</para>
+            </listitem>
+            <listitem>
+                <para>Host CD/DVD drive pass-through</para>
+            </listitem>
+            <listitem>
+                <para>Support of iSCSI via internal networking</para>
+            </listitem>
+            <listitem>
+                <para>Synthetic CPU reporting</para>
             </listitem>
         </itemizedlist>
Index: /trunk/doc/manual/en_US/user_Networking.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Networking.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_Networking.xml	(revision 56451)
@@ -725,7 +725,10 @@
           linkend="vboxmanage-dhcpserver" /> for details.</para>
         </listitem>
-      </itemizedlist></para>
-    <para><note>On Linux and Mac OS X hosts the number of host-only interfaces is
-    limited to 128. There is no such limit for Solaris and Windows hosts.</note></para>
+      </itemizedlist>
+    </para>
+
+    <para><note><para>On Linux and Mac OS X hosts the number of host-only
+    interfaces is limited to 128. There is no such limit for Solaris and
+    Windows hosts.</para></note></para>
   </sect1>
 
@@ -791,10 +794,9 @@
     Internal network case.</para>
 
-    <para><note>
-        On Unix-based hosts (e.g. Linux, Solaris, Mac OS X) it is not possible
-        to bind to ports below 1024 from applications that are not run by 
-        <computeroutput>root</computeroutput>. As a result, if you try to
-        configure such a source UDP port, the VM will refuse to start. 
-      </note></para>
+    <para><note><para>On Unix-based hosts (e.g. Linux, Solaris, Mac OS X) it is
+    not possible to bind to ports below 1024 from applications that are not run
+    by <computeroutput>root</computeroutput>. As a result, if you try to
+    configure such a source UDP port, the VM will refuse to
+    start.</para></note></para>
   </sect1>
 
@@ -937,5 +939,5 @@
         <listitem>
           <para>Use <emphasis>bridged</emphasis> attachment instead of
-            <emphasis>NAT</emphasis></para>;
+            <emphasis>NAT</emphasis>;</para>
         </listitem>
         <listitem>
Index: /trunk/doc/manual/en_US/user_Security.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Security.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_Security.xml	(revision 56451)
@@ -6,145 +6,139 @@
 
   <sect1>
-    <title>Overview</title>
-    <para>
+    <title>General Security Principles</title>
+
+    <para>The following principles are fundamental to using any application
+      securely.
+      <glosslist>
+        <glossentry>
+          <glossterm>Keep Software Up To Date</glossterm>
+          <glossdef>
+            <para>
+              One of the principles of good security practise is to keep all
+              software versions and patches up to date. Activate the VirtualBox
+              update notification to get notified when a new VirtualBox release
+              is available. When updating VirtualBox, do not forget to update
+              the Guest Additions. Keep the host operating system as well as the
+              guest operating system up to date.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Restrict Network Access to Critical Services</glossterm>
+          <glossdef>
+            <para>
+              Use proper means, for instance a firewall, to protect your computer
+              and your guest(s) from accesses from the outside. Choosing the proper
+              networking mode for VMs helps to separate host networking from the
+              guest and vice versa.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Follow the Principle of Least Privilege</glossterm>
+          <glossdef>
+            <para>
+              The principle of least privilege states that users should be given the
+              least amount of privilege necessary to perform their jobs. Always execute VirtualBox
+              as a regular user. We strongly discourage anyone from executing
+              VirtualBox with system privileges.
+            </para>
+            <para>
+              Choose restrictive permissions when creating configuration files,
+              for instance when creating /etc/default/virtualbox, see
+              <xref linkend="linux_install_opts"/>. Mode 0600 would be preferred.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Monitor System Activity</glossterm>
+          <glossdef>
+            <para>
+              System security builds on three pillars: good security protocols, proper
+              system configuration and system monitoring. Auditing and reviewing audit
+              records address the third requirement. Each component within a system
+              has some degree of monitoring capability. Follow audit advice in this
+              document and regularly monitor audit records.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Keep Up To Date on Latest Security Information</glossterm>
+          <glossdef>
+            <para>
+              Oracle continually improves its software and documentation. Check this
+              note note yearly for revisions.
+            </para>
+          </glossdef>
+        </glossentry>
+
+      </glosslist>
     </para>
-
-    <sect2>
-      <title>General Security Principles</title>
-
-      <para>The following principles are fundamental to using any application
-        securely.
-        <glosslist>
-          <glossentry>
-            <glossterm>Keep Software Up To Date</glossterm>
-            <glossdef>
-              <para>
-                One of the principles of good security practise is to keep all
-                software versions and patches up to date. Activate the VirtualBox
-                update notification to get notified when a new VirtualBox release
-                is available. When updating VirtualBox, do not forget to update
-                the Guest Additions. Keep the host operating system as well as the
-                guest operating system up to date.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Restrict Network Access to Critical Services</glossterm>
-            <glossdef>
-              <para>
-                Use proper means, for instance a firewall, to protect your computer
-                and your guest(s) from accesses from the outside. Choosing the proper
-                networking mode for VMs helps to separate host networking from the
-                guest and vice versa.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Follow the Principle of Least Privilege</glossterm>
-            <glossdef>
-              <para>
-                The principle of least privilege states that users should be given the
-                least amount of privilege necessary to perform their jobs. Always execute VirtualBox
-                as a regular user. We strongly discourage anyone from executing
-                VirtualBox with system privileges.
-              </para>
-              <para>
-                Choose restrictive permissions when creating configuration files,
-                for instance when creating /etc/default/virtualbox, see
-                <xref linkend="linux_install_opts"/>. Mode 0600 would be preferred.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Monitor System Activity</glossterm>
-            <glossdef>
-              <para>
-                System security builds on three pillars: good security protocols, proper
-                system configuration and system monitoring. Auditing and reviewing audit
-                records address the third requirement. Each component within a system
-                has some degree of monitoring capability. Follow audit advice in this
-                document and regularly monitor audit records.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Keep Up To Date on Latest Security Information</glossterm>
-            <glossdef>
-              <para>
-                Oracle continually improves its software and documentation. Check this
-                note note yearly for revisions.
-              </para>
-            </glossdef>
-          </glossentry>
-
-        </glosslist>
-      </para>
-    </sect2>
   </sect1>
 
   <sect1>
     <title>Secure Installation and Configuration</title>
+
+    <sect2>
+      <title>Installation Overview</title>
+      <para>
+        The VirtualBox base package should be downloaded only from a trusted source,
+        for instance the official website
+        <ulink url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>.
+        The integrity of the package should be verified with the provided SHA256
+        checksum which can be found on the official website.
+      </para>
+      <para>
+        General VirtualBox installation instructions for the supported hosts
+        can be found in <xref linkend="installation"/>.
+      </para>
+      <para>
+        On Windows hosts, the installer allows for disabling USB support, support
+        for bridged networking, support for host-only networking and the Python
+        language bindings, see <xref linkend="installation_windows"/>.
+        All these features are enabled by default but disabling some
+        of them could be appropriate if the corresponding functionality is not
+        required by any virtual machine. The Python language bindings are only
+        required if the VirtualBox API is to be used by external Python
+        applications. In particular USB support and support
+        for the two networking modes require the installation of Windows kernel
+        drivers on the host. Therefore disabling those selected features can
+        not only be used to restrict the user to certain functionality but
+        also to minimize the surface provided to a potential attacker.     </para>
+      <para>
+        The general case is to install the complete VirtualBox package. The
+        installation must be done with system privileges. All VirtualBox binaries
+        should be executed as a regular user and never as a privileged user.
+      </para>
+      <para>
+        The Oracle VM VirtualBox extension pack provides additional features
+        and must be downloaded and installed separately, see
+        <xref linkend="intro-installing"/>. As for the base package, the SHA256
+        checksum of the extension pack should be verified. As the installation
+        requires system privileges, VirtualBox will ask for the system
+        password during the installation of the extension pack.
+      </para>
+    </sect2>
+  
+    <sect2>
+      <title>Post Installation Configuration</title>
+      <para>
+        Normally there is no post installation configuration of VirtualBox components
+        required. However, on Solaris and Linux hosts it is necessary to configure
+        the proper permissions for users executing VMs and who should be able to
+        access certain host resources. For instance, Linux users must be member of
+        the <emphasis>vboxusers</emphasis> group to be able to pass USB devices to a
+        guest. If a serial host interface should be accessed from a VM, the proper
+        permissions must be granted to the user to be able to access that device.
+        The same applies to other resources like raw partitions, DVD/CD drives
+        and sound devices.
+      </para>
+    </sect2>
   </sect1>
-
-  <sect2>
-    <title>Installation Overview</title>
-    <para>
-      The VirtualBox base package should be downloaded only from a trusted source,
-      for instance the official website
-      <ulink url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>.
-      The integrity of the package should be verified with the provided SHA256
-      checksum which can be found on the official website.
-    </para>
-    <para>
-      General VirtualBox installation instructions for the supported hosts
-      can be found in <xref linkend="installation"/>.
-    </para>
-    <para>
-      On Windows hosts, the installer allows for disabling USB support, support
-      for bridged networking, support for host-only networking and the Python
-      language bindings, see <xref linkend="installation_windows"/>.
-      All these features are enabled by default but disabling some
-      of them could be appropriate if the corresponding functionality is not
-      required by any virtual machine. The Python language bindings are only
-      required if the VirtualBox API is to be used by external Python
-      applications. In particular USB support and support
-      for the two networking modes require the installation of Windows kernel
-      drivers on the host. Therefore disabling those selected features can
-      not only be used to restrict the user to certain functionality but
-      also to minimize the surface provided to a potential attacker.     </para>
-    <para>
-      The general case is to install the complete VirtualBox package. The
-      installation must be done with system privileges. All VirtualBox binaries
-      should be executed as a regular user and never as a privileged user.
-    </para>
-    <para>
-      The Oracle VM VirtualBox extension pack provides additional features
-      and must be downloaded and installed separately, see
-      <xref linkend="intro-installing"/>. As for the base package, the SHA256
-      checksum of the extension pack should be verified. As the installation
-      requires system privileges, VirtualBox will ask for the system
-      password during the installation of the extension pack.
-    </para>
-  </sect2>
-
-  <sect2>
-    <title>Post Installation Configuration</title>
-    <para>
-      Normally there is no post installation configuration of VirtualBox components
-      required. However, on Solaris and Linux hosts it is necessary to configure
-      the proper permissions for users executing VMs and who should be able to
-      access certain host resources. For instance, Linux users must be member of
-      the <emphasis>vboxusers</emphasis> group to be able to pass USB devices to a
-      guest. If a serial host interface should be accessed from a VM, the proper
-      permissions must be granted to the user to be able to access that device.
-      The same applies to other resources like raw partitions, DVD/CD drives
-      and sound devices.
-    </para>
-  </sect2>
-
+  
   <sect1>
     <title>Security Features</title>
Index: /trunk/doc/manual/en_US/user_ThirdParty.xml
===================================================================
--- /trunk/doc/manual/en_US/user_ThirdParty.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_ThirdParty.xml	(revision 56451)
@@ -3036,9 +3036,6 @@
         Copyright 1996-2002, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg
       </para>
-      <sect4>
+      <sect3>
         <title>Introduction</title>
-      </sect4>
-      <sect4>
-        <title></title>
         <para>
           The FreeType  Project is distributed in  several archive packages;
@@ -3100,6 +3097,6 @@
           actually use.
         </para>
-      </sect4>
-      <sect4>
+      </sect3>
+      <sect3>
         <title>Legal Terms</title>
         <sect4>
@@ -3157,4 +3154,5 @@
           <itemizedlist>
             <listitem>
+              <para>
               Redistribution of  source code  must retain this  license file
               (`FTL.TXT') unaltered; any  additions, deletions or changes to
@@ -3163,6 +3161,8 @@
               original  files must  be  preserved in  all  copies of  source
               files.
+              </para>
             </listitem>
             <listitem>
+              <para>
               Redistribution in binary form must provide a  disclaimer  that
               states  that  the software is based in part of the work of the
@@ -3170,4 +3170,5 @@
               encourage you to put an URL to the FreeType web page  in  your
               documentation, though this isn't mandatory.
+              </para>
             </listitem>
           </itemizedlist>
@@ -3236,5 +3237,5 @@
           </para>
         </sect4>
-      </sect4>
+      </sect3>
     </sect2>
     <sect2 id="licVPX">
Index: /trunk/doc/manual/en_US/user_VBoxManage.xml
===================================================================
--- /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 56450)
+++ /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 56451)
@@ -889,5 +889,4 @@
           </listitem>
           
-          This allows you to change the address range occupied by
           <listitem>
             <para><computeroutput>--bridgeadapter&lt;1-N&gt;
@@ -4321,9 +4320,9 @@
           of registers, each having one of the following forms:
           <itemizedlist>
-            <listitem><computeroutput>register-set.register-name.sub-field</computeroutput></listitem>
-            <listitem><computeroutput>register-set.register-name</computeroutput></listitem>
-            <listitem><computeroutput>cpu-register-name.sub-field</computeroutput></listitem>
-            <listitem><computeroutput>cpu-register-name</computeroutput></listitem>
-            <listitem><computeroutput>all</computeroutput></listitem>
+            <listitem><para><computeroutput>register-set.register-name.sub-field</computeroutput></para></listitem>
+            <listitem><para><computeroutput>register-set.register-name</computeroutput></para></listitem>
+            <listitem><para><computeroutput>cpu-register-name.sub-field</computeroutput></para></listitem>
+            <listitem><para><computeroutput>cpu-register-name</computeroutput></para></listitem>
+            <listitem><para><computeroutput>all</computeroutput></para></listitem>
           </itemizedlist>
           The <computeroutput>all</computeroutput> form will cause all
@@ -4340,8 +4339,8 @@
           of register assignments, each having one of the following forms:
           <itemizedlist>
-            <listitem><computeroutput>register-set.register-name.sub-field=value</computeroutput></listitem>
-            <listitem><computeroutput>register-set.register-name=value</computeroutput></listitem>
-            <listitem><computeroutput>cpu-register-name.sub-field=value</computeroutput></listitem>
-            <listitem><computeroutput>cpu-register-name=value</computeroutput></listitem>
+            <listitem><para><computeroutput>register-set.register-name.sub-field=value</computeroutput></para></listitem>
+            <listitem><para><computeroutput>register-set.register-name=value</computeroutput></para></listitem>
+            <listitem><para><computeroutput>cpu-register-name.sub-field=value</computeroutput></para></listitem>
+            <listitem><para><computeroutput>cpu-register-name=value</computeroutput></para></listitem>
           </itemizedlist>
           The value format should be in the same style as what
