Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ xsoft/graphweb/firefox.xml	(revision 07c39524998481ff650c84a16e9fc68fd24f62d5)
@@ -5,14 +5,12 @@
   %general-entities;
 
-<!--  <!ENTITY firefox-download-http
-           "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">-->
   <!ENTITY firefox-download-http
            "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!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        "5a1c4b0b2349e3db94b45bd3f03f9288">
+  <!ENTITY firefox-md5sum        "385ad037451f141b68515c73cad01704">
   <!ENTITY firefox-size          "148 MB">
-  <!ENTITY firefox-buildsize     "4.1 GB (100 MB installed)">
-  <!ENTITY firefox-time          "12 SBU (using parallelism=8)">
+  <!ENTITY firefox-buildsize     "4.9 GB (66 MB installed)">
+  <!ENTITY firefox-time          "60 SBU">
 ]>
 
@@ -81,6 +79,6 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="zip"/>, and
-      <xref linkend="unzip"/>
+      <xref linkend="unzip"/> and
+      <xref linkend="zip"/>
     </para>
 
@@ -98,7 +96,9 @@
     <note>
       <para>
-        If you don't install recommended dependencies, then internal copies of
-        those packages will be used. They might be tested to work, but they can
-        be out of date or contain security holes.
+        If you don't install recommended dependencies,
+        then internal copies of those packages will
+        be used. They might be tested to work, but
+        they can be out of date or contain security
+        holes.
       </para>
     </note>
@@ -107,6 +107,6 @@
       <para>
         With <application>Firefox-31.0</application> and later versions, you
-        must have installed <application>Openssl</application> before
-        <application>Python 2</application> or the build system will quickly
+        must have installed <application>OpenSSL</application> before
+        <application>Python 2</application>, or the build system will quickly
         fail with output including "ImportError: cannot import name
         HTTPSHandler". If you are in any doubt about this (e.g. upgrading
@@ -114,7 +114,8 @@
         <filename>/usr/lib/python2.7/lib-dynload/_ssl.so</filename> exists.
         If it does not, reinstall <xref linkend="python2"/> (after
-        installing <xref linkend="openssl"/>.  The latest version of any
+        installing <xref linkend="openssl"/>  - the latest version of any
         <emphasis>currently maintained</emphasis> version of Openssl should
-        be satisfactory if already installed. 
+        be satisfactory if already installed - if that package has not already
+        been installed).
       </para>
     </note>
@@ -136,5 +137,5 @@
       <xref linkend="startup-notification"/>,
       <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>, and
+      <xref linkend="wireless_tools"/> and
       <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
     </para>
@@ -149,12 +150,12 @@
 
     <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
+      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:
+      uncomment any other desired options.
+      Create the file by issuing the following command:
     </para>
 
@@ -210,5 +211,4 @@
 ac_add_options --disable-tests
 
-ac_add_options --enable-optimize
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
@@ -238,12 +238,5 @@
     </para>
 
-    <note><para>
-      If you are compiling <application>Firefox</application> in chroot, make
-      sure you have <envar>$SHELL</envar> environment variable set or prepend
-      <envar>SHELL=/bin/sh</envar> to the first make command below.
-    </para></note>
-
-<screen><userinput>test $(uname -m) = "i686" &amp;&amp; sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &amp;&amp;
-make -f client.mk</userinput></screen>
+<screen><userinput>make -f client.mk</userinput></screen>
 
     <para>
@@ -252,5 +245,6 @@
 
     <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
+      Install <application>Firefox</application> by running the following
+      commands as the <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -258,5 +252,15 @@
 
 mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
-ln -sfv ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser</userinput></screen>
+ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version;</userinput></screen>
+
+    <para>
+      The above instruction just installs the parts you need to run
+      <application>Firefox</application>. Alternatively, if you want to
+      install the full <application>Firefox</application> development
+      environment, run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C firefox-build-dir install</userinput></screen>
 
   </sect2>
@@ -264,11 +268,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>test $(uname -m) = "i686" &amp;&amp; sed ...</command>:
-      On this version of firefox, an old bug has reappeared in 32-bit builds.
-      With optimization, the install fails with a Python error.  This
-      command will fix i686 builds and preserve the optimization on x86_64.
-    </para>
 
     <para>
@@ -280,23 +277,6 @@
     </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 <envar>PATH</envar>
-      variable.
-    </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;/browser</command>:
+    <para>
+      <command>ln -sfv ... /usr/lib/firefox-&firefox-version;/browser</command>:
       This command creates a symbolic link to <filename
       class="directory">/usr/lib/mozilla/plugins</filename>. It's not really
@@ -330,5 +310,4 @@
 
 <screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-mkdir -pv /usr/share/pixmaps &amp;&amp;
 
 cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
@@ -347,6 +326,13 @@
 EOF
 
-ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
-        /usr/share/pixmaps/firefox.png</userinput></screen>
+for s in 16 32 48
+do
+install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/chrome/icons/default/default${s}.png \
+                  /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
+done &amp;&amp;
+install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
+                  /usr/share/icons/hicolor/128x128/apps/firefox.png &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+unset s</userinput></screen>
 
   </sect2>
@@ -358,5 +344,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -365,10 +351,9 @@
         </seg>
         <seg>
-          Numerous libraries, browser components, plugins, extensions, and
-          helper modules installed in
-          <filename class="directory">/usr/lib/firefox-&firefox-version;</filename>
+          None
         </seg>
         <seg>
-          /usr/lib/firefox-&firefox-version;
+          /usr/lib/firefox-&firefox-version; and
+          /usr/lib/mozilla/plugins
         </seg>
       </seglistitem>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ xsoft/other/thunderbird.xml	(revision 07c39524998481ff650c84a16e9fc68fd24f62d5)
@@ -11,6 +11,6 @@
   <!ENTITY thunderbird-md5sum            "6bb66f5cb67d573939d4e2ead6f7c7ca">
   <!ENTITY thunderbird-size              "164 MB">
-  <!ENTITY thunderbird-buildsize         " 3.7 GB (68 MB installed)">
-  <!ENTITY thunderbird-time              "13 SBU (using parallelism=8)">
+  <!ENTITY thunderbird-buildsize         "4.7 GB (68 MB installed)">
+  <!ENTITY thunderbird-time              "56 SBU">
 ]>
 
@@ -80,6 +80,6 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="zip"/> and
-      <xref linkend="unzip"/>
+      <xref linkend="unzip"/> and
+      <xref linkend="zip"/>
     </para>
 
@@ -138,5 +138,5 @@
       <xref linkend="startup-notification"/>,
       <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>, and
+      <xref linkend="wireless_tools"/> and
       <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
     </para>
@@ -161,8 +161,7 @@
 
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-<literal># If you have a multicore machine, the build may be faster if using parallel
-# jobs. The build system automatically adds -jN to the "make" flags, where N
-# is the number of CPU cores. The option below is therefore useless, unless
-# you want to use a smaller number of jobs:
+<literal># If you have a multicore machine, thunderbird will now use all the cores by
+# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
+# by uncommenting the next line and setting a valid number of CPU cores.
 #mk_add_options MOZ_MAKE_FLAGS="-j1"
 
@@ -214,5 +213,4 @@
 ac_add_options --disable-tests
 
-ac_add_options --enable-optimize
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
@@ -238,11 +236,10 @@
 
     <para>
-      First, a bug needs to be fixed. Notice that thunderbuild needs to match
-      the value used in mozconfig (above) for the object directory (MOZ_OBJDIR):
-    </para>
-
-<!-- might be necessary
-test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&-->
-<screen><userinput>mkdir -vp mozilla/thunderbuild</userinput></screen>
+      First, a bug needs to be fixed. Note that thunderbuild matches
+      the value used in mozconfig above for the object directory
+      (MOZ_OBJDIR):
+    </para>
+
+<screen><userinput>mkdir -pv mozilla/thunderbuild</userinput></screen>
 
     <para>
@@ -251,11 +248,5 @@
     </para>
 
-    <note><para>
-      If you are compiling <application>Thunderbird</application> in chroot,
-      prepend <envar>SHELL=/bin/sh</envar> to the <!--first -->make command below.
-    </para></note>
-
-<screen><userinput>make -f client.mk<!--
-make -C thunderbuild/mail/installer--></userinput></screen>
+<screen><userinput>make -f client.mk</userinput></screen>
 
     <para>
@@ -267,9 +258,4 @@
       commands as the <systemitem class="username">root</systemitem> user:
     </para>
-
-<!--<screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
-tar -xvf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2 \
-    -C /usr/lib/thunderbird-&thunderbird-version; -\-strip-components=1 &amp;&amp;
-ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>-->
 
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK=</userinput></screen>
@@ -284,20 +270,9 @@
 
 <screen role="root"><userinput>make -C thunderbuild install</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!-- might be necessary
-    <para>
-      <command>test $(uname -m) = "i686" &amp;&amp; sed ...</command>: On this
-      version of thunderbird, an old bug has reappeared in 32-bit builds.  With
-      optimization, the install fails with a Python error.  This command will
-      fix i686 builds and preserve the optimization on x86_64.
-    </para>-->
-
-    <para>
-      <command>mkdir -vp mozilla/thunderbuild</command>: fixes a build failure
-      of Makefile at the beginning of build, where a file cannot be found.
-    </para>
 
     <para>
@@ -386,7 +361,14 @@
 EOF
 
-ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
-        /usr/share/pixmaps/thunderbird.png</userinput></screen>
+for s in 16 22 24 32 48 256
+do
+install -v -Dm644 /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default${s}.png \
+                  /usr/share/icons/hicolor/${s}x${s}/apps/thunderbird.png
+done &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+unset s</userinput></screen>
+
     </sect3>
+
   </sect2>
 
