Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e130cf4604ee5a7267f721e8b687a02d24d16d05)
+++ introduction/welcome/changelog.xml	(revision cb6de2e78ee00a73a0b24f7e00875584e5552b6a)
@@ -19,4 +19,10 @@
 <itemizedlist>
 
+<listitem><para>July 27th, 2004 [randy]: Added FTP download location to
+OpenSP; changed FTP download location and removed redundant sed command 
+in DocBook-DTD-3.1 instructions; added UnZip as an optional dependency and 
+changed sed commands to in-place edits on DocBook-DTD instructions.</para>
+</listitem>
+
 <listitem><para>July 27th, 2004 [randy]: Added pkgconfig as an optional
 dependency of XFree86 and Xorg; added gcc34 patch to OpenSP and Glib-1.2.10 
Index: pst/sgml/opensp.xml
===================================================================
--- pst/sgml/opensp.xml	(revision e130cf4604ee5a7267f721e8b687a02d24d16d05)
+++ pst/sgml/opensp.xml	(revision cb6de2e78ee00a73a0b24f7e00875584e5552b6a)
@@ -5,5 +5,5 @@
  
   <!ENTITY opensp-download-http "http://download.sourceforge.net/openjade/OpenSP-&opensp-version;.tar.gz">
-  <!ENTITY opensp-download-ftp  " ">
+  <!ENTITY opensp-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/OpenSP-&opensp-version;.tar.gz">
   <!ENTITY opensp-size          "1.4 MB">
   <!ENTITY opensp-buildsize     "37 MB">
@@ -39,7 +39,9 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink 
+<listitem><para>Required Patch (removes some annoying messages that can appear 
+while running <command>openjade</command>): <ulink 
 url="&patch-root;/OpenSP-&opensp-version;-LITLEN-1.patch"/></para></listitem>
-<listitem><para>Required Patch: <ulink 
+<listitem><para>Required Patch (if using 
+<application>GCC</application>-3.4.x): <ulink 
 url="&patch-root;/OpenSP-&opensp-version;-gcc34-1.patch"/></para></listitem>
 </itemizedlist></sect3>
@@ -89,12 +91,4 @@
 <sect2>
 <title>Command explanations</title>
-
-<para><command>patch -Np1 -i ../OpenSP-&opensp-version;-LITLEN-1.patch</command>: 
-This patch removes some annoying messages that can appear while running 
-<command>openjade</command></para>
-
-<para><command>patch -Np1 -i ../OpenSP-&opensp-version;-gcc34-1.patch</command>: 
-This patch fixes a build problem when using 
-<application>GCC</application>-3.4.x.</para>
 
 <para><option>--disable-static</option>: This switch prevents
Index: pst/sgml/sgml-dtd-3.xml
===================================================================
--- pst/sgml/sgml-dtd-3.xml	(revision e130cf4604ee5a7267f721e8b687a02d24d16d05)
+++ pst/sgml/sgml-dtd-3.xml	(revision cb6de2e78ee00a73a0b24f7e00875584e5552b6a)
@@ -5,5 +5,5 @@
   
   <!ENTITY sgml-dtd-3-download-http "http://www.docbook.org/sgml/3.1/docbk31.zip">
-  <!ENTITY sgml-dtd-3-download-ftp  "ftp://ftp.rutgers.edu/pub/kde/devel/docbook/SOURCES/docbk31.zip">
+  <!ENTITY sgml-dtd-3-download-ftp  "ftp://ftp.kde.org/pub/kde/devel/docbook/SOURCES/docbk31.zip">
   <!ENTITY sgml-dtd-3-size          "60 KB">
   <!ENTITY sgml-dtd-3-buildsize     "336 KB">
@@ -16,10 +16,12 @@
 
 <sect2>
-<title>Introduction to <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application></title>
+<title>Introduction to <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application></title>
 
-<para>The <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application> package contains document type definitions for verification of 
-<acronym>SGML</acronym> data files against the DocBook rule set. These are
-useful for structuring books and software documentation to a standard
-allowing you to utilize transformations already written for that
+<para>The <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application> package contains document type definitions 
+for verification of <acronym>SGML</acronym> data files against the DocBook rule 
+set. These are useful for structuring books and software documentation to a 
+standard allowing you to utilize transformations already written for that
 standard.</para>
 
@@ -37,7 +39,8 @@
 </sect3>
 
-<sect3><title><application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application> dependencies</title>
+<sect3><title><application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="sgml-common"/></para></sect4>
+<para><xref linkend="sgml-common"/> and <xref linkend="unzip"/></para></sect4>
 </sect3>
 
