Index: general.ent
===================================================================
--- general.ent	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ general.ent	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY day          "02">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 1st, &year;">
+<!ENTITY releasedate  "May 2nd, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -641,5 +641,5 @@
 <!ENTITY goffice-version              "0.8.17">
 <!ENTITY mesalib-version              "7.9">
-<!ENTITY xulrunner-version            "12.0">
+<!-- <!ENTITY xulrunner-version            "12.0"> -->
 <!ENTITY webkitgtk-version            "1.8.1">
 <!ENTITY libsexy-version              "0.1.11">
Index: general/prog/icedtea6.xml
===================================================================
--- general/prog/icedtea6.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ general/prog/icedtea6.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -287,9 +287,10 @@
     source installation)</bridgehead>
     <para role="optional">
-    <xref linkend="alsa-lib"/>,
-    <xref linkend="cups"/>,
-    <xref linkend="gtk2"/>,
-    <xref linkend="xorg7-lib"/>, and
-    <xref linkend="xulrunner"/></para>
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="cups"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="xorg7-lib"/> and
+      <ulink url="https://developer.mozilla.org/en/XULRunner">xulrunner</ulink>.
+    </para>
 
     <bridgehead renderas="sect4">Additional Requirements
Index: gnome/add/totem.xml
===================================================================
--- gnome/add/totem.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ gnome/add/totem.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -95,6 +95,6 @@
       <ulink url="http://www.lirc.org">LIRC</ulink>,
       <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink> and
-      <xref linkend="firefox"/> or <xref linkend="xulrunner"/>
-      (to build the browser plug-ins)
+      <xref linkend="firefox"/> or <xref linkend="seamonkey"/>
+      (to build the browser plug-ins).
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ introduction/welcome/changelog.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -43,4 +43,13 @@
 -->
     <listitem>
+      <para>May 2nd, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abenton] - removed Xulrunner.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 1st, 2012</para>
       <itemizedlist>
Index: networking/netlibs/libproxy.xml
===================================================================
--- networking/netlibs/libproxy.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ networking/netlibs/libproxy.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -70,5 +70,5 @@
     <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="python2"/>,
-    <xref linkend="xulrunner"/>,
+      <ulink url="https://developer.mozilla.org/en/XULRunner">xulrunner</ulink>,
     <xref linkend="webkitgtk"/> (built with <application>gtk+-2</application>) or
     <ulink url="http://webkit.org/">WebKit</ulink>, and
Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ postlfs/editors/bluefish.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -5,6 +5,8 @@
   %general-entities;
 
-  <!ENTITY bluefish-download-http "http://www.bennewitz.com/bluefish/stable/source/bluefish-&bluefish-version;.tar.bz2">
-  <!ENTITY bluefish-download-ftp  "&gentoo-ftp-repo;/bluefish-&bluefish-version;.tar.bz2">
+  <!ENTITY bluefish-download-http
+    "http://www.bennewitz.com/bluefish/stable/source/bluefish-&bluefish-version;.tar.bz2">
+  <!ENTITY bluefish-download-ftp
+    "&gentoo-ftp-repo;/bluefish-&bluefish-version;.tar.bz2">
   <!ENTITY bluefish-md5sum        "23d894e065585d35dbc74c246c15cc9d">
   <!ENTITY bluefish-size          "3.2 MB">
@@ -30,31 +32,46 @@
     <title>Introduction to Bluefish</title>
 
