Index: /trunk/doc/manual/en_US/user_AdvancedTopics.xml
===================================================================
--- /trunk/doc/manual/en_US/user_AdvancedTopics.xml	(revision 35900)
+++ /trunk/doc/manual/en_US/user_AdvancedTopics.xml	(revision 35901)
@@ -371,4 +371,109 @@
         appropriate path to execute the system preparation tool.</para>
       </note>
+    </sect2>
+  </sect1>
+
+  <sect1>
+    <title>Advanced configuration for Linux and Solaris guests</title>
+
+      <sect2>
+        <title>Manual setup of selected guest services on Linux</title>
+
+        <para>The VirtualBox Guest Additions contain several different
+        drivers. If for any reason you do not wish to set them all up, you can
+        install the Guest Additions using the following command:</para>
+
+        <screen>  sh ./VBoxLinuxAdditions.run no_setup</screen>
+
+        <para>After this, you will need to at least compile the kernel modules
+        by running the command <screen>  /usr/lib/VBoxGuestAdditions/vboxadd setup</screen>
+        as root (you will need to replace <emphasis>lib</emphasis> by
+        <emphasis>lib64</emphasis> on some 64bit guests), and on older guests
+        without the udev service you will need to add the
+        <emphasis>vboxadd</emphasis> service to the default runlevel to ensure
+        that the modules get loaded.</para>
+
+        <para>To setup the time synchronization service, run the command
+        <screen>  /usr/lib/VBoxGuestAdditions/vboxadd-service setup</screen>
+        and add the service vboxadd-service to the default runlevel. To set up
+        the X11 and OpenGL part of the Guest Additions, run the command
+        <screen>  /usr/lib/VBoxGuestAdditions/vboxadd-x11 setup</screen> (you
+        do not need to enable any services for this).</para>
+
+        <para>To recompile the guest kernel modules, use this command:
+        <screen>  /usr/lib/VBoxGuestAdditions/vboxadd setup</screen> After
+        compilation you should reboot your guest to ensure that the new
+        modules are actually used.</para>
+      </sect2>
+
+    <sect2 id="guestxorgsetup">
+      <title>Guest graphics and mouse driver setup in depth</title>
+
+        <para>This section assumes that you are familiar with configuring
+        the X.Org server using xorg.conf and optionally the newer mechanisms
+        using hal or udev and xorg.conf.d. If not you can learn about
+        them by studying the documentation which comes with X.Org.</para>
+
+        <para>The VirtualBox Guest Additions come with drivers for X.Org
+        versions
+          <itemizedlist>
+            <listitem>X11R6.8/X11R6.9 and XFree86 version 4.3
+            (vboxvideo_drv_68.o and vboxmouse_drv_68.o)</listitem>
+            <listitem>X11R7.0 (vboxvideo_drv_70.so and vboxmouse_drv_70.so)
+            </listitem>
+            <listitem>X11R7.1 (vboxvideo_drv_71.so and vboxmouse_drv_71.so)
+            </listitem>
+            <listitem>X.Org Server versions 1.3 and later (vboxvideo_drv_13.so
+            and vboxmouse_drv_13.so and so on).</listitem>
+          </itemizedlist>
+        By default these drivers can be found in the directory</para>
+        <para>
+        <computeroutput>/opt/VBoxGuestAdditions-&lt;version&gt;/lib/VBoxGuestAdditions</computeroutput>
+        </para>
+        <para>and the correct versions for the X server are symbolically linked
+        into the X.Org driver directories.</para>
+
+        <para>For graphics integration to work correctly, the X server must
+        load the vboxvideo driver (many recent X server versions look for it
+        automatically if they see that they are running in VirtualBox) and for
+        an optimal user experience the guest kernel drivers must be loaded and
+        the Guest Additions tool VBoxClient must be running as a client in the
+        X session. For mouse integration to work correctly, the guest kernel
+        drivers must be loaded and in addition, in X servers from X.Org X11R6.8
+        to X11R7.1 and in XFree86 version 4.3 the right vboxmouse driver must
+        be loaded and associated with /dev/mouse or /dev/psaux; in X.Org server
+        1.3 or later a driver for a PS/2 mouse must be loaded and the right
+        vboxmouse driver must be associated with /dev/vboxguest.</para>
+
+        <para>The VirtualBox guest graphics driver can use any graphics
+        configuration for which the virtual resolution fits into the virtual
+        video memory allocated to the virtual machine (minus a small amount
+        used by the guest driver) as described in
+        <xref linkend="settings-display" />. The driver will offer a range of
+        standard modes at least up to the default guest resolution for all
+        active guest monitors.  In X.Org Server 1.3 and later the default mode
+        can be changed by setting the output property VBOX_MODE to
+        "&lt;width&gt;x&lt;height&gt;" for any guest monitor. When VBoxClient
+        and the kernel drivers are active this is done automatically when the
+        host requests a mode change. The driver for older versions can only
+        receive new modes by querying the host for requests at regular
+        intervals.</para>
+
+        <para>With pre-1.3 X Servers you can also add your own modes to the X
+        server configuration file. You simply need to add them to the "Modes"
+        list in the "Display" subsection of the "Screen" section. For example,
+        the section shown here has a custom 2048x800 resolution mode added:
+        </para>
+
+        <screen>Section "Screen"
+        Identifier    "Default Screen"
+        Device        "VirtualBox graphics card"
+        Monitor       "Generic Monitor"
+        DefaultDepth  24
+        SubSection "Display"
+                Depth         24
+                Modes         "2048x800" "800x600" "640x480"
+        EndSubSection
+EndSection</screen>
     </sect2>
   </sect1>