@@ -45,15 +48,15 @@
 
 <sect2>
-<title>Installation of <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application></title>
+<title>Installation of <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application></title>
 
-<para>Install <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application> by running the following commands:</para>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../use-unzip.xml"/>
 
-<screen><userinput><command>cp docbook.cat docbook.cat.orig &amp;&amp;
-sed -e '/ISO 8879/d' docbook.cat.orig > docbook.cat &amp;&amp;
-cp docbook.cat docbook.cat.orig &amp;&amp;
-sed -e '/gml/d' docbook.cat.orig > docbook.cat &amp;&amp;
-cp docbook.cat docbook.cat.orig &amp;&amp;
-sed -e 's|DTDDECL "-//OASIS//DTD DocBook V&sgml-dtd-3-version;//EN"|SGMLDECL|g' \
-    docbook.cat.orig > docbook.cat &amp;&amp;
+<para>Install <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application> by running the following commands:</para>
+
+<screen><userinput><command>sed -i -e '/ISO 8879/d' docbook.cat &amp;&amp;
+sed -i -e 's|DTDDECL "-//OASIS//DTD DocBook V&sgml-dtd-3-version;//EN"|SGMLDECL|g' \
+    docbook.cat &amp;&amp;
 install -d /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-3-version; &amp;&amp;
 chown -R root:root . &amp;&amp;
@@ -71,20 +74,17 @@
 <title>Command explanations</title>
 
-<para><screen><command>cp docbook.cat docbook.cat.orig
-sed -e '/ISO 8879/d' docbook.cat.orig > docbook.cat
-cp docbook.cat docbook.cat.orig
-sed -e '/gml/d' docbook.cat.orig > docbook.cat</command></screen>
-These commands remove the ENT definitions from the catalog file.</para>
+<para><command>sed -i -e '/ISO 8879/d' docbook.cat</command>: This command 
+removes the ENT definitions from the catalog file.</para>
 
-<para><screen><command>cp docbook.cat docbook.cat.orig
-sed -e 's|DTDDECL "-//OASIS//DTD Docbook V&sgml-dtd-3-version;//EN"|SGMLDECL|g' \
-    docbook.cat.orig > docbook.cat</command></screen>
-This command replaces the DTDDECL catalog entry, which is not supported
-by Linux <acronym>SGML</acronym> tools, with the SGMLDECL catalog entry.</para>
+<para><command>sed -i -e 's|DTDDECL "-//OASIS//DTD Docbook V&sgml-dtd-3-version;//EN"|SGMLDECL|g' 
+docbook.cat</command>: This command replaces the DTDDECL catalog entry, 
+which is not supported by Linux <acronym>SGML</acronym> tools, with the 
+SGMLDECL catalog entry.</para>
 
 </sect2>
 
 <sect2>
-<title>Configuring <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application></title>
+<title>Configuring <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application></title>
 
 <sect3><title>Config files</title>
@@ -96,6 +96,7 @@
 <para>The above installation script updates the catalog.</para>
 
-<para>Using only the most current 3.x version of
-<application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application> requires the following:</para>
+<para>Using only the most current 3.x version of <application>DocBook 
+<acronym>SGML</acronym> <acronym>DTD</acronym></application> requires the 
+following:</para>
 <screen><userinput><command>cat &gt;&gt; /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-3-version;/catalog &lt;&lt; "EOF"</command>
   -- Begin Single Major Version catalog changes --
@@ -113,6 +114,7 @@
 <title>Contents</title>
 
-<para>The <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application> package contains <filename>DTD</filename> files and
-<filename>MOD</filename> files.</para>
+<para>The <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application> package contains <filename>DTD</filename> 
+files and <filename>MOD</filename> files.</para>
 
 </sect2>
@@ -127,5 +129,6 @@
 <sect3><title>MOD files</title>
 <para><filename>MOD</filename> files contain components of the document type 
-definition that are sourced into the <filename>DTD</filename> files.</para></sect3>
+definition that are sourced into the <filename>DTD</filename> files.</para>
+</sect3>
 
 </sect2>
Index: pst/sgml/sgml-dtd.xml
===================================================================
--- pst/sgml/sgml-dtd.xml	(revision e130cf4604ee5a7267f721e8b687a02d24d16d05)
+++ pst/sgml/sgml-dtd.xml	(revision cb6de2e78ee00a73a0b24f7e00875584e5552b6a)
@@ -3,5 +3,5 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
- 
+
   <!ENTITY sgml-dtd-download-http "http://www.docbook.org/sgml/4.3/docbook-&sgml-dtd-version;.zip">
   <!ENTITY sgml-dtd-download-ftp  " ">
