Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ basicnet/netprogs/cvs.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -106,5 +106,5 @@
 make</userinput></screen>
 
-    <para>If you have <xref linkend="tex"/> installed and wish to create
+    <para>If you have <xref linkend="tetex"/> installed and wish to create
     Postscript, HTML or text docs from the documentation source files, issue
     any or all of the following commands:</para>
Index: book/preface.xml
===================================================================
--- book/preface.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ book/preface.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -277,5 +277,5 @@
     <application>Ghostscript</application>, <application>CUPS</application> and
     <application>DocBook</application> to installing
-    <application>TeX</application>.</para>
+    <application>teTeX</application>.</para>
 
     <bridgehead renderas="sect2">Appendices</bridgehead>
Index: general.ent
===================================================================
--- general.ent	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general.ent	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -623,5 +623,5 @@
 
 <!-- Chapter 47 -->
-<!ENTITY tex-version                  "3.0">
+<!ENTITY tetex-version                "3.0">
 <!ENTITY jadetex-version              "3.13">
 
Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/genlib/aspell.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -78,5 +78,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="tex"/></para>
+    <para role="optional"><xref linkend="tetex"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -95,5 +95,5 @@
 
     <para>Pre-built HTML documentation is included in the package. If you have
-    <application>TeX</application> installed and you wish to build additional
+    <application>teTeX</application> installed and you wish to build additional
     formats of the documentation, issue any or all of the following
     commands:</para>
Index: general/genlib/gmp.xml
===================================================================
--- general/genlib/gmp.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/genlib/gmp.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -74,5 +74,5 @@
 make</userinput></screen>
 
-    <para>If you have <xref linkend="tex"/> installed and you wish to create
+    <para>If you have <xref linkend="tetex"/> installed and you wish to create
     alternate formats of the documentation, issue any or all of the following
     commands:</para>
Index: general/genlib/gwrap.xml
===================================================================
--- general/genlib/gwrap.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/genlib/gwrap.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -105,5 +105,5 @@
 make</userinput></screen>
 
-    <para>If you have <xref linkend="tex"/> installed and wish to create
+    <para>If you have <xref linkend="tetex"/> installed and wish to create
     alternate formats of the documentation, issue the following
     commands:</para>
Index: general/genlib/libidl.xml
===================================================================
--- general/genlib/libidl.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/genlib/libidl.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -66,5 +66,5 @@
 
     <bridgehead renderas="sect4">Optional to Build Documentation</bridgehead>
-    <para role="optional"><xref linkend="tex"/></para>
+    <para role="optional"><xref linkend="tetex"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -82,5 +82,5 @@
 make</userinput></screen>
 
-    <para>If you have <application>TeX</application> installed and wish to
+    <para>If you have <application>teTeX</application> installed and wish to
     build the documentation, issue the following commands:</para>
 
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/genlib/libidn.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -103,5 +103,5 @@
 make</userinput></screen>
 
-    <para>If you have <xref linkend="tex"/> installed and wish to create a
+    <para>If you have <xref linkend="tetex"/> installed and wish to create a
     text version of the documentation, issue the following commands:</para>
 
Index: general/genlib/slib.xml
===================================================================
--- general/genlib/slib.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/genlib/slib.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -105,5 +105,5 @@
 make</userinput></screen>
 
-    <para>If you have <application>TeX</application> installed and wish to
+    <para>If you have <application>teTeX</application> installed and wish to
     build PDF, Postscript, HTML and text documentation, issue any or all of
     the following commands:</para>
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/genutils/imagemagick.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -143,5 +143,5 @@
     <ulink url="http://www.mpeg.org/MSSG/">MPEG-2 Video Codec</ulink>,
     <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
-    <xref linkend="tex"/>,
+    <xref linkend="tetex"/>,
     <ulink url="http://www.xfig.org/">Transfig</ulink>,
     <ulink url="http://txt2html.sourceforge.net/">txt2html</ulink>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/prog/doxygen.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -77,5 +77,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="qt"/>,
-    <xref linkend="tex"/>,
+    <xref linkend="tetex"/>,
     <xref linkend="python"/>,
     <xref linkend="espgs"/> or <xref linkend="gs"/>, and
