Index: general.ent
===================================================================
--- general.ent	(revision dfdc10ba1c750702d39a7777b57acff47f43f575)
+++ general.ent	(revision c1ae13c63c47a732ca046828a588195f71eb3287)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "13">                   <!-- Always 2 digits -->
+<!ENTITY day          "14">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 13th, &year;">
+<!ENTITY releasedate  "March 14th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -621,5 +621,5 @@
 <!ENTITY goffice-version              "0.8.17">
 <!ENTITY mesalib-version              "7.9">
-<!ENTITY xulrunner-version            "10.0.2">
+<!ENTITY xulrunner-version            "11.0">
 <!ENTITY webkitgtk-version            "1.6.1">
 <!ENTITY libsexy-version              "0.1.11">
@@ -894,5 +894,5 @@
 <!ENTITY seamonkey-version            "2.7.2">
 <!-- Don't forget xulrunner -->
-<!ENTITY firefox-version              "10.0.2">
+<!ENTITY firefox-version              "11.0">
 
 <!-- Obsolete
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision dfdc10ba1c750702d39a7777b57acff47f43f575)
+++ introduction/welcome/changelog.xml	(revision c1ae13c63c47a732ca046828a588195f71eb3287)
@@ -46,4 +46,13 @@
       <itemizedlist>
         <listitem>
+          <para>[abenton] - Firefox/Xulrunner 11.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>March 13th, 2012</para>
+      <itemizedlist>
+        <listitem>
           <para>[bdubbs] - Updates to initramfs scripts.</para>
         </listitem>
Index: x/lib/xulrunner.xml
===================================================================
--- x/lib/xulrunner.xml	(revision dfdc10ba1c750702d39a7777b57acff47f43f575)
+++ x/lib/xulrunner.xml	(revision c1ae13c63c47a732ca046828a588195f71eb3287)
@@ -10,6 +10,6 @@
   "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!-- md5sum and size should match firefox, but the buildsize and time will differ -->
-  <!ENTITY xulrunner-md5sum        "5ce038d591964f72c534fa33b75a62f5">
-  <!ENTITY xulrunner-size          "72 MB">
+  <!ENTITY xulrunner-md5sum        "4b07acf47857aff72776d805409cdd1b">
+  <!ENTITY xulrunner-size          "75 MB">
   <!ENTITY xulrunner-buildsize     "2.6 GB (440 MB installed)">
   <!ENTITY xulrunner-time          "22 SBU">
@@ -33,11 +33,11 @@
     <title>Introduction to Xulrunner</title>
 
-    <para><application>Xulrunner</application> is a runtime environment for XUL
-    applications, and forms the major part of the
-    <application>Mozilla</application> codebase. In particular, it provides the
-    gecko engine together with pkgconfig files so that applications such as
-    <application>Yelp</application> can find and use it.  However, be aware that
-    Gnome applications are transitioning to <application>Webkit</application>
-    instead of gecko.</para>
+    <para>
+      <application>Xulrunner</application> is a runtime environment for XUL
+      applications, and forms the major part of the
+      <application>Mozilla</application> codebase. In particular, it provides
+      the Gecko engine together with pkgconfig files so that other applications
+      can find and use it.
+    </para>
 
     &lfs71_checked;
