Index: x/lib/xulrunner.xml
===================================================================
--- x/lib/xulrunner.xml	(revision d5595930307c78749f13d3effc58dc1e5ffc4b89)
+++ x/lib/xulrunner.xml	(revision 0e3786986785a74c55c97fdd77ff785cc848e288)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY xulrunner-download-http " ">
+  <!ENTITY xulrunner-download-http 
+           "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!ENTITY xulrunner-download-ftp
-  "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        "78e641c67dc4a40cb3f48fce3e782d41">
-  <!ENTITY xulrunner-size          "85 MB">
-  <!ENTITY xulrunner-buildsize     "961 MB (59 MB installed)">
-  <!ENTITY xulrunner-time          "27 SBU">
+           "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
+  <!ENTITY xulrunner-md5sum        "8b400555fc7063163e3b99472d0c92a1">
+  <!ENTITY xulrunner-size          "93 MB">
+  <!ENTITY xulrunner-buildsize     "3.5 GB (110 MB installed)">
+  <!ENTITY xulrunner-time          "29 SBU">
 ]>
 
@@ -83,30 +83,38 @@
       <xref linkend="gtk2"/>,
       <xref linkend="zip"/> and
-      <xref linkend="unzip"/>.
+      <xref linkend="unzip"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="yasm"/> or <xref linkend="libvpx"/>
-      (to allow <application>Xulrunner</application> to play webm videos).
-    </para>
+      <xref linkend="libevent"/>,
+      <xref linkend="libvpx"/>,
+      <xref linkend="nspr"/>,
+      <xref linkend="nss"/>,
+      <xref linkend="sqlite"/> and
+      <xref linkend="yasm"/>
+    </para>
+
+    <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.
+      </para>
+    </note>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="dbus-glib"/>,
+      <xref linkend="doxygen"/>,
+      <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/>
+      (for integration with the old version of <application>GNOME</application>),
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
+      <xref linkend="libnotify"/>,
       <xref linkend="startup-notification"/>,
-      <xref linkend="sqlite"/>,
-      <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
-      <xref linkend="libevent"/>,
-      <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"/>
+      <xref linkend="wget"/> and
+      <xref linkend="wireless_tools"/>
     </para>
 
@@ -131,44 +139,59 @@
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
 # If you have a multicore machine you can speed up the build by running
-# several jobs at once, but if you have a single core, delete this line:
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# If you have not installed Yasm, uncomment this option:
-# ac_add_options --disable-webm
-
-# If you have installed DBus-Glib delete this option:
+# several jobs at once by uncommenting the following line and setting the
+# value to number of CPU cores:
+#mk_add_options MOZ_MAKE_FLAGS="-j4"
+
+# If you have installed DBus-Glib comment out this line:
 ac_add_options --disable-dbus
 
-# If you have installed wireless-tools delete this option:
+# If you have installed wireless-tools comment out this line:
 ac_add_options --disable-necko-wifi
 
-# If you have installed libnotify delete this option:
+# If you have installed libnotify comment out this line:
 ac_add_options --disable-libnotify
 
-# Uncomment these if you have installed them:
-# ac_add_options --enable-startup-notification
-# ac_add_options --enable-system-hunspell
-# ac_add_options --enable-system-sqlite
-# ac_add_options --with-system-libevent
-# ac_add_options --with-system-libvpx
-# ac_add_options --with-system-nspr
-# ac_add_options --with-system-nss
-
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/xulrunner-build-dir
+# Uncomment these lines if you have installed optional dependencies:
+#ac_add_options --enable-system-hunspell
+#ac_add_options --enable-startup-notification
+
+# If you have not installed Yasm then uncomment this line:
+#ac_add_options --disable-webm
+
+# Comment out following options if you have not installed
+# recommended dependencies:
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+
+# It is recommended not to touch anything below this line
+ac_add_options --prefix=/usr
+ac_add_options --enable-application=xulrunner
+
 ac_add_options --disable-crashreporter
+ac_add_options --disable-installer
+ac_add_options --disable-updater
 ac_add_options --disable-debug
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-installer
-ac_add_options --disable-static
 ac_add_options --disable-tests
-ac_add_options --disable-updater
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-shared
+ac_add_options --disable-mochitest
+
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+
 ac_add_options --enable-system-ffi
-ac_add_options --prefix=/usr
+ac_add_options --enable-system-pixman
+
+ac_add_options --enable-shared-js
 ac_add_options --with-pthreads
+
+ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
 ac_add_options --with-system-zlib
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/xulrunner-build-dir
 EOF</userinput></screen>
 
