Index: general.ent
===================================================================
--- general.ent	(revision d0a5083aeac631d9c879c90ee4456ced9ad94aa1)
+++ general.ent	(revision cf068ee1995b2c9027704197799b6c8f08987ec2)
@@ -504,5 +504,5 @@
 
 <!-- Chapter 46 --> 
-<!ENTITY tex-version                  "2.0.2"> 
+<!ENTITY tex-version                  "3.0"> 
 <!ENTITY jadetex-version              "3.13"> 
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d0a5083aeac631d9c879c90ee4456ced9ad94aa1)
+++ introduction/welcome/changelog.xml	(revision cf068ee1995b2c9027704197799b6c8f08987ec2)
@@ -23,6 +23,6 @@
 <itemizedlist>
 
-<listitem><para>April 6th, 2005 [randy]: Updated to 
-MySQL-4.1.10a</para></listitem>
+<listitem><para>April 6th, 2005 [randy]: Updated to MySQL-4.1.10a and 
+TeX-3.0.</para></listitem>
 
 <listitem><para>April 5th, 2005 [randy]: Added a note to the GCC-3.4.3 
@@ -37,8 +37,8 @@
 
 <listitem><para>April 3rd, 2005 [manuel]: Updated the XML sources to use
-DocBook XML DTD-4.4</para></listitem>
+DocBook XML DTD-4.4.</para></listitem>
 
 <listitem><para>April 3rd, 2005 [randy]: Updated to 
-libxslt-1.1.14</para></listitem>
+libxslt-1.1.14.</para></listitem>
 
 <listitem><para>April 2nd, 2005 [randy]: Added which as a required dependency 
@@ -72,5 +72,5 @@
 
 <listitem><para>March 26th, 2005 [randy]: Updated to HTML Tidy-050324 and 
-UnZip-5.52</para></listitem>
+UnZip-5.52.</para></listitem>
 
 <listitem><para>March 25th, 2005 [randy]: Updated to 
Index: postlfs/editors/ed.xml
===================================================================
--- postlfs/editors/ed.xml	(revision d0a5083aeac631d9c879c90ee4456ced9ad94aa1)
+++ postlfs/editors/ed.xml	(revision cf068ee1995b2c9027704197799b6c8f08987ec2)
@@ -9,6 +9,6 @@
   <!ENTITY ed-md5sum        "ddd57463774cae9b50e70cd51221281b">
   <!ENTITY ed-size          "182 KB">
-  <!ENTITY ed-buildsize     "3.1 MB">
-  <!ENTITY ed-time          "0.10 SBU">
+  <!ENTITY ed-buildsize     "2.9 MB">
+  <!ENTITY ed-time          "0.02 SBU">
 ]>
 
@@ -22,5 +22,4 @@
 <indexterm zone="ed"><primary
 sortas="a-Ed">Ed</primary></indexterm>
-
 
 <sect2>
@@ -122,6 +121,5 @@
 <term><filename>red</filename></term>
 <listitem><para>is a restricted ed&mdash;it can only edit files in the
-current directory and cannot execute shell commands.
-</para>
+current directory and cannot execute shell commands.</para>
 <indexterm zone="ed red">
 <primary sortas="b-red">red</primary></indexterm>
Index: pst/typesetting/tex.xml
===================================================================
--- pst/typesetting/tex.xml	(revision d0a5083aeac631d9c879c90ee4456ced9ad94aa1)
+++ pst/typesetting/tex.xml	(revision cf068ee1995b2c9027704197799b6c8f08987ec2)
@@ -4,21 +4,20 @@
   %general-entities;
 