@@ -46,20 +46,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&xulrunner-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xulrunner-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xulrunner-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xulrunner-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xulrunner-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xulrunner-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&xulrunner-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xulrunner-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xulrunner-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xulrunner-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xulrunner-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xulrunner-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -68,35 +80,49 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="alsa-lib"/>, <xref linkend="gtk2"/>,
-    <xref linkend="zip"/> and <xref linkend="unzip"/>.</para>
-
-    <para>Note: <application>libjpeg</application> and
-    <application>libpng</application> (patched for apng support) should have
-    been installed before <application>gdk-pixbuf</application> and should
-    exist on your system. If for some strange reason you haven't installed
-    them, you should remove the <option>--with-system-jpeg</option> and
-    <option>--with-system-png</option> options from the
-    <filename>mozconfig</filename> file created below.</para>
+    <para role="required">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="zip"/> and
+      <xref linkend="unzip"/>.
+    </para>
+
+    <para>
+      Note: <application>libjpeg</application> and
+      <application>libpng</application> (patched for apng support) should have
+      been installed before <application>gdk-pixbuf</application> and should
+      exist on your system. If for some strange reason you haven't installed
+      them, you should remove the <option>--with-system-jpeg</option> and
+      <option>--with-system-png</option> options from the
+      <filename>mozconfig</filename> file created below.
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="yasm"/> or
-    <xref linkend="libvpx"/>.</para>
+    <para role="recommended">
+      <xref linkend="yasm"/> or <xref linkend="libvpx"/>
+      (to allow <application>Xulrunner</application> to play webm videos).
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="dbus-glib"/>,
-    <xref linkend="startup-notification"/>, <xref linkend="sqlite"/>,
-    <ulink url="http://www.webmproject.org/code/">libvpx</ulink>,
-    <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
-    <ulink url="http://libevent.org/">Libevent</ulink>,
-    <xref linkend="doxygen"/>,
-    <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/> (for gnome
-    integration), <xref linkend="libnotify"/>, <xref linkend="nspr"/>,
-    <xref linkend="nss"/>, <xref linkend="unzip"/>,
-    <xref linkend="wireless_tools"/>,
-    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
-    the jemalloc code) and <xref linkend="wget"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xulrunner"/></para>
+    <para role="optional">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="startup-notification"/>,
+      <xref linkend="sqlite"/>,
+      <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
+      <ulink url="http://libevent.org/">Libevent</ulink>,
+      <xref linkend="doxygen"/>,
+      <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/> (for
+      integration with the old version of <application>Gnome</application>),
+      <xref linkend="libnotify"/>,
+      <xref linkend="nspr"/>,
+      <xref linkend="nss"/>,
+      <xref linkend="wireless_tools"/>,
+      <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
+      the jemalloc code) and
+      <xref linkend="wget"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/xulrunner"/>
+    </para>
   </sect2>
 
@@ -104,11 +130,13 @@
     <title>Installation of Xulrunner</title>
 
-    <para>The configuration of <application>Xulrunner</application> is
-    accomplished by creating a <filename>mozconfig</filename> file containing
-    the desired configuration options. A default <filename>mozconfig</filename>
-    is created below. To see the entire list of available configuration options
-    (and an abbreviated description of each one), issue
-    <command>./configure --help</command>. You should review the entire file
-    and comment or uncomment options as necessary.</para>
+    <para>
+      The configuration of <application>Xulrunner</application> is accomplished
+      by creating a <filename>mozconfig</filename> file containing the desired
+      configuration options. A default <filename>mozconfig</filename> is created
+      below. To see the entire list of available configuration options (and an
+      abbreviated description of each one), issue <command>./configure
+      --help</command>. You should review the entire file and comment or
+      uncomment options as necessary.
+    </para>
 
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
@@ -156,6 +184,8 @@
 EOF</userinput></screen>
 
-    <para>Install <application>Xulrunner</application> by issuing the
-    following commands:</para>
+    <para>
+      Install <application>Xulrunner</application> by issuing the following
+      commands:
+    </para>
 
 <screen><userinput>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure &amp;&amp;
@@ -163,8 +193,11 @@
 make -f client.mk</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make -C xulrunner-build-dir install &amp;&amp;
@@ -174,9 +207,11 @@
 chown -Rv root:root /usr/{include,lib,share/idl}/xulrunner-*</userinput></screen>
 
-    <para>If you elected to use the included NSPR and NSS (ie, if you have
-    <emphasis>not</emphasis> installed <xref linkend="nspr"/> and
-    <xref linkend="nss"/>), while still the
-    <systemitem class="username">root</systemitem> user, complete the
-    installation with the following commands:</para>
+    <para>
+      If you elected to use the included NSPR and NSS (ie, if you have
+      <emphasis>not</emphasis> installed <xref linkend="nspr"/> and
+      <xref linkend="nss"/>), while still the
+      <systemitem class="username">root</systemitem> user, complete the
+      installation with the following commands:
+    </para>
 
 <screen role="root"><userinput>for DL in libnss3.so libnssutil3.so libsmime3.so \
