Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision 54e9eea876716c5f0b1bcb0ed0cf3c77ed59fa10)
+++ x/lib/qt4.xml	(revision a8ece0395fb6a20205eee22658d7764b60d3fc49)
@@ -80,7 +80,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="mesalib"/> and
-      <xref linkend="qtchooser"/>
+      <xref linkend="alsa-lib"/> and
+      <xref linkend="mesalib"/> 
     </para>
 
@@ -95,5 +94,5 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
-      <xref linkend="openssl"/> and
+      <xref linkend="openssl"/>, and
       <xref linkend="sqlite"/>
     </para>
@@ -106,5 +105,6 @@
       <xref linkend="mysql"/>,
       <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/> and
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="qtchooser"/> (if also installing Qt5), and
       <xref linkend="unixodbc"/>
     </para>
@@ -119,4 +119,5 @@
 
     <para>
+
        There are several ways to install a complicated package such as
        <application>Qt</application>. The files are not completely position
@@ -129,10 +130,10 @@
        correctly by the build process.
     </para>
-
+    
     <para>
        The default installation places the files in <filename
-       class="directory">/usr/local/qt</filename>. Many commercial
+       class='directory'>/usr/local/qt/</filename>. Many commercial
        distributions place the files in the system's <filename
-       class="directory">/usr</filename> hierarchy. The package can also be
+       class='directory'>/usr</filename> hierarchy. The package can also be
        installed in an arbitrary directory.
     </para>
@@ -140,23 +141,23 @@
     <para>
        The advantage of installing in <filename
-       class="directory">/usr</filename> is that no updates to the
+       class='directory'>/usr</filename> is that no updates to the
        <filename>/etc/ld.so.conf</filename> or
        <filename>/etc/man_db.conf</filename> files are required. The package
        files are distributed within several subdirectories of the <filename
-       class="directory">/usr</filename> hierarchy. This is the method that
-       most commercial distributions use. It is also supported by the
-       <application>qtchooser</application> application.
-    </para>
-
-    <para>
-       The advantage of installing <application>Qt</application> in a custom
+       class='directory'>/usr</filename> hierarchy.  This is the method that
+       most commercial distributions use.  It is also supported by the 
+       optional <application>qtchooser</application> application.
+    </para>
+
+    <para>
+       The advantage of installing <application>Qt4</application> in a custom
        directory such as <filename
-       class="directory">/opt/qt-&qt4-version;</filename> is that it keeps all
+       class='directory'>/opt/qt-&qt4-version;</filename> is that it keeps all
        the package files consolidated in a dedicated directory hierarchy. By
        using this method, an update can be made without overwriting a previous
        installation and users can easily revert to a previous version by
-       changing one symbolic link or merely changing the PATH variable. It
-       also allows a developer to maintain multiple versions of
-       <application>Qt</application> for testing.
+       changing one symbolic link or merely changing the PATH variable.  It
+       also allows a developer to maintain multiple versions of 
+       <application>Qt4</application> for testing.
     </para>
 
@@ -198,28 +199,29 @@
      config.tests/unix/libmng/libmng.cpp &amp;&amp;
 
-./configure -confirm-license \
-            -opensource \
-            -release \
-            -prefix /usr \
-            -bindir /usr/lib/qt4/bin \
-            -headerdir /usr/include/qt4 \
-            -datadir /usr/share/qt4 \
-            -plugindir /usr/lib/qt4/plugins \
-            -importdir /usr/lib/qt4/imports \
+./configure -prefix         /usr                 \
+            -bindir         /usr/lib/qt4/bin     \
+            -plugindir      /usr/lib/qt4/plugins \
+            -importdir      /usr/lib/qt4/imports \
+            -headerdir      /usr/include/qt4     \
+            -datadir        /usr/share/qt4       \
+            -sysconfdir     /etc/xdg             \
+            -docdir         /usr/share/doc/qt4   \
+            -demosdir       /usr/share/doc/qt4/demos    \
+            -examplesdir    /usr/share/doc/qt4/examples \
             -translationdir /usr/share/qt4/translations \