Index: /trunk/doc/manual/en_US/user_GuestAdditions.xml
===================================================================
--- /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 35900)
+++ /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 35901)
@@ -408,7 +408,6 @@
 
       <para>Like the Windows Guest Additions, the VirtualBox Guest Additions
-      for Linux take the form of a set of device drivers and system
-      applications which may be installed in the guest operating
-      system.</para>
+      for Linux are a set of device drivers and system applications which may
+      be installed in the guest operating system.</para>
 
       <para>The following Linux distributions are officially supported:</para>
@@ -441,14 +440,14 @@
       distributions.</para>
 
-      <para>Note that some Linux distributions already come with VirtualBox
-      Guest Additions or a part thereof. You may keep the distribution's
-      version of the Guest Additions but often, these are not up to date and
-      limited in functionality. Therefore, you can choose the install the
-      Guest Additions that come with VirtualBox, overriding the already
-      installed version. The VirtualBox Linux Guest Additions installer tries
-      to detect existing installation and replace them but depending on how
-      the distribution integrates the Guest Additions, they may require some
-      manual interaction. It is highly recommended to take a snapshot of the
-      virtual machine before overriding the installation.</para>
+      <para>Note that some Linux distributions already come with all or part of
+      the VirtualBox Guest Additions. You may choose to keep the distribution's
+      version of the Guest Additions but these are often not up to date and
+      limited in functionality, so we recommend replacing them with the
+      Guest Additions that come with VirtualBox. The VirtualBox Linux Guest
+      Additions installer tries to detect existing installation and replace
+      them but depending on how the distribution integrates the Guest
+      Additions, this may require some manual interaction. It is highly
+      recommended to take a snapshot of the virtual machine before replacing
+      pre-installed Guest Additions.</para>
 
       <sect3>
@@ -456,8 +455,8 @@
 
         <para>The VirtualBox Guest Additions for Linux are provided on the
-        same ISO CD-ROM as the Additions for Windows described above. They
-        also come with an installation program guiding you through the setup
-        process, although, due to the significant differences between Linux
-        distributions, installation may be slightly more complex.</para>
+        same virtual CD-ROM file as the Guest Additions for Windows described
+        above. They also come with an installation program guiding you through
+        the setup process, although, due to the significant differences between
+        Linux distributions, installation may be slightly more complex.</para>
 
         <para>Installation generally involves the following steps:</para>