@@ -190,40 +225,48 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's#VPX_CODEC_USE ...</command>: This fixes
-    <application>Xulrunner's</application> <command>configure</command>
-    script to properly detect libvpx-v1.0.0. It is not needed if you have
-    libvpx-v0.9.7 or earlier installed or if you've not installed
-    <xref linkend="libvpx"/>.</para>
-
-    <para><command>sed ... Requires: nspr</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>
-
-    <para><command>make -f client.mk ...</command>: Mozilla products are
-    packaged to allow the use of a configuration file which can be used to
-    pass the configuration settings to the <command>configure</command>
-    command. <command>make</command> uses the <filename>client.mk</filename>
-    file to get initial configuration and setup parameters.</para>
-
-    <para><command>ln -sv ../mozilla/plugins ...</command>: Some packages will
-    install browser plugins into
-    <filename class="directory">/usr/lib/mozilla/plugins</filename>.
-    Creating this symlink <application>Xulrunner</application> keeps additional
-    plugins in a common directory.</para>
-
-    <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> the libraries will be
-    found and the links can be easily changed to point to a newer version
-    during an upgrade.</para>
-
-   <note>
-     <para>When you upgrade Xulrunner, remember to update the symlinks.</para>
-   </note>
+    <para>
+      <command>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION ...</command>: This fixes
+      <application>Xulrunner's</application> <command>configure</command>
+      script to properly detect <xref linkend="libvpx"/>. It is not needed if
+      you have libvpx-v0.9.7 or earlier installed or if you've not installed
+      <application>Libvpx</application>.
+        </para>
+
+    <para>
+      <command>sed ... Requires: nspr</command>: If you try to build some other
+      applications without this, the prtypes header from NSPR will not be found.
+    </para>
+
+    <para>
+      <command>make -f client.mk ...</command>: Mozilla products are packaged to
+      allow the use of a configuration file which can be used to pass the
+      configuration settings to the <command>configure</command> command.
+      <command>make</command> uses the <filename>client.mk</filename> file to
+      get initial configuration and setup parameters.
+    </para>
+
+    <para>
+      <command>ln -sv ../mozilla/plugins ...</command>: Some packages will
+      install browser plugins into
+      <filename class="directory">/usr/lib/mozilla/plugins</filename>.
+      Creating this symlink <application>Xulrunner</application> keeps
+      additional plugins in a common directory.
+    </para>
+
+    <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> the libraries will be
+      found and the links can be easily changed to point to a newer version
+      during an upgrade.
+    </para>
+
+    <note>
+      <para>
+        When you upgrade Xulrunner, remember to update the symlinks.
+      </para>
+    </note>
   </sect2>
 
@@ -256,6 +299,7 @@
         <term><command>xulrunner</command></term>
         <listitem>
-          <para>is a shell script, useful for identifying the version
-          installed.</para>
+          <para>
+            is a shell script, useful for identifying the version installed.
+          </para>
           <indexterm zone="xulrunner xulrunner-prog">
             <primary sortas="b-xulrunner">xulrunner</primary>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision dfdc10ba1c750702d39a7777b57acff47f43f575)
+++ xsoft/graphweb/firefox.xml	(revision c1ae13c63c47a732ca046828a588195f71eb3287)
@@ -9,6 +9,6 @@
   <!ENTITY firefox-download-ftp
   "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY firefox-md5sum        "5ce038d591964f72c534fa33b75a62f5">
-  <!ENTITY firefox-size          "72 MB">
+  <!ENTITY firefox-md5sum        "4b07acf47857aff72776d805409cdd1b">
+  <!ENTITY firefox-size          "75 MB">
   <!ENTITY firefox-buildsize     "3 GB (33 MB installed)">
   <!ENTITY firefox-time          "24 SBU (or 0.3 SBU if you're building against
@@ -33,6 +33,8 @@
     <title>Introduction to Firefox</title>
 
-    <para><application>Firefox</application> is a stand-alone browser
-    based on the <application>Mozilla</application> codebase.</para>
+    <para>
+      <application>Firefox</application> is a stand-alone browser based on the
+      <application>Mozilla</application> codebase.
+    </para>
 
     &lfs71_checked;
