Index: general.ent
===================================================================
--- general.ent	(revision 4af60e8af2646f9aa4ac0d6234cf9c41d55c5a7a)
+++ general.ent	(revision a09862845bc0e409dee64750e222c629b000d7aa)
@@ -1,7 +1,7 @@
-<!ENTITY day          "03">
+<!ENTITY day          "06">
 <!ENTITY month        "12">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "December &day;rd, &year;">
+<!ENTITY releasedate  "December &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4af60e8af2646f9aa4ac0d6234cf9c41d55c5a7a)
+++ introduction/welcome/changelog.xml	(revision a09862845bc0e409dee64750e222c629b000d7aa)
@@ -43,4 +43,15 @@
 
     <listitem>
+      <para>December 6th, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Completed dependencies, removed optional configure 
+          parameters and added the no_mozilla (firefox) patch for 
+          OpenOffice.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 3rd, 2005</para>
       <itemizedlist>
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision 4af60e8af2646f9aa4ac0d6234cf9c41d55c5a7a)
+++ xsoft/suites/openoffice.xml	(revision a09862845bc0e409dee64750e222c629b000d7aa)
@@ -58,18 +58,22 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required patch for use with gcc-&gcc-version;: <ulink
-        url="&patch-root;/OOo_&openoffice-version;-gcc4-1.patch"/>
+        <para>Required patch for use with gcc-&gcc-version;: 
+        <ulink url="&patch-root;/OOo_&openoffice-version;-gcc4-1.patch"/>
         </para>
       </listitem>
-      <listitem>
-        <para>Required patch for use with NPTL: <ulink
-        url="&patch-root;/OOo_&openoffice-version;-nptl-1.patch"/></para>
-      </listitem>
+
+      <listitem>
+        <para>Required patch for use with NPTL: 
+        <ulink url="&patch-root;/OOo_&openoffice-version;-nptl-1.patch"/></para>
+      </listitem>
+
       <listitem>
         <para>Required patch for use  with
-        <application>JDK</application>-&jdk-src-version;: <ulink
-        url="&patch-root;/OOo_&openoffice-version;-jdk_1.5-1.patch"/>
+        <application>JDK</application>-&jdk-src-version;: 
+        <ulink url="&patch-root;/OOo_&openoffice-version;-jdk_1.5-1.patch"/>
         </para>
       </listitem>
+
+<!--
       <listitem>
         <para>Required patch for use with pkgconfig-0.17 and greater:
@@ -77,32 +81,30 @@
         url="&patch-root;/OOo_&openoffice-version;-pkgconfig_0.17-1.patch"/></para>
       </listitem>
-
+-->
       <listitem>
         <para>Optional patch if
         <application>Linux-PAM</application>-&linux-pam-version; is not
-        installed: <ulink
-        url="&patch-root;/OOo_&openoffice-version;-no_pam-1.patch"/></para>
-      </listitem>
-
-<!--  Will be added after patch header is corrected.
+        installed: 
+        <ulink url="&patch-root;/OOo_&openoffice-version;-no_pam-1.patch"/></para>
+      </listitem>
+
       <listitem>
         <para>Optional patch if building against the system installed
-        <application>Firefox</application>: <ulink
-        url="&patch-root;/OOo_&openoffice-version;-xmlsec_no_mozilla-1.patch"/>
+        <application>Firefox</application>: 
+        <ulink url="&patch-root;/OOo_&openoffice-version;-xmlsec_no_mozilla-2.patch"/>
         </para>
       </listitem>
--->
+
       <listitem>
         <para>Required update for use with
-        <application>JDK-&jdk-src-version;</application>.  <ulink
-        url="ftp://anduin.linuxfromscratch.org/BLFS/svn/b/bsh-2.0b4-src.tar.bz2"/>
+        <application>JDK-&jdk-src-version;</application>:  
+        <ulink url="ftp://anduin.linuxfromscratch.org/BLFS/svn/b/bsh-2.0b4-src.tar.bz2"/>
         </para>
       </listitem>
       <listitem>
         <para>Optional download if not using the system
