Index: xsoft/graphweb/mozilla/mozilla-inst.xml
===================================================================
--- xsoft/graphweb/mozilla/mozilla-inst.xml	(revision 24c5c34b456a7656a19d5ca24e1d8451b9df28a3)
+++ xsoft/graphweb/mozilla/mozilla-inst.xml	(revision 1c6182ecbd150d982caf56b7b1f3e8b28a01a9d1)
@@ -2,6 +2,5 @@
 <title>Installation of mozilla</title>
 
-<para>Install mozilla by running the following commands (don't forget to
-bunzip2 the patch file first):</para>
+<para>Install mozilla by running the following commands:</para>
 
 <para><screen><userinput>export MOZILLA_OFFICIAL="1" &amp;&amp;
@@ -12,7 +11,24 @@
 tar -xjf ../../mozilla-&mozilla-version;-spellchecker.tar.bz2 &amp;&amp;
 cd .. &amp;&amp;
-patch -Np1 -i ../mozilla-&mozilla-version;.patch &amp;&amp;
-./configure --prefix=&mozilla-prefix; \
+patch -Np1 -i ../mozilla-&mozilla-version;.patch</userinput></screen></para>
+
+<para>According to the financial institutions, the following hack makes your
+browser insecure. You have been warned. Many sites use an MS-IE specific tag 
+(autocomplete=off) to prevent autocomplete from working in some forms. This 
+tag is now supported in mozilla to appease the financial institutions. As per 
+the requirements of the financial institutions, they will not even accept a 
+solution where this a preference option. However our opinion is that it should 
+be in the hands of the user. To enable autocomplete to bypass
+this restriction, we need to make a slight modification in the code.</para>
+
+<para>Open the file <filename>extensions/wallet/src/wallet.cpp</filename> in
+the mozilla source tree and search for the line:
+<screen>#define WALLET_DONT_CACHE_ALL_PASSWORDS</screen>
+Then delete or comment out the line.  Now, if anyone tells you MS-IE is user
+friendly, give them this example!</para>
+
+<para><screen><userinput>./configure --prefix=&mozilla-prefix; \
             --enable-default-mozilla-five-home \
+            --enable-toolkit-gtk2 --enable-default-toolkit=gtk2 \
             --with-x --with-system-zlib \
             --with-system-jpeg --with-system-png --with-system-mng \
@@ -28,6 +44,6 @@
 make &amp;&amp;
 make install &amp;&amp;
-install -d &mozilla-prefix;/include/mozilla-&mozilla-version;/security &amp;&amp;
-cp -Lf dist/private/security/*.h dist/public/security/*.h \
+install -d &mozilla-prefix;/include/mozilla-&mozilla-version;/nss &amp;&amp;
+cp -Lf dist/private/nss/*.h dist/public/nss/*.h \
    &mozilla-prefix;/include/mozilla-&mozilla-version;/security &amp;&amp;
 install -d &mozilla-prefix;/lib/mozilla-&mozilla-version;/openoffice &amp;&amp;
@@ -36,5 +52,4 @@
 ln -nsf mozilla-&mozilla-version; &mozilla-prefix;/include/mozilla &amp;&amp;
 ln -nsf mozilla-&mozilla-version; &mozilla-prefix;/lib/mozilla &amp;&amp;
-ln -sf mozilla &mozilla-prefix;/bin/netscape &amp;&amp;
 cd &mozilla-prefix;/lib/mozilla-&mozilla-version; &amp;&amp;
 export LD_LIBRARY_PATH="&mozilla-prefix;/lib/mozilla-&mozilla-version;" &amp;&amp;
@@ -69,29 +84,3 @@
 for HTML editing.</para>
 
-<para><userinput>--enable-default-toolkit=gtk2</userinput> : In theory
-mozilla now supports both gtk 1.2 and gtk 2.0. To enable gtk2 support, use
-this option.  People have however had problems getting a usable gtk2
-built even with this and patches.  There is also support for other toolkits
-available but this support is known to be unstable.  If you want to try one,
-we suggest doing a normal build first and then only trying the other
-toolkits when you know you can get a standard build to work.</para>
-
-<para>According to the financial institutions, the following hack makes your
-browser insecure. You have been warned. Many sites use an MS-IE specific tag 
-(autocomplete=off) to prevent autocomplete from working in some forms. This 
-tag is now supported in mozilla to appease the financial institutions. As per 
-the requirements of the financial institutions, they will not even accept a 
-solution where this a preference option. However our opinion is that it should 
-be in the hands of the user. To enable autocomplete to bypass
-this restriction, we need to make a slight modification in the code.</para>
-
-<para>Open the file <filename>extensions/wallet/src/wallet.cpp</filename> in
-the mozilla source tree and search for the line:
-<screen>#define WALLET_DONT_CACHE_ALL_PASSWORDS</screen>
-Then delete or comment out the line.  If anyone tells you MS-IE is user
-friendly, give them this example!  Note that unlike the patch referred to in
-the hint, the patch on the BLFS website does not contain this hack so you
-will need to enable it manually if you want it use it or download it from the
-hint site.</para>
-
 </sect2>