@@ -41,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&firefox-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&firefox-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &firefox-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &firefox-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &firefox-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &firefox-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&firefox-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&firefox-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &firefox-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &firefox-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &firefox-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &firefox-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -63,36 +77,52 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="alsa-lib"/>, <xref linkend="gtk2"/>,
-    <xref linkend="zip"/> and <xref linkend="unzip"/>.</para>
-
-    <para>Note: <application>libjpeg</application> and
-    <application>libpng</application> (patched for apng support) should have
-    been installed before <application>gdk-pixbuf</application> and should
-    exist on your system. If for some strange reason you haven't installed
-    them, you should remove the <option>--with-system-jpeg</option> and
-    <option>--with-system-png</option> options from the
-    <filename>mozconfig</filename> file created below.</para>
+    <para role="required">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="zip"/> and
+      <xref linkend="unzip"/>.
+    </para>
+
+    <para>
+      Note: <application>libjpeg</application> and
+      <application>libpng</application> (patched for apng support) should have
+      been installed before <application>gdk-pixbuf</application> and should
+      exist on your system. If for some strange reason you haven't installed
+      them, you should remove the <option>--with-system-jpeg</option> and
+      <option>--with-system-png</option> options from the
+      <filename>mozconfig</filename> file created below.
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="yasm"/> or
-    <xref linkend="libvpx"/> (to allow <application>Firefox</application> to
-    play webm videos).</para>
+    <para role="recommended">
+      <xref linkend="yasm"/> or <xref linkend="libvpx"/>
+      (to allow <application>Firefox</application> to play webm videos).
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="dbus-glib"/>,
-    <xref linkend="startup-notification"/>, <xref linkend="sqlite"/>,
-    <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
-    <ulink url="http://libevent.org/">Libevent</ulink>,
-    <xref linkend="doxygen"/>, <xref linkend="gnome-vfs"/> and
-    <xref linkend="libgnomeui"/> (for gnome integration),
-    <xref linkend="libnotify"/>, <xref linkend="nspr"/>, <xref linkend="nss"/>,
-    <xref linkend="xulrunner"/> (linking against an installed xulrunner makes
-    Firefox about 32 MB smaller, which is trivial compared to the size of
-    xulrunner), <xref linkend="wireless_tools"/>,
-    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
-    the jemalloc code) and <xref linkend="wget"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/firefox"/></para>
+    <para role="optional">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="startup-notification"/>,
+      <xref linkend="sqlite"/>,
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
+      <ulink url="http://libevent.org/">Libevent</ulink>,
+      <xref linkend="doxygen"/>,
+      <xref linkend="gnome-vfs"/> and
+      <xref linkend="libgnomeui"/> (for integration with the old version of
+      <application>Gnome</application>),
+      <xref linkend="libnotify"/>,
+      <xref linkend="nspr"/>, <xref linkend="nss"/>,
+      <xref linkend="xulrunner"/> (linking against an installed xulrunner makes
+      Firefox about 32 MB smaller, which is trivial compared to the size of
+      xulrunner),
+      <xref linkend="wireless_tools"/>,
+      <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
+      the jemalloc code) and
+      <xref linkend="wget"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/firefox"/>
+    </para>
   </sect2>
 
@@ -100,12 +130,14 @@
     <title>Installation of Firefox</title>
 
-    <para>The configuration of <application>Firefox</application> is
-    accomplished by creating a <filename>mozconfig</filename> file containing
-    the desired configuration options. A default <filename>mozconfig</filename>
-    is created below. To see the entire list of available configuration options
-    (and an abbreviated description of each one), issue
-    <command>./configure --help</command>. You may also wish to review the
-    entire file and uncomment any other desired options. Create the file by
-    issuing the following command:</para>
+    <para>
+      The configuration of <application>Firefox</application> is accomplished by
+      creating a <filename>mozconfig</filename> file containing the desired
+      configuration options. A default <filename>mozconfig</filename> is created
+      below. To see the entire list of available configuration options (and an
+      abbreviated description of each one), issue <command>./configure
+      --help</command>. You may also wish to review the entire file and
+      uncomment any other desired options. Create the file by issuing the
+      following command:
+    </para>
 
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
@@ -160,6 +192,8 @@
 EOF</userinput></screen>
 
-    <para>Compile <application>Firefox</application> by issuing the
-    following commands:</para>
+    <para>
+      Compile <application>Firefox</application> by issuing the following
+      commands:
+    </para>
 
 <screen><userinput>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure &amp;&amp;