-        <application>Mozilla</application>
-<!--        or <application>Firefox</application>  -->
-        browser.  <ulink
-        url="ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/mozilla-source-1.7.5.tar.gz"/></para>
+        <application>Mozilla</application> or 
+        <application>Firefox</application> browser:  
+        <ulink url="ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/mozilla-source-1.7.5.tar.gz"/></para>
       </listitem>
     </itemizedlist>
@@ -128,20 +130,32 @@
     <xref linkend="gtk2"/>,
     <xref linkend="gnome-vfs"/>,
-    <xref linkend="libart_lgpl"/>,
+    <xref linkend="libart_lgpl"/>, and
+    <xref linkend="startup-notification"/>.</para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><ulink url="http://packages.debian.org/testing/libdevel/libaltlinuxhyph-dev">ALTLinuxhyph</ulink>,
+    <ulink url="http://boost.sourceforge.net/">boost</ulink>,
+    <xref linkend="curl"/>,
+    <xref linkend="db"/>,
+    <ulink url="http://www.easysw.com/epm/">EPM</ulink>,
+    <xref linkend="evolution"/>,
+    <ulink url="http://www.cs.man.ac.uk/~toby/alan/software/">GPC</ulink>,
+    <xref linkend="kde"/>,
     <xref linkend="libjpeg"/>,
-    <xref linkend="libtiff"/>, and
-    <xref linkend="startup-notification"/>.</para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="curl"/>,
+    <ulink url="http://www.mega-nerd.com/libsndfile/">libsndfile</ulink>,
+    <xref linkend="libtiff"/>,
+    <ulink url="http://freshmeat.net/projects/libwpd/">libwpd</ulink>,
     <xref linkend="linux-pam"/>,
-    <xref linkend="mozilla"/>,
-<!--
-    or <xref linkend="firefox"/>,
--->
+    <xref linkend="mozilla"/> or <xref linkend="firefox"/>,
+    <ulink url="http://lingucomponent.openoffice.org/MySpell-3.zip">MySpell</ulink>,
+    <ulink url="http://lingucomponent.openoffice.org/thesaurus.html">MyThes</ulink>,
     <xref linkend="nas"/>,
-    <ulink url="http://www.webdav.org/neon/">neon-0.25.4</ulink>,
+    <ulink url="http://www.webdav.org/neon/">neon</ulink>,
+    <xref linkend="openldap"/>,
+    <ulink url="http://www.portaudio.com/">PortAudio</ulink>,
     <xref linkend="python"/>,
-    <xref linkend="sane"/>, and
+    <ulink url="http://www.gingerall.com/charlie/ga/xml/p_sab.xml">Sablotron</ulink>,
+    <xref linkend="sane"/>,
+    <ulink url="http://sourceforge.net/projects/stlport/">STLPort</ulink>, and
     <xref linkend="unixodbc"/>.</para>
 
@@ -183,50 +197,38 @@
 <!-- To be removed before final release -->
 
-    <note><para>If building against the system Mozilla<!-- or Firefox-->,
+    <note><para>If building against the system Mozilla or Firefox,
     a change may be required to the installed headers.  The following commands
     will make the change only if it is necessary.</para></note>
 
