Author: dj
Date: 2006-07-02 20:59:12 -0600 (Sun, 02 Jul 2006)
New Revision: 6244

Modified:
   trunk/BOOK/xsoft/suites/openoffice.xml
Log:
Corrected text surrounding Additional Downloads for OOo.

Modified: trunk/BOOK/xsoft/suites/openoffice.xml
===================================================================
--- trunk/BOOK/xsoft/suites/openoffice.xml      2006-07-02 23:14:53 UTC (rev 
6243)
+++ trunk/BOOK/xsoft/suites/openoffice.xml      2006-07-03 02:59:12 UTC (rev 
6244)
@@ -4,18 +4,6 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make 
check</command>.</para> -->
-
   <!ENTITY openoffice-download-http 
"http://download.openoffice.org/&openoffice-version;/source.html";>
   <!ENTITY openoffice-download-ftp  
"ftp://ftp.ussg.iu.edu/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src.tar.gz";>
   <!ENTITY openoffice-md5sum        "f68832ff3458664ae2b741ec67d30104">
@@ -70,20 +58,20 @@
     <itemizedlist spacing='compact'>
 
       <listitem>
-        <para>Required patch for recent X Window versions:
+        <para>Required patch:
         <ulink url="&patch-root;/OOo_&openoffice-version;-xauth-1.patch"/>
         </para>
       </listitem>
 
       <listitem>
-        <para>Optional patch if
+        <para>Required 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>
 
       <listitem>
-        <para>Optional patch if building against the system-installed
+        <para>Required patch if building against the system-installed
         Mozilla products (<application>NSS</application>,
         <application>Firefox</application>, or
         <application>Seamonkey</application>):
@@ -92,9 +80,8 @@
       </listitem>
 
       <listitem>
-        <para>Optional download if not using the system
-        <application>Mozilla</application> or
-        <application>Firefox</application> browser:
+        <para>Required download if you wish to build the in-tree
+        <application>Mozilla</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>
@@ -169,8 +156,8 @@
     do patch -Np1 -i ${PATCH}
 done</userinput></screen>
 
-    <para>If not using the system-installed <application>Mozilla</application>
-    or <application>Firefox</application>, copy the
+    <para>If you wish to build an in-tree <application>Mozilla</application>, 
+    as opposed to using a system wide installation, copy the
     <application>Mozilla</application> source tarball into the source
     tree:</para>
 
@@ -229,6 +216,8 @@
 . LinuxIntelEnv.Set.sh &amp;&amp;
 dmake</userinput></screen>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Install <application>OpenOffice</application> as the
     <systemitem class="username">root</systemitem> user with the
     following commands:</para>

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to