-    <para><application>Bluefish</application> is a
-    <application>Gtk+-2</application> text editor targeted towards programmers
-    and webdesigners, with many options to write websites, scripts and
-    programming code. Bluefish supports many programming and markup languages,
-    and it focuses on editing dynamic and interactive websites.</para>
+    <para>
+      <application>Bluefish</application> is a
+      <application>Gtk 2</application> text editor targeted towards
+      programmers and web designers, with many options to write websites,
+      scripts and programming code. <application>Bluefish</application>
+      supports many programming and markup languages, and it focuses on
+      editing dynamic and interactive websites.
+    </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&bluefish-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&bluefish-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&bluefish-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&bluefish-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &bluefish-md5sum;</para>
+        <para>
+          Download MD5 sum: &bluefish-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &bluefish-size;</para>
+        <para>
+          Download size: &bluefish-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &bluefish-buildsize;</para>
+        <para>
+          Estimated disk space required: &bluefish-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &bluefish-time;</para>
+        <para>
+          Estimated build time: &bluefish-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,12 +83,14 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pcre"/>, <xref linkend="gucharmap"/>,
-    <xref linkend="enchant"/> (for spellchecking),
-    <xref linkend="desktop-file-utils"/> and
-    <xref linkend="shared-mime-info"/></para>
+    <para role="optional">
+      <xref linkend="pcre"/>,
+      <xref linkend="gucharmap"/>,
+      <xref linkend="enchant"/> (for spellchecking),
+      <xref linkend="desktop-file-utils"/> and
+      <xref linkend="shared-mime-info"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/bluefish"/></para>
-
   </sect2>
 
@@ -79,6 +98,6 @@
     <title>Installation of Bluefish</title>
 
-    <para>Install <application>Bluefish</application> by running the following
-    commands:</para>
+    <para>Install <application>Bluefish</application> by running the
+    following commands:</para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
@@ -103,5 +122,8 @@
       <seglistitem>
         <seg>bluefish</seg>
-        <seg>/usr/lib/bluefish and /usr/share/bluefish</seg>
+        <seg>
+          /usr/lib/bluefish and
+          /usr/share/bluefish.
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -115,5 +137,7 @@
         <term><command>bluefish</command></term>
         <listitem>
-          <para>is an X Window System editor for markup and programming.</para>
+          <para>
+            is an X Window System editor for markup and programming.
+          </para>
           <indexterm zone="bluefish bluefish-prog">
             <primary sortas="b-bluefish">bluefish</primary>
@@ -121,8 +145,5 @@
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>
Index: x/lib/gtk-vnc.xml
===================================================================
--- x/lib/gtk-vnc.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ x/lib/gtk-vnc.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -80,5 +80,5 @@
       <xref linkend="pulseaudio"/>,
       <xref linkend="vala"/> and
-      <xref linkend="xulrunner"/>
+      <ulink url="https://developer.mozilla.org/en/XULRunner">xulrunner</ulink>.
     </para>
 
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ x/lib/lib.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -56,5 +56,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xulrunner.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xulrunner.xml"/> -->
 
 </chapter>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ xsoft/graphweb/firefox.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -12,6 +12,5 @@
   <!ENTITY firefox-size          "75 MB">
   <!ENTITY firefox-buildsize     "2.8 GB (31 MB installed)">
-  <!ENTITY firefox-time          "24 SBU (or 0.3 SBU if you're building against
-    an installed Xulrunner)">
+  <!ENTITY firefox-time          "24 SBU">
 ]>
 
@@ -103,7 +102,4 @@
       <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
@@ -148,8 +144,4 @@
 ac_add_options --disable-libnotify
 
-# If you have installed xulrunner uncomment these two lines:
-# ac_add_options --with-system-libxul
-# ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;
-
 # Uncomment these if you have installed them:
 # ac_add_options --enable-startup-notification
@@ -162,9 +154,4 @@
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
-ac_add_options --enable-official-branding
-ac_add_options --prefix=/usr
-
-# The rest of these options have no effect if you're
-# building against an already installed xulrunner:
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
@@ -173,7 +160,9 @@
 ac_add_options --disable-tests
 ac_add_options --disable-updater
+ac_add_options --enable-official-branding
 ac_add_options --enable-shared
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
+ac_add_options --prefix=/usr
 ac_add_options --with-pthreads
 ac_add_options --with-system-jpeg
@@ -191,5 +180,6 @@
 sed -i '/sys\/time\.h/a#include &lt;unistd.h&gt;' ipc/chromium/src/base/time_posix.cc &amp;&amp;
 sed -i 's# ""##' browser/base/Makefile.in &amp;&amp;