-<!--    <para>Mozilla:</para> -->
-<screen role="root"><userinput>cd /usr/include/mozilla-&mozilla-version; &amp;&amp;
-grep "xptinfo_enum_1" xpcom/xptinfo.h || \
-    sed -i 's@enum@enum xptinfo_enum_1@' xpcom/xptinfo.h</userinput></screen>
-
-<!--    <para>Firefox:</para>
-<screen role="root"><userinput>cd /usr/include/firefox-&firefox-version; &amp;&amp;
-grep "xptinfo_enum_1" xpcom/xptinfo.h || \
-    sed -i 's@enum@enum xptinfo_enum_1@' xpcom/xptinfo.h</userinput></screen>
--->
-<!-- End TBR -->
+<para>Mozilla:</para>
+<screen role="root"><userinput>grep "xptinfo_enum_1" /usr/include/mozilla-&mozilla-version;/xpcom/xptinfo.h || \
+    sed -i 's@enum@enum xptinfo_enum_1@' \
+    /usr/include/mozilla-&mozilla-version;/xpcom/xptinfo.h</userinput></screen>
+
+<para>Firefox:</para>
+<screen role="root"><userinput>grep "xptinfo_enum_1" /usr/include/firefox-&firefox-version;/xpcom/xptinfo.h || \
+    sed -i 's@enum@enum xptinfo_enum_1@' \
+    /usr/include/firefox-&firefox-version;/xpcom/xptinfo.h</userinput></screen>
+
+<!-- End to be removed -->
 
     <para>Configure <application>OpenOffice</application> using the following
     commands:</para>
 
-<!--  To be added after xmlsec_no_mozilla patch header is corrected
-    <note><para>If you intend to use the system-installed
-    <application>Mozilla</application> or
-    <application>Firefox</application>, replace the
-    <parameter> - - enable-build-mozilla</parameter> switch with
-    <parameter>- -with-system-mozilla</parameter>.  Additionally for
-    <application>Firefox</application>, add the
-    <parameter>- -with-firefox</parameter> switch. You will also be
-    unable to use a <application>Thunderbird</application> address
-    book as a data source if built against
-    <application>Firefox</application>.</para></note>
--->
-
-    <note><para>If you intend to use the system
-    <application>Mozilla</application>, replace the
-    <parameter>--enable-build-mozilla</parameter> switch with
-    <parameter>--with-system-mozilla</parameter>.</para></note>
+    <note><para>You should review the output of 
+    <command>config_office/configure --help</command> and take advantage of 
+    any system installed programs and libraries available using the 
+    <parameter>--with-system-*</parameter> parameters. Additionally, if 
+    building against <application>Firefox</application>, you must provide 
+    both the <parameter>--with-system-mozilla</parameter> parameter, and 
+    the <parameter>--with-firefox</parameter> parameter to the 
+    <filename>configure</filename> script.</para></note>
 
 <screen><userinput>cd config_office/ &amp;&amp;
 ./configure --prefix=/opt/openoffice-2.0.0 \
-    --enable-libart --enable-libsn \
-    --disable-fontooo --without-fonts \
-    --with-system-stdlibs --with-system-freetype \
-    --with-system-zlib --with-system-jpeg \
-    --with-system-expat --with-system-libxml \
-    --with-system-curl --enable-build-mozilla \
-    --with-build-version=BLFS \
+    --enable-libart --enable-libsn --disable-fontooo \
+    --without-fonts --with-system-stdlibs --with-system-freetype \
+    --with-system-expat --with-system-libxml --with-system-zlib \
+    --enable-build-mozilla --with-build-version=BLFS \
     --with-package-format=native --disable-binfilter &amp;&amp;
 cd ..</userinput></screen>
@@ -322,5 +324,5 @@
 
     <para><parameter>--with-system-*</parameter>: Use the system libraries
-    and programs instead of building the packagees included in the build
+    and programs instead of building the source packages included in the build
     tree.</para>
 
@@ -338,11 +340,9 @@
     filters.</para>
 
-<!--
-    <para><parameter>- -with-firefox</parameter>: Enables the use of
+    <para><parameter>--with-firefox</parameter>: Enables the use of
     <application>Firefox</application> in place of the full
     <application>Mozilla</application> suite.  This will disable the use
     of a <application>Thunderbird</application> address book as a data
     source.</para>
--->
 
     <para><parameter>--disable-cups</parameter>: Disable the use of