@@ -16,10 +16,12 @@
 
 <sect2>
-<title>Introduction to <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application></title>
+<title>Introduction to <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application></title>
 
-<para>The <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application> package contains document type definitions for verification of 
-<acronym>SGML</acronym> data files against the DocBook rule set. These are
-useful for structuring books and software documentation to a standard
-allowing you to utilize transformations already written for that
+<para>The <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application> package contains document type definitions 
+for verification of <acronym>SGML</acronym> data files against the DocBook rule 
+set. These are useful for structuring books and software documentation to a 
+standard allowing you to utilize transformations already written for that
 standard.</para>
 
@@ -37,7 +39,8 @@
 </sect3>
 
-<sect3><title><application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application> dependencies</title>
+<sect3><title><application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="sgml-common"/></para></sect4>
+<para><xref linkend="sgml-common"/> and <xref linkend="unzip"/></para></sect4>
 </sect3>
 
@@ -45,12 +48,14 @@
 
 <sect2>
-<title>Installation of <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application></title>
+<title>Installation of <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application></title>
 
-<para>Install <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application> by running the following commands:</para>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../use-unzip.xml"/>
 
-<screen><userinput><command>cp docbook.cat docbook.cat.orig &amp;&amp;
-sed -e '/ISO 8879/d' docbook.cat.orig > docbook.cat &amp;&amp;
-cp docbook.cat docbook.cat.orig &amp;&amp;
-sed -e '/gml/d' docbook.cat.orig > docbook.cat &amp;&amp;
+<para>Install <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application> by running the following commands:</para>
+
+<screen><userinput><command>sed -i -e '/ISO 8879/d' docbook.cat &amp;&amp;
+sed -i -e '/gml/d' docbook.cat &amp;&amp;
 install -d /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version; &amp;&amp;
 chown -R root:root . &amp;&amp;
@@ -68,8 +73,6 @@
 <title>Command explanations</title>
 
-<para><screen><command>cp docbook.cat docbook.cat.orig
-sed -e '/ISO 8879/d' docbook.cat.orig > docbook.cat
-cp docbook.cat docbook.cat.orig
-sed -e '/gml/d' docbook.cat.orig > docbook.cat</command></screen>
+<para><screen><command>sed -i -e '/ISO 8879/d' docbook.cat
+sed -i -e '/gml/d' docbook.cat</command></screen>
 These commands remove the ENT definitions from the catalog file.</para>
 
@@ -77,5 +80,6 @@
 
 <sect2>
-<title>Configuring <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application></title>
+<title>Configuring <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application></title>
 
 <sect3><title>Config files</title>
@@ -108,6 +112,7 @@
 <title>Contents</title>
 
-<para>The <application>DocBook <acronym>SGML</acronym> <acronym>DTD</acronym></application> package contains <filename>DTD</filename> files and
-<filename>MOD</filename> files.</para>
+<para>The <application>DocBook <acronym>SGML</acronym> 
+<acronym>DTD</acronym></application> package contains <filename>DTD</filename> 
+files and <filename>MOD</filename> files.</para>
 
 </sect2>
@@ -116,11 +121,12 @@
 
 <sect3><title>DTD files</title>
-<para><filename>DTD</filename> files contain a document type definition which defines the
-element types and the attribute lists that can be used in the
+<para><filename>DTD</filename> files contain a document type definition which 
+defines the element types and the attribute lists that can be used in the
 corresponding <acronym>SGML</acronym> files.</para></sect3>
 
 <sect3><title>MOD files</title>
-<para><filename>MOD</filename> files contain components of the document type definition that
-are sourced into the <filename>DTD</filename> files.</para></sect3>
+<para><filename>MOD</filename> files contain components of the document type 
+definition that are sourced into the <filename>DTD</filename> files.</para>
+</sect3>
 
 </sect2>
Index: use-unzip.xml
===================================================================
--- use-unzip.xml	(revision cb6de2e78ee00a73a0b24f7e00875584e5552b6a)
+++ use-unzip.xml	(revision cb6de2e78ee00a73a0b24f7e00875584e5552b6a)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" >
+
+<note><para>The package source is distributed in <filename>zip</filename>
+format and requires <command>unzip</command>. You should create a directory
+and change to that directory before <command>unzip</command>ping the file to
+ease the removal of the source files after the package has been installed.
+</para></note>
