Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision a8e9d06e9cb3728780968cb11ef45d119fabc957)
+++ x/lib/qt4.xml	(revision 61d5269cc318e70de68625db2b2e1c1eaf6d2551)
@@ -17,6 +17,6 @@
 
   <sect1info>
-    <othername>$LastChangedBy: randy $</othername>
-    <date>$Date: 2007-08-11 20:04:53 -0500 (Sat, 11 Aug 2007) $</date>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
   </sect1info>
 
@@ -31,5 +31,5 @@
 
     <para>The <application>Qt4</application> package contains several
-    <application>C++</application> libraries with both Gui and non-Gui
+    <application>C++</application> libraries with both GUI and non-GUI
     components.  One of the major users of <application>Qt4</application> is
     <application>KDE4</application>.</para>
@@ -82,20 +82,20 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/qt"/></para>
+    <ulink url="&blfs-wiki;/qt4"/></para>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Qt</title>
+    <title>Installation of Qt4</title>
 
     <para>There are several ways to install a complicated package such as
-    <application>Qt</application>. The files are not completely position
+    <application>Qt4</application>. The files are not completely position
     independent. Installation procedures execute the program
     <command>pkg-config</command> to determine the location of package
     executables, libraries, headers, and other files. For
-    <application>Qt</application>, <command>pkg-config</command> will look
-    for the appropriate files <filename>lib/pkgconfig/Qt*.pc</filename> which must be
-    modified if relocating the package. These files are set up correctly by
-    the build process.</para>
+    <application>Qt4</application>, <command>pkg-config</command> will look
+    for the appropriate <filename>lib/pkgconfig/Qt*.pc</filename> files which
+    must be modified if relocating the package. These files are set up correctly
+    by the build process.</para>
 
     <para>The default installation places the files in
@@ -113,8 +113,9 @@
 
     <note>
-      <para>If <application>Qt</application> is being reinstalled and the /usr
+      <para>If <application>Qt4</application> is being reinstalled and the
+      <filename class='directory'>/usr</filename>
       directory is used as the prefix, run the following commands from a
-      console or non-Qt based window manager.  It overwrites
-      <application>Qt</application> libraries that should not be in use during
+      console or non-Qt4 based window manager.  It overwrites
+      <application>Qt4</application> libraries that should not be in use during
       the install process.</para>
     </note>
@@ -122,10 +123,10 @@
     <note>
       <para>The build time and space required for the full
-      <application>Qt</application> is quite long.  The instructions below do
-      not build the tutorials and examples.  Removing the -nomake lines will
-      create a complete build.</para>
+      <application>Qt4</application> is quite long.  The instructions below do
+      not build the tutorials and examples.  Removing the 
+      <parameter>-nomake</parameter> lines will create a complete build.</para>
     </note>
 
-    <para>The method recommended by the <application>Qt</application>
+    <para>The method recommended by the <application>Qt4</application>
     developers does not use the /usr directory prefix. It has the advantage of
     keeping all the package files consolidated in a dedicated directory
@@ -134,11 +135,12 @@
     by changing one symbolic link.</para>
 
-    <para>The <application>Qt</application> developers use a default location
-    of <filename class='directory'>/usr/local/qt/</filename>, however this
-    procedure puts the files in <filename
+    <para>The <application>Qt4</application> developers use a default location
+    of <filename class='directory'>/usr/local/qt/</filename>, however the
+    procedure below puts the files in <filename
     class='directory'>/opt/qt-&qt4-version;/</filename>
     and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
 
-    <para>Build with:</para>
+    <para>Install <application>Qt4</application> by running the
+    following commands:</para>
 
 <screen><userinput>./configure -prefix /opt/qt-&qt4-version;  \
@@ -156,6 +158,6 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you installed <application>Qt</application> in the /opt directory,
-    again as the <systemitem class="username">root</systemitem> user:</para>
+    <para>If you installed <application>Qt4</application> in the /opt directory,
+    again as the <systemitem class="username">root</systemitem> user issue:</para>
 
 <screen role="root"><userinput>ln -v -sfn qt-&qt4-version; /opt/qt</userinput></screen>
@@ -168,10 +170,10 @@
     <para><parameter>-release, -no-separate-debug-info</parameter>: These
     switches minimizes the time and space used to build
-    <application>Qt</application> by not adding debug information to the
+    <application>Qt4</application> by not adding debug information to the
     libraries.</para>
 
     <para><parameter>-nomake examples, -nomake demos</parameter>: 
     These switches disable building programs that are only of interest
-    to a <application>Qt</application> developer.</para>
+    to a <application>Qt4</application> developer.</para>
 
     <para>There are several optional directories that can be specified in the
@@ -184,5 +186,5 @@
     <para><parameter>-plugin-sql-<replaceable>&lt;driver&gt;</replaceable></parameter> 
     or <parameter>-qt-sql-<replaceable>&lt;driver&gt;</replaceable></parameter>:
-    These switches build SQL support into the <application>Qt</application>
+    These switches build SQL support into the <application>Qt4</application>
     libraries.</para>
 
@@ -197,12 +199,12 @@
 
   <sect2 role="configuration">
-    <title>Configuring Qt</title>
+    <title>Configuring Qt4</title>
 
     <sect3 id='qt4-config'>
       <title>Configuration Information</title>
 
-      <para>If you installed <application>Qt</application> in a location other
+      <para>If you installed <application>Qt4</application> in a location other
       than /usr, you also need to update the following configuration files so
-      that <application>Qt</application> is correctly found by other packages
+      that <application>Qt4</application> is correctly found by other packages
       and system processes.</para>
 
@@ -240,5 +242,5 @@
 <screen><literal>PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig</literal></screen>
 
-      <para>If you want the <application>Qt</application> executables in your
+      <para>If you want the <application>Qt4</application> executables in your
       shell search path, update the <envar>PATH</envar> environment variable
       in your <filename>~/.bash_profile</filename> or
@@ -269,5 +271,5 @@
         libQtDesigner.so, libQtDesignerComponents.so, libQtGui.so,
         libQtNetwork.so, libQtOpenGL.so, libQtScript.so, libQtSql.so,
-        libQtSvg.so, libQtTest.so, andlibQtXml.so</seg>
+        libQtSvg.so, libQtTest.so, and libQtXml.so</seg>
         
         <seg>/opt/qt-&qt4-version;</seg>
@@ -307,5 +309,5 @@
         <listitem>
           <para>provides support for translating applications into
-          local languages. </para>
+          local languages.</para>
           <indexterm zone="qt4 qt4-linguist">
             <primary sortas="b-linguist">linguist</primary>
@@ -373,5 +375,5 @@
         <term><command>qt3to4</command></term>
         <listitem>
-          <para>qt3to4 is a tool to help update qt3 code to qt4.</para>
+          <para>qt3to4 is a tool to help update Qt3 code to Qt4.</para>
           <indexterm zone="qt4 qt4-qt3to4">
             <primary sortas="b-qt3to4">qt3to4</primary>
@@ -424,7 +426,7 @@
         <term><command>uic3</command></term>
         <listitem>
-          <para>is a tool to generate Qt 4 code out of  
-          user interface files genereated byt the Qt3 
-          version of designer.</para>
+          <para>is a tool to generate Qt4 code out of  
+          user interface files generated by the Qt3 
+          version of <command>designer</command>.</para>
           <indexterm zone="qt4 qt4-uic3">
             <primary sortas="b-uic3">uic3</primary>