@@ -167,17 +201,22 @@
 make -f client.mk</userinput></screen>
 
-    <para>If you have <emphasis>not</emphasis> linked
-    <application>Firefox</application> against an installed
-    <application>Xulrunner</application>:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      If you have <emphasis>not</emphasis> linked
+      <application>Firefox</application> against an installed
+      <application>Xulrunner</application>:
+    </para>
 
 <screen><userinput>make -C firefox-build-dir/browser/installer</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, if you have <emphasis>not</emphasis> linked
-    <application>Firefox</application> against an installed
-    <application>Xulrunner</application>, as the
-    <systemitem class="username">root</systemitem> user, install the
-    package:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user, if you
+      have <emphasis>not</emphasis> linked <application>Firefox</application>
+      against an installed <application>Xulrunner</application>, install the
+      package:
+    </para>
 
 <screen role="root"><userinput>mkdir /usr/lib/firefox-&firefox-version; &amp;&amp;
@@ -188,7 +227,9 @@
 chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
 
-    <para>If you <emphasis>have</emphasis> linked against an already installed
-    <application>Xulrunner</application>, as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you <emphasis>have</emphasis> linked against an already installed
+      <application>Xulrunner</application>, as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make -C firefox-build-dir install &amp;&amp;
@@ -207,43 +248,68 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's#VPX_CODEC_USE ...</command>: This fixes
-    <application>Firefox's</application> <command>configure</command>
-    script to properly detect libvpx-v1.0.0. It is not needed if you have
-    libvpx-v0.9.7 or earlier installed or if you've not installed
-    <xref linkend="libvpx"/>.</para>
-
-    <para><command>sed -i 's# ""##' browser/base/Makefile.in</command>: This
-    sed removes an unprintable control character from the title bar.</para>
-
-    <para><command>make -f client.mk ...</command>: Mozilla products are
-    packaged to allow the use of a configuration file which can be used to
-    pass the configuration settings to the <command>configure</command>
-    command. <command>make</command> uses the <filename>client.mk</filename>
-    file to get initial configuration and setup parameters.</para>
-
-    <para><command>make -C firefox-build-dir/browser/installer</command>:
-    this creates a <application>Firefox</application> tarball.</para>
-
-    <para><command>tar -xfv firefox-build-dir/dist ...</command>: This untars
-    <application>Firefox</application> in /usr/lib. The
-    <option>--strip-components=1</option> option removes the leading
-    'firefox' directory from the filenames, allowing us to untar it
-    into a versioned directory. Untaring it (instead of running make install)
-    prevents it installing /usr/lib/firefox-devel-&firefox-version; which
-    contains about 430 MB of files. If you need any of those files,
-    they're in <xref linkend="xulrunner"/></para>
-
-    <para><command>make -C firefox-build-dir install</command>: This runs
-    <command>make install</command> in firefox-build-dir.</para>
-
-    <para><command>ln -sfv ... /usr/bin/firefox</command>: this puts a symbolic
-    link to the <command>firefox</command> executable in your ${PATH}.</para>
-
-    <para><command>mkdir -p /usr/lib/mozilla/plugins</command>: this checks
-    that /usr/lib/mozilla/plugins exists (if you installed
-    <xref linkend="librsvg"/>, it was probably already there).</para>
-
-    <para><command>ln -sv ... /usr/lib/firefox-&firefox-version;</command>:
-    this makes a symbolic link to /usr/lib/mozilla/plugins.</para>
+    <para>
+      <command>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION ...</command>: This fixes
+      <application>Firefox's</application> <command>configure</command>
+      script to properly detect <xref linkend="libvpx"/>. It is not needed if
+      you have libvpx-v0.9.7 or earlier installed or if you've not installed
+      <application>Libvpx</application>.
+    </para>
+
+    <para>
+      <command>sed -i 's# ""##' browser/base/Makefile.in</command>: This sed
+      removes an unprintable control character from the title bar.
+    </para>
+
+    <para>
+      <command>make -f client.mk ...</command>: Mozilla products are packaged to
+      allow the use of a configuration file which can be used to pass the
+      configuration settings to the <command>configure</command> command.
+      <command>make</command> uses the <filename>client.mk</filename> file to
+      get initial configuration and setup parameters.
+    </para>
+
+    <para>
+      <command>make -C firefox-build-dir/browser/installer</command>: this
+      creates a <application>Firefox</application> tarball similar to the ones
+      you can download from Mozilla.
+    </para>
+
+    <para>
+      <command>tar -xfv firefox-build-dir/dist ...</command>: This untars
+      <application>Firefox</application> in /usr/lib. The
+      <option>--strip-components=1</option> option removes the leading
+      'firefox' directory from the filenames, allowing us to untar it
+      into a versioned directory. Untaring it (instead of running make install)
+      prevents it installing
+      <filename class="directory">/usr/lib/firefox-devel-&firefox-version;</filename>
+      which contains about 430 MB of files. If you need any of those files,
+      they're in <xref linkend="xulrunner"/>
+    </para>
+
+    <para>
+      <command>make -C firefox-build-dir install</command>: This runs
+      <command>make install</command> in firefox-build-dir.
+    </para>
+
+    <para>
+      <command>ln -sfv ... /usr/bin/firefox</command>: this puts a symbolic link
+      to the <command>firefox</command> executable in your ${PATH}.
+    </para>
+
+    <para>
+      <command>mkdir -p /usr/lib/mozilla/plugins</command>: this checks
+      that <filename class="directory">/usr/lib/mozilla/plugins</filename>
+      exists.
+    </para>
+
+    <para>
+      <command>ln -sv ... /usr/lib/firefox-&firefox-version;</command>: this
+      makes a symbolic link to
+      <filename class="directory">/usr/lib/mozilla/plugins</filename>. It's not
+      really needed, <application>Firefox</application> checks
+      <filename class="directory">/usr/lib/mozilla/plugins</filename> by
+      default, we make the symbolic link to keep all the plugins installed in
+      one folder.
+    </para>
   </sect2>
 
