Index: general.ent
===================================================================
--- general.ent	(revision 2c06b85f4a0d9d27d1a8f4298e3f6ca903b2ab8e)
+++ general.ent	(revision af689bc3578102bb1ccdb25c69e0aa4e471ecb99)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "April &day;nd, &year;">
+<!ENTITY releasedate  "April &day;rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2c06b85f4a0d9d27d1a8f4298e3f6ca903b2ab8e)
+++ introduction/welcome/changelog.xml	(revision af689bc3578102bb1ccdb25c69e0aa4e471ecb99)
@@ -43,4 +43,13 @@
 
     <listitem>
+      <para>April 3rd, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Minor tweaks to the Xulrunner instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 2nd, 2010</para>
       <itemizedlist>
Index: x/lib/xulrunner.xml
===================================================================
--- x/lib/xulrunner.xml	(revision 2c06b85f4a0d9d27d1a8f4298e3f6ca903b2ab8e)
+++ x/lib/xulrunner.xml	(revision af689bc3578102bb1ccdb25c69e0aa4e471ecb99)
@@ -35,5 +35,5 @@
     codebase.  In particular, it provides the gecko engine together with pkgconfig
     files so that applications such as <application>Epiphany</application> and
-    <application>Yelp</application> can use it.</para>
+    <application>Yelp</application> can find and use it.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -44,13 +44,13 @@
       <listitem>
         <para>Download (FTP): <ulink url="&xulrunner-download-ftp;"/></para>
-	<tip><para>When a new version of <application>firefox</application> is
+	<tip><para>When a new version of <application>Firefox</application> is
 	released, sometimes a corresponding new version of
-	<application>xulrunner</application> appears at the same time. At other
+	<application>Xulrunner</application> appears at the same time. At other
 	times it appears several days later or not at all. So far in the
-	<application>firefox-3.x</application> series, every new release has
+	<application>Firefox-3.x</application> series, every new release has
 	created xulrunner libraries with a corresponding new version. Whenever
-	a separate xulrunner tarball has been released, it has been bitwise
-	identical to the corresponding firefox tarball. So, we will use the
-	<application>firefox</application> tarball to save downloading this
+	a separate Xulrunner tarball has been released, it has been bitwise
+	identical to the corresponding Firefox tarball. Use the
+	<application>Firefox</application> tarball to save downloading this
 	large package twice.</para></tip>
       </listitem>
@@ -109,9 +109,10 @@
     <xref linkend="lcms"/>,
     <xref linkend="libpng"/> (patched for apng support),
+    <!-- Redundant as NSS requires this
     <xref linkend="nspr"/> (recommended if you build any other Mozilla.org
-    packages),
+    packages), -->
     <xref linkend="nss"/> (recommended if you build any other Mozilla.org
     packages),
-    <xref linkend="startup-notification"/>.
+    <xref linkend="startup-notification"/>,
     <xref linkend="unzip"/>,
     <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing the
@@ -137,7 +138,8 @@
     can find it at
     <ulink url="&files-anduin;/xulrunner-&xulrunner-version;-mozconfig"/>
-    (the file must be installed in the root of the source tree
-    <filename class='directory'>mozilla</filename> directory, and named
-    <filename>.mozconfig</filename>).</para>
+    (the file must be installed in the root of the source tree,
+    <!-- directory name changes depending on version of Xulrunner
+    <filename class='directory'>mozilla</filename> directory,--> and named
+    <filename>.mozconfig</filename> or <filename>mozconfig</filename>).</para>
 
 <screen><?dbfo keep-together="auto"?><userinput>cat &gt; .mozconfig &lt;&lt; "EOF"
@@ -151,9 +153,9 @@
 # options, such as '--with-system-bz2', do not affect the build.
 
-# specify that we want to build xulrunner
+# specify that Xulrunner should be built.
 ac_add_options --enable-application=xulrunner
 
-# Create an object directory and specify to build the package in that
-# directory. If desired, modify the location of the object directory
+# Build the package in an object directory as recommended by the developers.
+# If desired, modify the location of the object directory
 # to a directory inside the source tree by removing '../' from the
 # line below.
@@ -165,5 +167,5 @@
 ac_add_options --prefix=/usr
 
-# apply a minimal level of optimization (-O)
+# apply the default optimizations recommended by the developers (-O)
 ac_add_options --enable-optimize
 
@@ -180,5 +182,5 @@
 
 # Comment this only if you want to use whatever patched version of cairo
-# is in the shipped mozilla tree, together with the system headers.
+# is in the shipped Mozilla tree, together with the system headers.
 ac_add_options --enable-system-cairo
 
@@ -211,12 +213,12 @@
 ac_add_options --disable-accessibility
 
-# Uncomment this if you did not build curl.
+# Uncomment this if you did not build cURL.
 #ac_add_options --disable-crashreporter
 
-# Comment this if you have built dbus-glib.
+# Comment this if you have built D-Bus-GLib.
 ac_add_options --disable-dbus
 
-# Comment this if you have gnome-vfs and libgnomeui, and wish to
-# integrate xulrunner into your gnome desktop
+# Comment this if you have Gnome-VFS and libgnomeui, and wish to
+# integrate Xulrunner into your Gnome desktop.
 ac_add_options --disable-gnomevfs
 