@@ -188,19 +211,24 @@
     </para>
 
-<!-- the end two symlinks for run-mozilla.sh and xpcshell might not be needed
- in xulrunner-15 -->
-<screen role="root"><userinput>make -C   xulrunner-build-dir install       &amp;&amp;
-mkdir -p  /usr/lib/mozilla/plugins          &amp;&amp;
-rm -rf    /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
-ln -sv    ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
-
-for library in /usr/lib/xulrunner-&xulrunner-version;/*.so; do
-   ln -sfv $library /usr/lib
+<screen role="root"><userinput>make -C xulrunner-build-dir install &amp;&amp;
+
+mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
+rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
+ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
+
+chmod -v 755 /usr/lib/xulrunner-&xulrunner-version;/libxpcom.so \
+             /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell &amp;&amp;
+
+for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so; do
+    ln -sfv ../../../xulrunner-&xulrunner-version;/$library \
+            /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/$library
+    ln -sfv xulrunner-&xulrunner-version;/$library /usr/lib/$library
 done
 
-ln -sv -f ../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh \
-       /usr/lib/xulrunner-&xulrunner-version;
-ln -sv -f ../xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell \
-       /usr/lib/xulrunner-&xulrunner-version;</userinput></screen>
+ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh \
+        /usr/lib/xulrunner-&xulrunner-version;
+ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell \
+        /usr/lib/xulrunner-&xulrunner-version;</userinput></screen>
+
   </sect2>
 
@@ -217,5 +245,5 @@
 
     <para>
-      <command>ln -sv ../mozilla/plugins ...</command>: Some packages will
+      <command>ln -sfv ../mozilla/plugins ...</command>: Some packages will
       install browser plugins into
       <filename class="directory">/usr/lib/mozilla/plugins</filename>.
@@ -225,20 +253,22 @@
 
     <para>
-      <command>for library in
-      /usr/lib/xulrunner-&xulrunner-version;/*.so; do ln -sfv $library /usr/lib;
-      done</command>: The libraries shipped with this package are installed into
+      <command>for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so ...
+      </command>: The 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. These commands make
       relative symbolic links to the shared libraries from
-      <filename class="directory">/usr/lib</filename>.  Debug versions of some,
-      but not all, of these libraries can also be found in
- <filename class="directory">/usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib</filename>.
-    </para>
-
-    <para>
-     <command>ln -sv -f ../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh</command>
-     The <filename>run-mozilla.sh</filename> and <filename>xpcshell</filename> files
-     have been moved in this version, but the code which installs <command>firefox</command>
-     (when linked to xulrunner) was not updated.  These symlinks allow firefox to install.
+      <filename class="directory">/usr/lib</filename>. They will also replace duplicate
+      libraries that are installed in
+      <filename class="directory">/usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib</filename>
+      with symlinks in order to save some space.
+    </para>
+
+    <para>
+      <command>ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/ ...</command>
+      The <filename>run-mozilla.sh</filename> and <filename>xpcshell</filename> files
+      have been moved in this version, but the code which installs
+      <application>Firefox</application> (when linked to xulrunner) was not updated.
+      These symlinks allow<application>Firefox</application> to install when built against
+      <application>Xulrunner</application>.
     </para>
 
@@ -254,12 +284,18 @@
 
       <seglistitem>
-        <seg>xulrunner</seg>
-        <seg>Numerous libraries, browser components, plugins, extensions, and
-        helper modules installed in <filename
-        class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename></seg>
-        <seg>/etc/gre.d, /usr/include/xulrunner-&xulrunner-version;,
-        /usr/lib/xulrunner-&xulrunner-version;,
-        /usr/lib/xulrunner-devel-&xulrunner-version;, and
-        /usr/share/idl/xulrunner-&xulrunner-version;</seg>
+        <seg>
+          xulrunner
+        </seg>
+        <seg>
+          Numerous libraries, browser components, plugins, extensions, and
+          helper modules installed in <filename
+          class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>
+        </seg>
+        <seg>
+          /usr/include/xulrunner-&xulrunner-version;,
+          /usr/lib/xulrunner-&xulrunner-version;,
+          /usr/lib/xulrunner-devel-&xulrunner-version; and
+          /usr/share/idl/xulrunner-&xulrunner-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -274,5 +310,6 @@
         <listitem>
           <para>
-            is a shell script, useful for identifying the version installed.
+            is a shell script used for identifying the installed version
+            and running <application>Xulrunner</application> applications.
           </para>
           <indexterm zone="xulrunner xulrunner-prog">
@@ -281,5 +318,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