@@ -472,18 +471,23 @@
             on a Linux host system, as described there.</para>
 
-            <para>Again, as with Linux hosts, we recommend using DKMS for
-            Linux guests as well. If it is not installed, use this command for
-            Ubuntu/Debian systems:<screen>sudo apt-get install dkms</screen>
+            <para>Again, as with Linux hosts, we recommend using DKMS if it is
+            available for the guest system. If it is not installed, use this
+            command for Ubuntu/Debian systems:
+            <screen>sudo apt-get install dkms</screen>
             or for Fedora systems: <screen>yum install dkms</screen></para>
 
-            <para>Make sure to nstall DKMS <emphasis>before</emphasis>
-            installing the Linux Guest Additions.</para>
-          </listitem>
-
-          <listitem>
-            <para>Mount the
-            <computeroutput>VBoxGuestAdditions.iso</computeroutput> file as
-            your Linux guest's virtual CD-ROM drive, exactly the same way as
-            described for a Windows guest in <xref
+            <para>Be sure to install DKMS <emphasis>before</emphasis>
+            installing the Linux Guest Additions. If DKMS is not available
+            or not installed, the guest kernel modules will need to be
+            recreated manually whenever the guest kernel is updated using
+            the command <screen>/etc/init.d/vboxadd setup</screen> as root.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Insert the
+            <computeroutput>VBoxGuestAdditions.iso</computeroutput> CD file
+            into your Linux guest's virtual CD-ROM drive, exactly the same way
+            as described for a Windows guest in <xref
             linkend="mountingadditionsiso" />.</para>
           </listitem>
@@ -498,6 +502,6 @@
         </orderedlist>
 
-        <para>For your convenience, the following step-by-step instructions
-        have been verified to work for freshly installed copies of the most
+        <para>For your convenience, we provide the following step-by-step
+        instructions for freshly installed copies of recent versions of the most
         popular Linux distributions. After these preparational steps, you can
         execute the VirtualBox Guest Additions installer as described
@@ -505,10 +509,10 @@
 
         <sect4>
-          <title>Ubuntu 10.04 ("Lucid Lynx")</title>
+          <title>Ubuntu</title>
 
           <para><orderedlist>
               <listitem>
-                <para>In order to update your system to the latest version of
-                the packets, open a terminal and as root, execute <screen>apt-get update</screen>
+                <para>In order to fully update your guest system, open a
+                terminal and run <screen>apt-get update</screen> as root
                 followed by <screen>apt-get upgrade</screen></para>
               </listitem>
@@ -526,10 +530,10 @@
 
         <sect4>
-          <title>Fedora 13 ("Goddard")</title>
+          <title>Fedora</title>
 
           <para><orderedlist>
               <listitem>
-                <para>In order to update your system to the latest version of
-                the packets, open a terminal and as root, execute <screen>yum update</screen></para>
+                <para>In order to fully update your guest system, open a
+                terminal and run <screen>yum update</screen></para> as root.
               </listitem>
 
@@ -547,10 +551,10 @@
 
         <sect4>
-          <title>openSUSE 11.2</title>
+          <title>openSUSE</title>
 
           <para><orderedlist>
               <listitem>
-                <para>In order to update your system to the latest version of
-                the packets, open a terminal and as root, execute <screen>zypper update</screen></para>
+                <para>In order to fully update your guest system, open a
+                terminal and run <screen>zypper update</screen></para> as root.
               </listitem>
 
@@ -585,10 +589,10 @@
 
         <sect4>
-          <title>SuSE Linux Enterprise Desktop (SLED) 11</title>
+          <title>SuSE Linux Enterprise Desktop (SLED)</title>
 
           <para><orderedlist>
               <listitem>
-                <para>In order to update your system to the latest version of
-                the packets, open a terminal and as root, execute <screen>zypper update</screen></para>
+                <para>In order to fully update your guest system, open a
+                terminal and run <screen>zypper update</screen></para> as root.
               </listitem>
 
@@ -622,5 +626,5 @@
 
         <sect4>