@@ -233,14 +235,10 @@
 ac_add_options --disable-javaxpcom
 
-# This option is added so that test libraries and programs are not
-# built. These would only be required for debugging purposes.
+# This option is added so that test libraries and programs used for debugging
+# are not built.
 ac_add_options --disable-tests
 
 # Disable the updater, which is not appropriate if you build from source
 ac_add_options --disable-updater
-
-# (options to add extra parts of the package)
-# Use the anti-phishing measures (a blacklist of sites).
-ac_add_options --enable-safe-browsing
 
 # This option is used so that the debugging symbols are removed from
@@ -251,4 +249,8 @@
 ac_add_options --enable-strip
 
+# (Options to add extra parts of the package)
+# Use the anti-phishing measures (a blacklist of sites).
+ac_add_options --enable-safe-browsing
+
 # Uncomment this option if you desire support for dual-monitor
 # display using the X-Window Xinerama libraries.
@@ -257,5 +259,5 @@
 # This option identifies the default binary directory of the Xulrunner
 # installation and is used to locate Xulrunner's installed files. This
-# option is is only used for development purposes.
+# option is only used for development purposes.
 #ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-&xulrunner-version;</literal>
 
@@ -268,5 +270,5 @@
 <screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-provide_system_nss_nspr-1.patch</userinput></screen>
 
-    <para>Compile <application>Xulrunner</application> by issuing the
+    <para>Install <application>Xulrunner</application> by issuing the
     following commands:</para>
 
@@ -278,13 +280,14 @@
     <para>This package does not come with a test suite.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user,
-    install the package:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make -f client.mk install &amp;&amp;
-mkdir /usr/lib/mozilla &amp;&amp;
-ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins \
-    /usr/lib/mozilla/plugins &amp;&amp;
-chown -R root:root /usr/lib/xulrunner-* /usr/bin/xulrunner &amp;&amp;
-ln -sfv xulrunner-devel-&xulrunner-version;/lib/lib{xul,xpcom,mozjs}.so /usr/lib</userinput></screen>
+install -v -m644    /usr/lib/mozilla &amp;&amp;
+ln -sv              /usr/lib/xulrunner-&xulrunner-version;/plugins \
+                    /usr/lib/mozilla &amp;&amp;
+chown -Rv root:root /usr/lib/xulrunner-* \
+                    /usr/bin/xulrunner &amp;&amp;
+ln -sfv             xulrunner-devel-&xulrunner-version;/lib/lib{xul,xpcom,mozjs}.so \
+                    /usr/lib</userinput></screen>
 
     <para>If you've elected to use the included NSPR and NSS, while still the 
@@ -296,5 +299,5 @@
     libplds4.so libplc4.so libnspr4.so
 do
-    ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib/$DL
+    ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib
 done</userinput></screen>
 
@@ -304,7 +307,8 @@
     <title>Command Explanations</title>
 
-    <para><command>echo "Requires: nspr" >>xulrunner/installer/libxul-embedding.pc.in</command>
-    : If you try to build <application>Yelp</application> without this, the
-    prtypes header from nspr will not be found.  It is arguable whose error this
+    <para><command>echo "Requires: nspr"
+    >>xulrunner/installer/libxul-embedding.pc.in</command>: If you try to build
+    <application>Yelp</application> without this, the
+    prtypes header from NSPR will not be found.  It is arguable whose error this
     is (the code presumably works on earlier geckos), but this fix is unlikely
     to cause any damage in other packages.</para>
@@ -320,20 +324,23 @@
     the package.</para>
 
-    <para><command>for DL in ...</command>: The nspr and nss libraries shipped
-    with this package are installed into /usr/lib/xulrunner-&xulrunner-version;
+    <para><command>for DL in ...</command>: The NSPR and NSS libraries shipped
+    with this package are installed into
+    <filename class='directory'>/usr/lib/xulrunner-&xulrunner-version;</filename>
     which means they will not be found at runtime.  By using symbolic links from
-    <filename class="directory">/usr/lib</filename> they will be found and we can
-    easily change the links to point to a newer version when we upgrade.</para>
+    <filename class="directory">/usr/lib</filename> the libraries will be found
+    and the links can be easily changed to point to a newer version during an
+    upgrade.</para>
 
     <para><command>ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins
-    /usr/lib/mozilla/plugins</command>: Some packages will install browser plugins
-    into /usr/lib/mozilla/plugins. By creating this as a symlink to the basic
-    plugins we keep them all together.</para>
-
-   <tip>
-    <para>When you upgrade xulrunner, remember to update the symlinks and to
-    copy any additional plugins compiled agaisnt this series of xulrunner to the
-    new plugin directory.</para>
-   </tip>
+    /usr/lib/mozilla</command>: Some packages will install browser plugins
+    into <filename class='directory'>/usr/lib/mozilla/plugins</filename>.
+    Creating this as a symlink to the <application>Xulrunner</application>
+    plugins keeps additional plugins in a common directory.</para>
+
+   <note>
+     <para>When you upgrade Xulrunner, remember to update the symlinks and to
+     copy any additional plugins compiled against this series of Xulrunner to the
+     new plugin directory.</para>
+   </note>
 
   </sect2>