-  <!ENTITY tex-download-http "http://www.ibiblio.org/pub/packages/tex/teTeX/distrib/tetex-src-&tex-version;.tar.gz" >
-  <!-- <!ENTITY tex-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/2.0/distrib/tetex-src-&tex-version;.tar.gz"> -->
-  <!ENTITY tex-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/tetex-src-&tex-version;.tar.gz">
-  <!ENTITY tex-md5sum        "a16f6bba227d55e79aeee46fbbd82d28">
-  <!ENTITY tex-size          "11.7 MB">
-  <!ENTITY tex-buildsize     "344 MB (415 MB with optional tarball)">
-  <!ENTITY tex-time          "1.82 SBU">
-
-  <!-- <!ENTITY texmf-download    "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/2.0/distrib/tetex-texmf-&tex-version;.tar.gz"> -->
-  <!ENTITY texmf-download    "http://www.ibiblio.org/pub/packages/tex/teTeX/distrib/tetex-texmf-&tex-version;.tar.gz">
-  <!ENTITY texmf-md5sum      "d3bdb96f9077e43b2115d3cc471743b3">
-  <!ENTITY texmf-size        "52.4 MB">
-
-  <!-- <!ENTITY texmfsrc-download "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/2.0/distrib/tetex-texmfsrc-&tex-version;.tar.gz"> -->
-  <!ENTITY texmfsrc-download "http://www.ibiblio.org/pub/packages/tex/teTeX/distrib/tetex-texmfsrc-&tex-version;.tar.gz">
-  <!ENTITY texmfsrc-md5sum   "40d4b2c5582eccbee4b6ec692c3cc253">
-  <!ENTITY texmfsrc-size     "22.9 MB">
+  <!ENTITY tex-download-http "http://www.tug.org/ftp/tex-archive/systems/unix/teTeX/&tex-version;/distrib/tetex-src-&tex-version;.tar.gz" >
+  <!ENTITY tex-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/&tex-version;/distrib/tetex-src-&tex-version;.tar.gz">
+  <!ENTITY tex-md5sum        "944a4641e79e61043fdaf8f38ecbb4b3">
+  <!ENTITY tex-size          "12.7 MB">
+  <!ENTITY tex-buildsize     "416 MB (542 MB with optional tarball)">
+  <!ENTITY tex-time          "2.07 SBU">
+
+  <!ENTITY texmf-download-http "http://www.tug.org/ftp/tex-archive/systems/unix/teTeX/&tex-version;/distrib/tetex-texmf-&tex-version;.tar.gz" >
+  <!ENTITY texmf-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/&tex-version;/distrib/tetex-texmf-&tex-version;.tar.gz">
+  <!ENTITY texmf-md5sum        "11aa15c8d3e28ee7815e0d5fcdf43fd4">
+  <!ENTITY texmf-size          "91.7 MB">
+
+  <!ENTITY texmfsrc-download-http "http://www.tug.org/ftp/tex-archive/systems/unix/teTeX/&tex-version;/distrib/tetex-texmfsrc-&tex-version;.tar.gz" >
+  <!ENTITY texmfsrc-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/&tex-version;/distrib/tetex-texmfsrc-&tex-version;.tar.gz">
+  <!ENTITY texmfsrc-md5sum   "66c32a11964a49982ba2a32d3bbfe7f5">
+  <!ENTITY texmfsrc-size     "57.7 MB">
 ]>
 
@@ -59,6 +58,8 @@
 <sect4><title>Required macros and fonts</title>
 <itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&texmf-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): 
-<ulink url="&texmf-download;"/></para></listitem>
+<ulink url="&texmf-download-ftp;"/></para></listitem>
 <listitem><para>Download MD5 sum: &texmf-md5sum;</para></listitem>
 <listitem><para>Download size: &texmf-size;</para></listitem>
@@ -68,6 +69,8 @@
 <sect4><title>Optional <filename>texmf</filename> sources:</title>
 <itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&texmfsrc-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): 
-<ulink url="&texmfsrc-download;"/></para></listitem>
+<ulink url="&texmfsrc-download-ftp;"/></para></listitem>
 <listitem><para>Download MD5 sum: &texmfsrc-md5sum;</para></listitem>
 <listitem><para>Download size: &texmfsrc-size;</para></listitem>