-            -sysconfdir /etc/xdg \
-            -docdir /usr/share/doc/qt4 \
-            -demosdir /usr/share/doc/qt4/demos \
-            -examplesdir /usr/share/doc/qt4/examples \
-            -dbus-linked \
-            -openssl-linked \
-            -system-sqlite \
-            -no-phonon \
+            -confirm-license   \
+            -opensource        \
+            -release           \
+            -dbus-linked       \
+            -openssl-linked    \
+            -system-sqlite     \
+            -no-phonon         \
             -no-phonon-backend \
-            -no-nis \
-            -no-openvg \
-            -nomake demos \
-            -nomake examples \
-            -optimized-qmake &amp;&amp;
+            -no-nis            \
+            -no-openvg         \
+            -nomake demos      \
+            -nomake examples   \
+            -optimized-qmake   &amp;&amp;
+
 make</userinput></screen>
 
@@ -235,11 +237,11 @@
 rm -rf /usr/tests &amp;&amp;
 install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
-                  /usr/share/pixmaps/qt4logo.png &amp;&amp;
+                  /usr/share/pixmaps/qt4logo.png       &amp;&amp;
 install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
                   /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
 install -v -Dm644 tools/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt4.png &amp;&amp;
+                  /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
 install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt4.png &amp;&amp;
+                  /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
 install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
                   /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen>
@@ -276,5 +278,5 @@
 
     <para>
-      Install <application>Qt</application> in  /opt/qt-&qt4-version;
+      Install <application>Qt</application> in  /opt/qt-&qt4-version; 
       by running the following commands:
     </para>
@@ -416,7 +418,6 @@
 
       <para>
-        If you installed <application>Qt</application> in
-        <filename class="directory">/usr</filename>, create
-        an environment variable needed by certain packages.
+        If you installed <application>Qt</application> in /usr,
+        create an environment variable needed by certain packages.
         As the <systemitem class="username">root</systemitem> user:
       </para>
@@ -434,17 +435,15 @@
    <para>
       If you installed <application>Qt</application> in a location other
-      than <filename class="directory">/usr</filename>, you need to update
-      the following configuration files so that <application>Qt</application>
-      is correctly found by other packages and system processes.
-    </para>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user, update
+      than /usr, you need to update the following configuration files so
+      that <application>Qt</application> is correctly found by other packages
+      and system processes.</para>
+   
+      <para>As the <systemitem class="username">root</systemitem> user, update
       the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
       run-time cache file:
    </para>
-
+   
 <screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt addition
+   <literal># Begin Qt addition
    
 /opt/qt/lib
@@ -454,26 +453,26 @@
 
 ldconfig</userinput></screen>
-
+   
+   <indexterm zone="qt4 qtconfig-qt4">
+      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+   </indexterm>
+   
    <para>
       As the <systemitem class="username">root</systemitem> user, create
       the <filename>/etc/profile.d/qt.sh</filename> file:
    </para>
-
+   
 <screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt.sh
-
+   <literal># Begin /etc/profile.d/qt.sh
+   
 QTDIR=/opt/qt
-
+   
 pathappend /opt/qt/bin           PATH
 pathappend /opt/qt/lib/pkgconfig PKG_CONFIG_PATH
-
+   
 export QTDIR
-
+   
 # End /etc/profile.d/qt.sh</literal>
 EOF</userinput></screen>
-
-   <indexterm zone="qt4 qtconfig-qt4">
-      <primary sortas="e-etc-profile.d-qt.sh">/etc/profile.d/qt.sh</primary>
-   </indexterm>
 
       <para>
@@ -581,5 +580,5 @@
           /usr/lib/qt4,
           /usr/share/doc/qt4, and
-          /usr/share/qt4
+          /usr/share/qt4 (OR $QTDIR)
           (OR $QTDIR)
         </seg>