-          <title>Mandrake 2010</title>
+          <title>Mandrake</title>
 
           <para><orderedlist>
@@ -631,6 +635,7 @@
 
               <listitem>
-                <para>In order to update your system to the latest version of
-                the packets, open a terminal and as root and execute <screen>urpmi --auto-update</screen></para>
+                <para>In order to fully update your guest system, open a
+                terminal and run <screen>urpmi --auto-update</screen></para>
+                as root.
               </listitem>
 
@@ -650,11 +655,11 @@
 
         <sect4>
-          <title>CentOS 5.5, Red Hat Enterprise Linux 5.5 and Oracle
-          Enterprise Linux 5.5</title>
+          <title>CentOS, Red Hat Enterprise Linux and Oracle
+          Enterprise Linux</title>
 
           <para><orderedlist>
               <listitem>
-                <para>Add <computeroutput>divider=10</computeroutput> to the
-                kernel boot options in
+                <para>For versions prior to 6, add <computeroutput>divider=10</computeroutput>
+                to the kernel boot options in
                 <computeroutput>/etc/grub.conf</computeroutput> to reduce the
                 idle CPU load.</para>
@@ -662,6 +667,6 @@
 
               <listitem>
-                <para>To update your system to the latest version of the
-                packets, open a terminal and as root, execute <screen>yum update</screen></para>
+                <para>In order to fully update your guest system, open a
+                terminal and run <screen>yum update</screen></para> as root.
               </listitem>
 
@@ -678,7 +683,4 @@
 
               <listitem>
-                <para>Note that OpenGL support is not available unless you
-                update to a later Linux kernel.</para>
-
                 <para>In case Oracle Enterprise Linux does not find the
                 required packages, you either have to install them from a
@@ -691,10 +693,10 @@
 
         <sect4>
-          <title>Debian 5 ("Lenny")</title>
+          <title>Debian</title>
 
           <para><orderedlist>
               <listitem>
-                <para>In order to update your system to the latest version of
-                the packets, open a terminal and as root, execute <screen>apt-get update</screen>
+                <para>In order to fully update your guest system, open a
+                terminal and run <screen>apt-get update</screen> as root
                 followed by <screen>apt-get upgrade</screen></para>
               </listitem>
@@ -715,7 +717,4 @@
                 correct version of the linux-headers package, e.g. using
                 <screen>apt-get install linux-headers-2.6.26-2-686</screen></para>
-
-                <para>Note that OpenGL support is not available unless you
-                update to a later Linux kernel.</para>
               </listitem>
             </orderedlist></para>
@@ -724,76 +723,31 @@
 
       <sect3>