@@ -105,5 +105,5 @@
     <para>If you wish to generate and install the package documentation
     (note that man pages have already been installed), you must have
-    <application>Python</application>, <application>TeX</application> (for
+    <application>Python</application>, <application>teTeX</application> (for
     HTML docs) and <application>Ghostscript</application> (for PDF docs)
     installed, then issue the following command as the
@@ -139,5 +139,5 @@
     need to use the language translation features, you must have
     <xref linkend="python"/> installed. If you require formulas to
-    create PDF documentation, then you must have <xref linkend="tex"/>
+    create PDF documentation, then you must have <xref linkend="tetex"/>
     installed. If you require formulas to convert PostScript files to bitmaps,
     then you must have <xref linkend="gs"/> or <xref linkend="espgs"/>
Index: general/prog/guile.xml
===================================================================
--- general/prog/guile.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/prog/guile.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -98,5 +98,5 @@
 make</userinput></screen>
 
-    <para>If you have <application>TeX</application> installed and wish to
+    <para>If you have <application>teTeX</application> installed and wish to
     build alternate formats of the documentation, issue the following
     commands:</para>
Index: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ general/prog/nasm.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -71,5 +71,5 @@
 
     <bridgehead renderas="sect4">Optional (for Building Documentation)</bridgehead>
-    <para role="optional"><xref linkend="tex"/>, and
+    <para role="optional"><xref linkend="tetex"/>, and
     <xref linkend="espgs"/> or <xref linkend="gs"/></para>
 
@@ -97,5 +97,5 @@
 
     <para>To build the RDOFF Postscript documentation,
-    ensure you have <xref linkend="tex"/> installed and issue:</para>
+    ensure you have <xref linkend="tetex"/> installed and issue:</para>
 
 <screen><userinput>sed -i -e "s/dvips \$&lt;/&amp; -o rdoff.ps/" rdoff/doc/Makefile &amp;&amp;
Index: gnome/add/evince.xml
===================================================================
--- gnome/add/evince.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ gnome/add/evince.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -84,5 +84,5 @@
     <xref linkend="dbus"/>,
     <xref linkend="libtiff"/>,
-    <xref linkend="tex"/>,
+    <xref linkend="tetex"/>,
     <ulink url="http://djvulibre.djvuzone.org/">DjVuLibre</ulink>, and
     <ulink url="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/">t1lib</ulink></para>
@@ -131,5 +131,5 @@
 
     <para><option>--enable-dvi</option>: Use this parameter if you have the
-    <application>TeX</application> package installed and you wish to build
+    <application>teTeX</application> package installed and you wish to build
     support to view DVI files.</para>
 
Index: gnome/add/gpdf.xml
===================================================================
--- gnome/add/gpdf.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ gnome/add/gpdf.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -68,5 +68,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="tex"/> and
+    <para role="optional"><xref linkend="tetex"/> and
     <ulink
     url="http://packages.qa.debian.org/libp/libpaper.html">libpaper</ulink></para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ introduction/welcome/changelog.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Renamed the TeX package to its proper name -
+          teTeX.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Added sed for additional xorg-6.9.0 security
           vulnerability.</para>
@@ -3648,5 +3652,5 @@
       <itemizedlist>
         <listitem>
-          <para>[randy] - Modified SLIB instructions to use TeX instead of
+          <para>[randy] - Modified SLIB instructions to use teTeX instead of
           Lynx to create the text documentation.</para>
         </listitem>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ introduction/welcome/credits.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -212,5 +212,5 @@
         libcapplet, libesmtp, libghttp, libglade, pine, portmap,
         PostgreSQL, qpopper, reiserfs, Samba, sendmail,
-        slrn, soup, tex, tcp-wrappers, and xinetd:
+        slrn, soup, teTeX, tcp-wrappers, and xinetd:
         <emphasis>Billy O'Connor</emphasis></para>
       </listitem>
@@ -430,5 +430,5 @@
       <listitem>
         <para><emphasis>Steffen Knollmann</emphasis>
-        for revising the JadeTeX instructions to work with Tex-3.0.</para>
+        for revising the JadeTeX instructions to work with teTex-3.0.</para>
       </listitem>
 
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ kde/add/kdegraphics.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -105,5 +105,5 @@
          outside version. Commenting this out for now
     <xref linkend="xpdf"/>, -->
-    <xref linkend="tex"/>,
+    <xref linkend="tetex"/>,
     <xref linkend="fribidi"/>,
     <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ multimedia/libdriv/gstreamer.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -79,5 +79,5 @@
     <para role="optional"><xref linkend="libxslt"/>,
     <xref linkend="gtk-doc"/>,
-    <xref linkend="tex"/>,
+    <xref linkend="tetex"/>,
     <xref linkend="gs"/> or
     <xref linkend="espgs"/>,
Index: multimedia/libdriv/libdvdcss.xml
===================================================================
--- multimedia/libdriv/libdvdcss.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ multimedia/libdriv/libdvdcss.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -64,5 +64,5 @@
     <bridgehead renderas="sect4">Optional (to Create Documentation)</bridgehead>
     <para role="optional"><xref linkend="doxygen"/> and
-    <xref linkend="tex"/></para>
+    <xref linkend="tetex"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -81,5 +81,5 @@
 
     <para>If you have <application>Doxygen</application> and
-    <application>TeX</application> installed, HTML and Postscript documentation
+    <application>teTeX</application> installed, HTML and Postscript documentation
     was created during the build. If you also want to install a PDF version of
     the reference manual, issue the following command:</para>
@@ -94,5 +94,5 @@
 
     <para>If you have <application>Doxygen</application> and
-    <application>TeX</application> installed, install the documentation using
+    <application>teTeX</application> installed, install the documentation using
     the following commands as the
     <systemitem class="username">root</systemitem> user:</para>
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ multimedia/videoutils/ffmpeg.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -108,5 +108,5 @@
     <ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26204-530.zip">
     AMR wideband</ulink>, and
-    <xref linkend="tex"/> (to build HTML documentation)</para>
+    <xref linkend="tetex"/> (to build HTML documentation)</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -134,5 +134,5 @@
 make</userinput></screen>
 
-    <para>If you have <application>TeX</application> installed, the man pages
+    <para>If you have <application>teTeX</application> installed, the man pages
     and HTML documentation were built during the <command>make</command>
     process. Skip to the <systemitem class="username">root</systemitem> user
@@ -149,5 +149,5 @@
 done</userinput></screen>
 
-    <para>If you do not have <application>TeX</application> installed, use the
+    <para>If you do not have <application>teTeX</application> installed, use the
     following command to build the man pages:</para>
 
@@ -158,5 +158,5 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you have <application>TeX</application> installed on your system,
+    <para>If you have <application>teTeX</application> installed on your system,
     install the documentation by issuing the following commands as the
     <systemitem class="username">root</systemitem> user (modify the command
Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ postlfs/security/gnupg.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -95,5 +95,5 @@
 make</userinput></screen>
 
-    <para>If you have <xref linkend="tex"/> installed and you wish to create
+    <para>If you have <xref linkend="tetex"/> installed and you wish to create
     documentation in alternate formats, issue the following commands:</para>
 
Index: pst/printing/gimp-print.xml
===================================================================
--- pst/printing/gimp-print.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ pst/printing/gimp-print.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -73,5 +73,5 @@
     <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
     <ulink url="http://www.linuxprinting.org/ijs/">IJS</ulink>,
-    <xref linkend="tex"/>,
+    <xref linkend="tetex"/>,
     <xref linkend="docbook-utils"/> and
     <xref linkend="espgs"/> or <xref linkend="gs"/></para>
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ pst/ps/a2ps.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -74,5 +74,5 @@
     <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="psutils"/>,
-    <xref linkend="tex"/>,
+    <xref linkend="tetex"/>,
     <xref linkend="gs"/> or <xref linkend="espgs"/>,
     <ulink
Index: pst/ps/enscript.xml
===================================================================
--- pst/ps/enscript.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ pst/ps/enscript.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -89,5 +89,5 @@
 make</userinput></screen>
 
-    <para>Though it is very sparse, if you have <xref linkend="tex"/>
+    <para>Though it is very sparse, if you have <xref linkend="tetex"/>
     installed, you can create alternate forms of the documentation by issuing
     any or all of the following commands:</para>
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ pst/scanning/sane.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -104,5 +104,5 @@
     <ulink url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>,
     <ulink url="http://www.gphoto.org/">libgphoto2</ulink>, and
-    <xref linkend="tex"/></para>
+    <xref linkend="tetex"/></para>
 
     <bridgehead renderas="sect4">Optional (Front Ends)</bridgehead>
Index: pst/typesetting/jadetex.xml
===================================================================
--- pst/typesetting/jadetex.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ pst/typesetting/jadetex.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -85,5 +85,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="tex"/> and
+    <para role="required"><xref linkend="tetex"/> and
     <xref linkend="openjade"/></para>
 
@@ -103,5 +103,5 @@
     <para>First, as the <systemitem class="username">root</systemitem> user,
     make some required modifications to the <filename>texmf.cnf</filename>
-    file already installed on the system by the <application>TeX</application>
+    file already installed on the system by the <application>teTeX</application>
     package, then build a new <filename>latex.fmt</filename> file using the
     following commands:</para>
@@ -215,5 +215,5 @@
     This command uses <command>kpsewhich</command> to locate the installed
     <filename>texmf.cnf</filename>. The first change is used to modify the
-    header of the file so that if <application>TeX</application> is upgraded,
+    header of the file so that if <application>teTeX</application> is upgraded,
     the file won't get overwritten. The next change adds a parameter to
     increase ConTeXt's memory size to accommodate
@@ -227,8 +227,8 @@
     <para><command>mktexlsr; ln -v -sf tex ...; ln -v -sf pdftex ...</command>:
     The <application>JadeTeX</application> programs are actually just symlinks
-    to the <application>TeX</application> programs. <command>mktexlsr</command>
-    updates <application>TeX</application>'s <filename>ls-R</filename> databases
+    to the <application>teTeX</application> programs. <command>mktexlsr</command>
+    updates <application>teTeX</application>'s <filename>ls-R</filename> databases
     used by the <filename class='libraryfile'>libkpathsea</filename> library so
-    that <application>TeX</application> knows to use the
+    that <application>teTeX</application> knows to use the
     <application>JadeTeX</application> <filename>.fmt</filename> files when
     <command>jadetex</command> or <command>pdfjadetex</command> is called.</para>
Index: pst/typesetting/tetex.xml
===================================================================
--- pst/typesetting/tetex.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
+++ pst/typesetting/tetex.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY tetex-download-http "http://www.tug.org/ftp/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-src-&tetex-version;.tar.gz" >
+  <!ENTITY tetex-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-src-&tetex-version;.tar.gz">
+  <!ENTITY tetex-md5sum        "944a4641e79e61043fdaf8f38ecbb4b3">
+  <!ENTITY tetex-size          "12.7 MB">
+  <!ENTITY tetex-buildsize     "423 MB (549 MB with optional tarball, additional 231 MB for CM-Super fonts)">
+  <!ENTITY tetex-time          "2.1 SBU">
+
+  <!ENTITY texmf-download-http "http://www.tug.org/ftp/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-texmf-&tetex-version;.tar.gz" >
+  <!ENTITY texmf-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-texmf-&tetex-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/&tetex-version;/distrib/tetex-texmfsrc-&tetex-version;.tar.gz" >
+  <!ENTITY texmfsrc-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-texmfsrc-&tetex-version;.tar.gz">
+  <!ENTITY texmfsrc-md5sum        "66c32a11964a49982ba2a32d3bbfe7f5">
+  <!ENTITY texmfsrc-size          "57.7 MB">
+
+  <!ENTITY cmsupersrc-download-http "&sources-anduin-http;/t/tetex-cm-super.tar.bz2" >
+  <!ENTITY cmsupersrc-download-ftp  "&sources-anduin-ftp;/t/tetex-cm-super.tar.bz2">
+  <!ENTITY cmsupersrc-md5sum        "d7c89fcb35f625b02853a0881a4ec760">
+  <!ENTITY cmsupersrc-size          "63.8 MB">
+]>
+
+<sect1 id="tetex" xreflabel="teTeX-&tetex-version;">
+  <?dbhtml filename="tetex.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">tetex-src-&tetex-version;.tar</keyword>
+      <keyword role="ftpdir">tetex</keyword>
+    </keywordset>
+  </sect1info>
+
+  <title>teTeX-&tetex-version;</title>
+
+  <indexterm zone="tetex">
+    <primary sortas="a-teTeX">teTeX</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to teTeX</title>
+
+    <para><application>teTeX</application> is an implementation of Donald
+    Knuth's TeX typesetting program. This package is able to create documents
+    in a variety of formats. The optional <filename>texmfsrc</filename> (TeX
+    METAFONT) tarball contains source code for programs to create and
+    manipulate TeX fonts.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&tetex-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&tetex-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &tetex-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &tetex-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &tetex-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &tetex-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
+    <itemizedlist spacing='compact'>
+      <title>Required Macros and Fonts</title>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&texmf-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&texmf-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &texmf-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &texmf-size;</para>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist spacing='compact'>
+      <title>Optional 'texmf' Sources:</title>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&texmfsrc-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&texmfsrc-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &texmfsrc-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &texmfsrc-size;</para>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist spacing='compact'>
+      <title>Optional 'cm-super' Sources:</title>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&cmsupersrc-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&cmsupersrc-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &cmsupersrc-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &cmsupersrc-size;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">teTeX Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="ed"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="libpng"/>,
+    <xref linkend="x-window-system"/>,
+    <xref linkend="tk-perl"/>,
+    <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
+    t1lib</ulink>, and
+    <ulink url="http://www.boutell.com/gd/">GD</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/tetex"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of teTeX</title>
+
+    <para>Before building <application>teTeX</application>, the macros and
+    fonts package (<filename>texmf</filename> tarball) must be installed.
+    Install the macros and fonts using the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -d -m755 /usr/share/texmf &amp;&amp;
+gzip -dc ../tetex-texmf-&tetex-version;.tar.gz \
+    | (umask 0; cd /usr/share/texmf; tar -xvf -)</userinput></screen>
+
+    <para>If the optional <filename>texmfsrc</filename> source code TAR ball
+    was downloaded, unpack it now as the <systemitem
+    class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>gzip -dc ../tetex-texmfsrc-&tetex-version;.tar.gz \
+    | (umask 0; cd /usr/share/texmf; tar -xvf -)</userinput></screen>
+
+    <para>Install <application>teTeX</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --exec-prefix=/usr \
+            --bindir=/usr/bin \
+            --without-texinfo \
+            --with-x=no \
+            --with-system-ncurses \
+            --with-system-zlib &amp;&amp;
+make all</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>. The tests
+    should complete without errors (there may be some errors which are
+    ignored).</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+texconfig-sys dvips paper letter &amp;&amp;
+texconfig-sys font rw</userinput></screen>
+
+    <note>
+      <para>The paper size may be changed to a4, as is used in most
+      countries.</para>
+    </note>
+
+    <para>To install the optional cm-super fonts, perform the following
+    instructions as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput>tar -xf ../tetex-cm-super.tar.bz2 &amp;&amp;
+FONTDIR=$(kpsewhich --expand-var '$TEXMFMAIN') &amp;&amp;
+mkdir -v -p $FONTDIR/fonts/afm/public/cm-super   \
+            $FONTDIR/fonts/type1/public/cm-super \
+            $FONTDIR/fonts/enc/dvips/cm-super    \
+            $FONTDIR/fonts/map/dvips/cm-super   &amp;&amp;
+
+cp -v cm-super/pfb/*.pfb $FONTDIR/fonts/type1/public/cm-super/ &amp;&amp;
+
+gunzip cm-super/afm/* &amp;&amp;
+cp -v cm-super/afm/*.afm $FONTDIR/fonts/afm/public/cm-super/ &amp;&amp;
+
+cp -v cm-super/dvips/*.enc $FONTDIR/fonts/enc/dvips/cm-super/ &amp;&amp;
+cp -v cm-super/dvips/*.map $FONTDIR/fonts/map/dvips/cm-super/ &amp;&amp;
+
+cat &gt;&gt; $FONTDIR/web2c/updmap.cfg &lt;&lt; "EOF" &amp;&amp;
+MixedMap cm-super-t1.map
+MixedMap cm-super-t2a.map
+MixedMap cm-super-t2b.map
+MixedMap cm-super-t2c.map
+MixedMap cm-super-ts1.map
+MixedMap cm-super-x2.map
+EOF
+
+mktexlsr &amp;&amp;
+updmap-sys &amp;&amp;
+
+unset FONTDIR</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--with-x=no</parameter>: This switch will avoid any
+    <application>X</application> dependencies. <application>teTeX</application>
+    can be compiled with <application>X</application> support, notably for
+    <command>xdvi</command>. If this is desired, remove this parameter.</para>
+
+    <para><parameter>--exec-prefix=/usr --bindir=/usr/bin</parameter>: These
+    switches ensure that <application>teTeX</application> binaries are installed
+    in <filename class="directory">/usr/bin</filename>.</para>
+
+    <para><parameter>--without-texinfo</parameter>: A default LFS installation
+    already has the <application>Texinfo</application> package installed. This
+    switch will avoid overwriting it with the included
+    <application>Texinfo</application> package.</para>
+
+    <para><parameter>--with-system-ncurses</parameter>: This switch specifies
+    using the already installed <filename
+    class="libraryfile">libncurses</filename> library.</para>
+
+    <para><parameter>--with-system-zlib</parameter>: A default LFS installation
+    already has the <application>Zlib</application> library installed. This
+    switch will avoid replacing it with the included
+    <application>Zlib</application> library.</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-sys dvips paper letter</command>: This command
+    sets the default paper size for <application>teTeX</application>.</para>
+
+    <para><command>texconfig-sys font rw</command>: This command specifies
+    creating and using a directory for globally writeable fonts.</para>
+
+    <para><command>mktexlsr</command>: This command recreates the
+    <application>teTeX</application> <filename>ls-R</filename> databases after
+    installing the CM-Super fonts.</para>
+
+    <para><command>updmap-sys</command>: This command updates the system-wide
+    font configuration to include the CM-Super fonts.</para>
+
+    <tip>
+      <para>Run <command>./configure --help</command> for information about
+      using other switches which will enable the build to use other installed
+      packages you may have on your system.</para>
+    </tip>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>100 separate binaries and scripts along with 30 symlinks to these
+        programs.</seg>
+        <seg>libkpathsea.a</seg>
+        <seg>/usr/include/kpathsea, /var/tmp/texfonts and the following
+        subdirectories of /usr/share/: texi2html, texinfo/html, texmf,
+        texmf-config and texmf-var</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="tetex-programs">
+        <term><command>teTeX programs</command></term>
+        <listitem>
+          <para>included in the <application>teTeX</application> package are too
+          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>teTeX</application> documentation.</para>
+          <indexterm zone="tetex tetex-programs">
+            <primary sortas="b-teTeX-programs">teTeX programs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libkpathsea">
+        <term><filename class='libraryfile'>libkpathsea.a</filename></term>
+        <listitem>
+          <para>contains functions used by <application>teTeX</application>
+          for searching and cataloging path names.</para>
+          <indexterm zone="tetex libkpathsea">
+            <primary sortas="c-libkpathsea">libkpathsea.a</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: t/typesetting/tex.xml
===================================================================
--- pst/typesetting/tex.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ 	(revision )
@@ -1,324 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!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     "423 MB (549 MB with optional tarball, additional 231 MB for CM-Super fonts)">
-  <!ENTITY tex-time          "2.1 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">
-
-  <!ENTITY cmsupersrc-download-http "&sources-anduin-http;/t/tetex-cm-super.tar.bz2" >
-  <!ENTITY cmsupersrc-download-ftp  "&sources-anduin-ftp;/t/tetex-cm-super.tar.bz2">
-  <!ENTITY cmsupersrc-md5sum        "d7c89fcb35f625b02853a0881a4ec760">
-  <!ENTITY cmsupersrc-size          "63.8 MB">
-]>
-
-<sect1 id="tex" xreflabel="TeX-&tex-version;">
-  <?dbhtml filename="tex.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">tetex-src-&tex-version;.tar</keyword>
-      <keyword role="ftpdir">tetex</keyword>
-    </keywordset>
-  </sect1info>
-
-  <title>TeX-&tex-version;</title>
-
-  <indexterm zone="tex">
-    <primary sortas="a-TeX">TeX</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TeX</title>
-
-    <para><application>TeX</application> is a typesetting package, able to create
-    documents in a variety of formats.  The optional <filename>texmfsrc</filename>
-    tarball contains source code for packages that are contained in the
-    <filename>texmf</filename> tarball, including the docstrip sources.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&tex-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tex-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tex-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tex-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tex-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tex-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing='compact'>
-      <title>Required Macros and Fonts</title>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&texmf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&texmf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &texmf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &texmf-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing='compact'>
-      <title>Optional 'texmf' Sources:</title>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&texmfsrc-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&texmfsrc-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &texmfsrc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &texmfsrc-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing='compact'>
-      <title>Optional 'cm-super' Sources:</title>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&cmsupersrc-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cmsupersrc-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cmsupersrc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cmsupersrc-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">TeX Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="ed"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libpng"/>,
-    <xref linkend="x-window-system"/>,
-    <xref linkend="tk-perl"/>,
-    <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
-    t1lib</ulink>
-    and <ulink url="http://www.boutell.com/gd/">GD</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/tex"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of TeX</title>
-
-    <para>Before building <application>TeX</application>, the macros and
-    fonts package (<filename>texmf</filename> tarball) must be installed.
-    Install the macros and fonts using the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/texmf &amp;&amp;
-gzip -dc ../tetex-texmf-&tex-version;.tar.gz \
-    | (umask 0; cd /usr/share/texmf; tar -xvf -)</userinput></screen>
-
-    <para>If the optional <filename>texmf</filename> source code TAR ball
-    was downloaded, untar it now as the <systemitem
-    class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>gzip -dc ../tetex-texmfsrc-&tex-version;.tar.gz \
-    | (umask 0; cd /usr/share/texmf; tar -xvf -)</userinput></screen>
-
-    <para>Install <application>TeX</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-    --exec-prefix=/usr --bindir=/usr/bin \
-    --without-texinfo --with-x=no \
-    --with-system-ncurses --with-system-zlib &amp;&amp;
-make all</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>. The tests
-    should complete without errors (there may be some errors which are
-    ignored).</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-texconfig-sys dvips paper letter &amp;&amp;
-texconfig-sys font rw</userinput></screen>
-
-    <note>
-      <para>The paper size may be changed to a4, as is used in most
-      countries.</para>
-    </note>
-
-    <para>To install the optional cm-super fonts, perform the following
-    instructions as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen><userinput>tar -xf ../tetex-cm-super.tar.bz2 &amp;&amp;
-FONTDIR=$(kpsewhich --expand-var '$TEXMFMAIN') &amp;&amp;
-mkdir -p $FONTDIR/fonts/afm/public/cm-super   \
-         $FONTDIR/fonts/type1/public/cm-super \
-         $FONTDIR/fonts/enc/dvips/cm-super    \
-         $FONTDIR/fonts/map/dvips/cm-super   &amp;&amp;
-
-cp -v cm-super/pfb/*.pfb $FONTDIR/fonts/type1/public/cm-super/ &amp;&amp;
-
-gunzip cm-super/afm/* &amp;&amp;
-cp -v cm-super/afm/*.afm $FONTDIR/fonts/afm/public/cm-super/ &amp;&amp;
-
-cp -v cm-super/dvips/*.enc $FONTDIR/fonts/enc/dvips/cm-super/ &amp;&amp;
-cp -v cm-super/dvips/*.map $FONTDIR/fonts/map/dvips/cm-super/ &amp;&amp;
-
-cat &gt;&gt; $FONTDIR/web2c/updmap.cfg &lt;&lt; "EOF" &amp;&amp;
-MixedMap cm-super-t1.map
-MixedMap cm-super-t2a.map
-MixedMap cm-super-t2b.map
-MixedMap cm-super-t2c.map
-MixedMap cm-super-ts1.map
-MixedMap cm-super-x2.map
-EOF
-
-mktexlsr &amp;&amp;
-updmap-sys &amp;&amp;
-
-unset FONTDIR</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-x=no</parameter>: This switch will avoid any
-    <application>X</application> dependencies. <application>TeX</application>
-    can be compiled with <application>X</application> support, notably for
-    <command>xdvi</command>. If this is desired, remove this parameter.</para>
-
-    <para><parameter>--exec-prefix=/usr --bindir=/usr/bin</parameter>: These
-    switches ensure that <application>TeX</application> binaries are installed
-    in <filename class="directory">/usr/bin</filename>.</para>
-
-    <para><parameter>--without-texinfo</parameter>: A default LFS installation
-    already has the <application>Texinfo</application> package installed; this
-    switch will avoid overwriting it with the included
-    <application>Texinfo</application> package.</para>
-
-    <para><parameter>--with-system-ncurses</parameter>: This switch specifies
-    using the already installed <filename
-    class="libraryfile">libncurses</filename> library.</para>
-
-    <para><parameter>--with-system-zlib</parameter>: LFS systems include the
-    <application>Zlib</application> library; 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-sys dvips paper letter</command>: This command
-    sets the default paper size for <application>TeX</application>.</para>
-
-    <para><command>texconfig-sys font rw</command>: This command specifies
-    creating and using a directory for globally writable fonts.</para>
-
-    <para><command>mktexlsr</command>: This command recreates the
-    <application>TeX</application> <filename>ls-R</filename> databases after
-    installing the CM-Super fonts.</para>
-
-    <para><command>updmap-sys</command>: This command updates the system-wide
-    font configuration to include the CM-Super fonts.</para>
-
-    <tip>
-      <para>Run <command>./configure --help</command> for information about
-      using other switches which will enable the build to use other installed
-      packages you may have on your system.</para>
-    </tip>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>100 separate binaries and scripts along with 30 symlinks to these
-        programs.</seg>
-        <seg>libkpathsea.a</seg>
-        <seg>/usr/include/kpathsea, /usr/share/texinfo/html, /usr/share/texmf,
-        /usr/share/texi2html, /usr/share/texmf-var and /var/tmp/texfonts</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tex-programs">
-        <term><command>TeX programs</command></term>
-        <listitem>
-          <para>included in the <application>TeX</application> package are too
-          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>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkpathsea">
-        <term><filename class='libraryfile'>libkpathsea.a</filename></term>
-        <listitem>
-          <para>contains functions used by <application>TeX</application>
-          for searching and cataloging path names.</para>
-          <indexterm zone="tex libkpathsea">
-            <primary sortas="c-libkpathsea">libkpathsea.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/typesetting/typesetting.xml
===================================================================
--- pst/typesetting/typesetting.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ pst/typesetting/typesetting.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -14,5 +14,5 @@
   typesetting.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tetex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="jadetex.xml"/>
 
Index: server/databases/mysql.xml
===================================================================
--- server/databases/mysql.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ server/databases/mysql.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -80,5 +80,5 @@
 
     <xref linkend="doxygen"/> and
-    <xref linkend="tex"/></para>
+    <xref linkend="tetex"/></para>
     -->
 
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision efc5b5accfb09beb96b55de93f9883deaa70324f)
+++ server/major/bind.xml	(revision 520f6b4fd89b7d2cca14d99eb0e7c24da8c9cdad)
@@ -84,5 +84,5 @@
     Documentation)</bridgehead>
     <para role="optional">
-    <xref linkend="tex"/> and
+    <xref linkend="tetex"/> and
     <xref linkend="libxslt"/></para>
 