-make -f client.mk</userinput></screen>
+make -f client.mk &amp;&amp;
+make -C firefox-build-dir/browser/installer</userinput></screen>
 
     <para>
@@ -198,16 +188,6 @@
 
     <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>
-      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:
+      Now, as the <systemitem class="username">root</systemitem> user install
+      <application>Firefox</application>:
     </para>
 
@@ -221,19 +201,12 @@
 
     <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;
-rm /usr/bin/firefox &amp;&amp;
-cat &gt; /usr/bin/firefox &lt;&lt; "EOF" &amp;&amp;
-#!/bin/bash
-/usr/lib/xulrunner-&xulrunner-version;/xulrunner /usr/lib/firefox-&firefox-version;/application.ini "${@}"
-EOF
-chmod 755 /usr/bin/firefox &amp;&amp;
-mkdir -p /usr/lib/mozilla/plugins &amp;&amp;
-ln -sv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &amp;&amp;
-chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
+      The above instructions just install the parts you need to run
+      <application>Firefox</application>. Alternatively, if you want to install
+      the full <application>Firefox</application> development environment (Note,
+      this installs more than half a gigabyte of extra files and so is not
+      recommended) as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C firefox-build-dir install</userinput></screen>
   </sect2>
 
@@ -274,14 +247,5 @@
       <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.
+      into a versioned directory.
     </para>
 
@@ -305,4 +269,10 @@
       default, we make the symbolic link to keep all the plugins installed in
       one folder.
+    </para>
+
+    <para>
+      <command>make -C firefox-build-dir install</command>: This runs
+      <command>make install</command> in
+      <filename class="directory">firefox-build-dir</filename>.
     </para>
   </sect2>
@@ -372,5 +342,6 @@
         <listitem>
           <para>
-            is a gtk2 internet browser that uses the Gecko rendering engine.
+            is a <application>Gtk 2</application> internet browser that uses the
+            Gecko rendering engine.
           </para>
           <indexterm zone="firefox firefox-prog">
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ xsoft/graphweb/seamonkey.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -219,4 +219,15 @@
 ln -svf ../mozilla/plugins /usr/lib/seamonkey-&seamonkey-version; &amp;&amp;
 cp -v moz-build-dir/mozilla/dist/man/man1/seamonkey.1 /usr/share/man/man1</userinput></screen>
+
+    <para>
+      The above instructions just install the parts you need to run
+      <application>Seamonkey</application>. Alternatively, if you want to
+      install the full <application>Seamonkey</application> development
+      environment (Note, this installs more than half a gigabyte of extra files
+      and so is not recommended) as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C moz-build-dir install</userinput></screen>
   </sect2>
 
@@ -359,5 +370,5 @@
         <listitem>
           <para>
-            is Mozilla browser/email/newsgroup/chat client suite.
+            is the Mozilla browser/email/newsgroup/chat client suite.
           </para>
           <indexterm zone="seamonkey seamonkey-prog">
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision cc7670a9dd0450a4af4734a2995d00a1c3d6f38f)
+++ xsoft/other/thunderbird.xml	(revision de930747d2779838c85c3dd62aacd841abc15462)
@@ -168,4 +168,5 @@
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
+ac_add_options --prefix=/usr
 ac_add_options --with-pthreads
 ac_add_options --with-system-jpeg
@@ -196,4 +197,15 @@
   -C /usr/lib/thunderbird-&thunderbird-version; --strip-components=1 &amp;&amp;
 ln -s ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>
+
+    <para>
+      The above instructions just install the parts you need to run
+      <application>Thunderbird</application>. Alternatively, if you want to
+      install the full <application>Thunderbird</application> development
+      environment (Note, this installs more than half a gigabyte of extra files
+      and so is not recommended) as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C thunderbuild install</userinput></screen>
   </sect2>
 
@@ -338,6 +350,5 @@
         <listitem>
           <para>
-            is <application>Mozilla</application>'s next-generation email and
-            newsgroup client.
+            is <application>Mozilla</application>'s email and newsgroup client.
           </para>
           <indexterm zone="thunderbird thunderbird-prog">