-        <title>Manual setup of selected guest services</title>
-
-        <para>The VirtualBox Guest Additions contain several different
-        drivers. If for any reason you do not wish to set them all up, you can
-        install the Guest Additions using the following command:</para>
-
-        <screen>  sh ./VBoxLinuxAdditions.run no_setup</screen>
-
-        <para>After this, you will need to at least compile the kernel modules
-        by running the command <screen>  /usr/lib/VBoxGuestAdditions/vboxadd setup</screen>
-        as root (you will need to replace <emphasis>lib</emphasis> by
-        <emphasis>lib64</emphasis> on some 64bit guests), and on older guests
-        without the udev service you will need to add the
-        <emphasis>vboxadd</emphasis> service to the default runlevel to ensure
-        that the modules get loaded.</para>
-
-        <para>To setup the time synchronization service, run the command
-        <screen>  /usr/lib/VBoxGuestAdditions/vboxadd-service setup</screen>
-        and add the service vboxadd-service to the default runlevel. To set up
-        the X11 and OpenGL part of the Guest Additions, run the command
-        <screen>  /usr/lib/VBoxGuestAdditions/vboxadd-x11 setup</screen> (you
-        do not need to enable any services for this).</para>
-
-        <para>To recompile the guest kernel modules, use this command:
-        <screen>  /usr/lib/VBoxGuestAdditions/vboxadd setup</screen> After
-        compilation you should reboot your guest to ensure that the new
-        modules are actually used.</para>
-      </sect3>
-
-      <sect3>
-        <title>Video acceleration and high resolution graphics modes</title>
-
-        <para>In Linux guests, VirtualBox video acceleration is available
-        through the X Window System. Typically, in today's Linux
-        distributions, this will be the X.Org server. During the installation
-        process, X will be set up to use the VirtualBox video driver shipped
-        with the Guest Additions.</para>
-
-        <para>For Linux and Solaris guests, the X.org server version 1.3 or
-        later is required for automatic resizing (the feature has been
-        disabled on Fedora 9 guests due to a bug in the X server they supply).
-        The server version can be checked with <computeroutput>Xorg
-        -version</computeroutput>.</para>
-
-        <para>You can also send video mode hints using the
-        <computeroutput>VBoxManage</computeroutput> tool.</para>
-
-        <para>If you are only using recent Linux guests systems, you can skip
-        the rest of this section. On older guest systems, whatever graphics
-        modes were set up before the installation will be used. If these modes
-        do not suit your requirements, you can change your setup by editing
-        the configuration file of the X server, usually found in
-        <computeroutput>/etc/X11/xorg.conf</computeroutput>.</para>
-
-        <para>VirtualBox can use any default X graphics mode which fits into
-        the virtual video memory allocated to the virtual machine, as
-        described in <xref linkend="generalsettings" />. You can also add your
-        own modes to the X server configuration file. You simply need to add
-        them to the "Modes" list in the "Display" subsection of the "Screen"
-        section. For example, the section shown here has a custom 2048x800
-        resolution mode added:</para>
-
-        <screen>Section "Screen"
-        Identifier    "Default Screen"
-        Device        "VirtualBox graphics card"
-        Monitor       "Generic Monitor"
-        DefaultDepth  24
-        SubSection "Display"
-                Depth         24
-                Modes         "2048x800" "800x600" "640x480"
-        EndSubSection
-EndSection</screen>
+        <title>Graphics and mouse integration</title>
+
+        <para>In Linux and Solaris guests, VirtualBox graphics and mouse
+        integration goes through the X Window System.  VirtualBox can use
+        the X.Org variant of the system (or XFree86 version 4.3 which is
+        identical to the first X.Org release). During the installation process,
+        the X.Org display server will be set up to use the graphics and mouse
+        drivers which come with the Guest Additions.</para>
+
+        <para>After installing the Guest Additions into a fresh installation of
+        a supported Linux distribution or Solaris system (many unsupported
+        systems will work correctly too), the guest's graphics
+        mode will change to fit the size of the VirtualBox window
+        on the host when it is resized.  You can also ask the guest system to
+        switch to a particular resolution by sending a "video mode hint" using
+        the <computeroutput>VBoxManage</computeroutput> tool.</para>
+
+        <para>Multiple guest monitors are supported in guests using the X.Org
+        server version 1.3 (which is part of release 7.3 of the X Window System
+        version 11) or a later version. The layout of the guest screens can
+        be adjusted as needed using the tools which come with the guest
+        operating system.</para>
+        
+        <para>If you want to understand more about the details of how the
+        X.Org drivers are set up (in particular if you wish to use them in a
+        setting which our installer doesn't handle correctly), you should read
+        <xref linkend="guestxorgsetup" />.</para>
       </sect3>
 
@@ -1319,12 +1273,6 @@
 
         <listitem>
-          <para>Linux or Solaris guests with an X.org server version 1.3 or
-          higher<footnote>
-              <para>The X server version is not the same as the version of the
-              entire X.org suite. You can type <computeroutput>X
-              -version</computeroutput> in a terminal to find out about the
-              X.org server version level that is currently installed.</para>
-            </footnote> (support added with VirtualBox 1.6). The exception is
-          Fedora 9, due to a bug in its X server.</para>
+          <para>Supported Linux or Solaris guests running the X Window System
+          (added with VirtualBox 1.6).</para>
         </listitem>
       </itemizedlist></para>