@@ -251,18 +317,21 @@
     <title>Configuring Firefox</title>
 
-    <para>If you deleted the <option>--disable-webm</option> option from your
-    <filename>mozconfig</filename>, your <application>Firefox</application>
-    can play most YouTube videos without the need for the flash plugin. To
-    enable this, go to <ulink
-    url="http://www.youtube.com/html5">http://www.youtube.com/html5</ulink>
-    and click on 'Join the HTML5 Trial' (needs cookies enabled).</para>
-
-    <para>If you use a desktop environment like <application>Gnome</application>
-    or <application>KDE</application> you may like to create a
-    <filename>firefox.desktop</filename> file so that
-    <application>Firefox</application> appears in the panel's menus. If you
-    didn't enable startup-notification in your mozconfig change the
-    StartupNotify line to false. As the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you deleted the <option>--disable-webm</option> option from your
+      <filename>mozconfig</filename>, your <application>Firefox</application>
+      can play most YouTube videos without the need for the flash plugin. To
+      enable this, go to <ulink url="http://www.youtube.com/html5"/> and click
+      on 'Join the HTML5 Trial' (needs cookies enabled).
+    </para>
+
+    <para>
+      If you use a desktop environment like <application>Gnome</application> or
+      <application>KDE</application> you may like to create a
+      <filename>firefox.desktop</filename> file so that
+      <application>Firefox</application> appears in the panel's menus. If you
+      didn't enable startup-notification in your mozconfig change the
+      StartupNotify line to false. As the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF"
@@ -291,7 +360,9 @@
       <seglistitem>
         <seg>firefox</seg>
-        <seg>Numerous libraries, browser components, plugins, extensions, and
-        helper modules installed in <filename
-        class="directory">/usr/lib/firefox-&firefox-version;</filename>.</seg>
+        <seg>
+          Numerous libraries, browser components, plugins, extensions, and
+          helper modules installed in
+          <filename class="directory">/usr/lib/firefox-&firefox-version;</filename>.
+        </seg>
         <seg>/usr/lib/firefox-&firefox-version;</seg>
       </seglistitem>
@@ -306,6 +377,7 @@
         <term><command>firefox</command></term>
         <listitem>
-          <para>is a gtk2 internet browser that uses the gecko rendering
-          engine.</para>
+          <para>
+            is a gtk2 internet browser that uses the Gecko rendering engine.
+          </para>
           <indexterm zone="firefox firefox-prog">
             <primary sortas="b-firefox">firefox</primary>