@@ -75,4 +78,5 @@
 </sect4>
 
+<!-- 
 <sect4><title>Patches</title>
 <itemizedlist spacing='compact'>
@@ -84,4 +88,5 @@
 </itemizedlist>
 </sect4>
+ -->
 </sect3>
 
@@ -94,10 +99,10 @@
 <para><xref linkend="libpng"/>, 
 <xref linkend="x-installing"/>, 
-<xref linkend="openssl"/>, 
-<xref linkend="mysql"/>, 
+<!-- <xref linkend="openssl"/>, 
+<xref linkend="mysql"/>, -->
 <xref linkend="perl-modules"/>: Tk-&Perl-Tk-version;, <ulink 
 url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.0.2.tar.gz">
 t1lib</ulink> 
-and <ulink url="http://www.w3.org/Library/">libwww</ulink></para>
+and <ulink url="http://www.boutell.com/gd/">GD</ulink></para>
 </sect4>
 </sect3>
@@ -134,9 +139,13 @@
 commands:</para>
 
+<!-- 
 <screen><userinput><command>patch -Np1 -i ../tetex-src-&tex-version;-flex-1.patch &amp;&amp;
 patch -Np1 -i ../tetex-src-&tex-version;-remove_readlink-1.patch &amp;&amp;
-./configure --with-x=no --prefix=/usr \
-    --without-texinfo --with-system-ncurses --with-system-zlib \
-    --exec-prefix=/usr --bindir=/usr/bin &amp;&amp;
+ -->
+
+<screen><userinput><command>./configure --prefix=/usr \
+    --exec-prefix=/usr --bindir=/usr/bin \
+    --without-texinfo --with-x=no \
+    --with-system-ncurses --with-system-zlib &amp;&amp;
 make all</command></userinput></screen>
 
@@ -180,4 +189,7 @@
 part of the base operating system; this switch avoids building it here.</para> 
 
+<para><option>--disable-a4</option>: Use this option to set the default paper 
+size to letter and the default unit to inch.</para>
+
 <para><command>texconfig dvips paper letter</command>: This command sets the 
 default paper size for <application>TeX</application>.</para>
@@ -185,4 +197,8 @@
 <para><command>texconfig font rw</command>: This command specifies writable 
 fonts.</para>
+
+<tip><para>Run <command>./configure --help</command> for information about 
+using other switches which will enable the build to use any installed packages 
+you may have on your system.</para></tip>
 
 </sect2>
@@ -194,10 +210,11 @@
 <segtitle>Installed Programs</segtitle>
 <segtitle>Installed Library</segtitle>
-<segtitle>Installed Directory</segtitle>
+<segtitle>Installed Directories</segtitle>
 <seglistitem>
-<seg>101 separate binaries and scripts along with 37 symlinks to these 
+<seg>100 separate binaries and scripts along with 30 symlinks to these 
 programs.</seg>
 <seg>libkpathsea.a</seg>
-<seg>/usr/share/texmf</seg>
+<seg>~/.texmf-config, /usr/include/kpathsea, /usr/share/texinfo/html, 
+/usr/share/texmf, /usr/share/texi2html and /usr/share/texmf-var</seg>
 </seglistitem>
 </segmentedlist>
@@ -210,7 +227,8 @@
 <term><command>TeX programs</command></term>
 <listitem><para>included in the <application>TeX</application> package are too 
-numerous to individually list. Please refer to 
-<ulink url="file:///usr/share/texmf/doc/index.html"/> for details, as well as 
-a tour of the expansive <application>TeX</application> documentation.</para>
+numerous to individually list. Please refer to the individual program man 
+pages and <ulink url="file:///usr/share/texmf/doc/index.html"/> for details, 
+as well as a tour of the expansive 
+<application>TeX</application> documentation.</para>
 <indexterm zone="tex tex-programs">
 <primary sortas="b-TeX-programs">TeX programs</primary></indexterm>
