Index: book/organization.xml
===================================================================
--- book/organization.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ book/organization.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -88,5 +88,5 @@
   <application>Ghostscript</application>, <application>CUPS</application> and
   <application>DocBook</application> to installing
-  <application>teTeX</application>.</para>
+  <application>texlive</application>.</para>
 
   <bridgehead renderas="sect2">Appendices</bridgehead>
Index: general.ent
===================================================================
--- general.ent	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general.ent	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -54,5 +54,4 @@
      packages referenced throughout the BLFS book. -->
 <!ENTITY lfs-autoconf-version         "2.67">
-<!-- <!ENTITY lfs-bdb-version              "4.7.25"> -->
 <!ENTITY lfs-coreutils-version        "8.5">
 <!ENTITY lfs-e2fsprogs-version        "1.41.12">
@@ -186,9 +185,4 @@
 <!ENTITY tripwire-version             "2.4.2.2">
 
-<!-- Removed
-<!ENTITY heimdal-version              "1.4">
-<!ENTITY tcpwrappers-version          "7.6">
--->
-
 <!-- Chapter 5 -->
 <!ENTITY fuse-version                 "2.9.1">
@@ -214,17 +208,6 @@
 <!ENTITY zsh-version                  "5.0.0">
 
-<!-- Removed
-<!ENTITY ksh-version                  "2008-11-04">
--->
-
 <!-- Chapter 8 Virtualization -->
 <!ENTITY qemu-kvm-version             "1.1.1">
-
-<!-- Removed
-<!ENTITY libosinfo-version            "0.1.1">
-<!ENTITY libvirt-version              "0.9.12">
-<!ENTITY libvirt-glib-version         "0.0.8">
-<!ENTITY spice-gtk-version            "0.11">
--->
 
 <!-- Part III -->
@@ -301,20 +284,4 @@
 <!ENTITY wv-version                   "1.2.9">
 
-<!-- Removed
-<!ENTITY fam-version                  "2.7.0">
-<!ENTITY gdbm-version                 "1.8.3">
-<!ENTITY gir-repository-version       "0.6.5">
-<!ENTITY ispell-version               "3.2.06.epa7">
-<!ENTITY libelf-version               "0.8.13">
-<!ENTITY libggz-version               "0.0.14.1">
-<!ENTITY libgtkhtml-version           "2.11.1">
-<!ENTITY libmcs-version               "0.7.1">
-<!ENTITY libmowgli-version            "1.0.0">
-<!ENTITY liboil-version               "0.3.17">
-<!ENTITY libxml-version               "1.8.17">
-<!ENTITY gmp-version                  "4.2.2">
-<!ENTITY gwrap-version                "1.3.4">
--->
-
 <!-- Chapter 10 -->
 <!ENTITY aalib-version                "1.4rc5">
@@ -342,9 +309,4 @@
 <!ENTITY pixman-version               "0.26.2">
 <!ENTITY poppler-version              "0.20.4">
-
-<!-- Removed
-<!ENTITY libungif-version             "4.1.3">
-<!ENTITY imlib-version                "1.9.15">
--->
 
 <!-- Chapter 11 -->
@@ -374,10 +336,4 @@
 <!ENTITY unixodbc-version             "2.3.1">
 <!ENTITY xscreensaver-version         "5.19">
-
-<!--
-<!ENTITY ggz-client-libs-version      "0.0.14.1">
-<!ENTITY rman-version                 "3.2">
-<!ENTITY scrollkeeper-version         "0.3.14">
--->
 
 <!-- Chapter 12 -->
@@ -419,11 +375,4 @@
 <!ENTITY zip-version                  "3.0">
 
-<!-- Removed
-<!ENTITY dbus-qt3-version             "0.62">
-<!ENTITY DeviceKit-version            "003">
-<!ENTITY lzma-utils-version           "4.32.7">
-<!ENTITY hal-version                  "0.5.14">
--->
-
 <!-- Chapter 13 -->
 <!ENTITY bazaar-version               "2.5.0">
@@ -462,9 +411,4 @@
 <!ENTITY python3-majorver             "3.2">
 
-<!-- Removed
-<!ENTITY gcc3-version                 "3.3.6">
-<!ENTITY pdl-version                  "2.4.2">
--->
-
 <!-- Perl module versions used in the Perl Modules instructions -->
 <!ENTITY Archive-Zip-version          "1.30">
@@ -484,56 +428,4 @@
 <!ENTITY XML-Simple-version           "2.18">
 
-<!-- Perl modules no longer in blfs
-<!ENTITY Algorithm-Diff-version       "1.1902">
-<!ENTITY Business-ISBN-Data-version   "1.17">
-<!ENTITY Business-ISBN-version        "1.84">
-<!ENTITY Devel-Symdump-version        "2.08">
-<!ENTITY Digest-BubbleBabble-version  "0.01">
-<!ENTITY Digest-HMAC-version          "1.01">
-<!ENTITY Digest-SHA1-version          "2.11">
-<!ENTITY Finance-QuoteHist-version    "1.11">
-<!ENTITY HTML-Element-Extended-version "1.17">
-<!ENTITY HTML-Tagset-version          "3.10">
-<!ENTITY HTML-Tree-version            "3.23">
-<!ENTITY IO-Socket-INET6-version      "2.51">
-<!ENTITY Module-Corelist-version      "2.12">
-<!ENTITY Module-Info-version          "0.32">
-<!ENTITY Module-Signature-version     "0.55">
-<!ENTITY Net-DBus-version             "0.33.5">
-<!ENTITY Net-IP-version               "1.24">
-<!ENTITY PAR-Dist-version             "0.31">
-<!ENTITY Tk-Perl-version              "804.029">
-<!ENTITY Pod-Coverage-version         "0.21">
-<!ENTITY Socket6-version              "0.19">
-<!ENTITY Spiffy-version               "0.30">
-<!ENTITY Test-Base-version            "0.54">
-<!ENTITY Test-Pod-version             "1.44">
-<!ENTITY Test-Pod-Coverage-version    "1.08">
-<!ENTITY Test-Prereq-version          "1.033">
-<!ENTITY Text-CSV-version             "1.05">
-<!ENTITY Text-CSV_XS-version          "0.52">
-<!ENTITY Text-Diff-version            "0.35">
-<!ENTITY Tie-IxHash-version           "1.22">
-<!ENTITY XML-LibXML-version           "1.70">
-<!ENTITY XML-NamespaceSupport-version "1.11">
-<!ENTITY XML-SAX-version              "0.96">
-<!ENTITY XML-SAX-Expat-version        "0.40">
-<!ENTITY YAML-version                 "0.65">
--->
-
-<!-- Perl module versions used in the PDL instructions
-<!ENTITY Filter-version               "1.32">
-<!ENTITY Term-ReadLine-Gnu-version    "1.15">
-<!ENTITY ExtUtils-F77-version         "1.15">
-<!ENTITY Inline-version               "0.44">
-<!ENTITY PGPLOT-perl-version          "2.19">
-<!ENTITY Parse-RecDescent-version     "1.94">
-<!ENTITY Astro-FITS-Header-version    "2.8.1">
-<!ENTITY Astro-FITS-CFITSIO-version   "1.03">
-<!ENTITY NDF-version                  "1.45">
-<!ENTITY GSD-version                  "1.13">
-<!ENTITY Starlink-Config-version      "1.00">
--->
-
 <!-- Python module versions used in the Python Modules instructions -->
 <!ENTITY notify-python-version        "0.1.1">
@@ -548,12 +440,4 @@
 <!ENTITY pyxdg-version                "0.22">
 
-<!--- Removed
-<!ENTITY pycairo-version              "1.10.0">
-<!ENTITY pyorbit-version              "2.24.0">
-<!ENTITY gnome-python-version         "2.28.1">
-<!ENTITY gnome-python-desktop-version "2.30.2">
-<!ENTITY ipython-version              "0.12">
--->
-
 <!-- Part IV -->
 <!-- Chapter 14 -->
@@ -561,8 +445,4 @@
 <!ENTITY dhcpcd-version               "5.6.1">
 <!ENTITY dhcp-version                 "4.2.4-P1">
-
-<!-- Obsolete
-<!ENTITY wvdial-version               "1.54.0">
-<!ENTITY pppoe-version                "3.8">-->
 
 <!-- Chapter 15 -->
@@ -611,11 +491,4 @@
 <!ENTITY neon-version                 "0.29.6">
 
-<!-- Removed
-<!ENTITY geocode-glib-version         "0.99.0">
-<!ENTITY gnet-version                 "2.0.7">
-<!ENTITY libchamplain-version         "0.12.3">
-<!ENTITY wvstreams-version            "4.2.2">
--->
-
 <!-- Chapter 18 -->
 <!ENTITY Links-version                "2.7">
@@ -628,25 +501,11 @@
 <!ENTITY fetchmail-version            "6.3.21">
 <!ENTITY mutt-version                 "1.5.21">
-<!-- replaced by re-alpine
-<!ENTITY pine-version                 "4.64">
--->
 <!ENTITY re-alpine-version            "2.02">
 <!ENTITY tin-version                  "1.8.3">
-
-<!-- Obsolete as Tin has replaced it
-<!ENTITY slrn-version                 "0.9.8.1">
--->
-
-
-<!-- Obsolete
-<!ENTITY ncpfs-version                "2.2.4">
--->
 
 <!-- Part V -->
 <!-- Chapter 20 -->
 <!ENTITY apache-version               "2.4.3">
-<!-- openssh (chapter 4) -->
 <!ENTITY proftpd-version              "1.3.4a">
-<!-- samba3 (chapter 14) -->
 <!ENTITY vsftpd-version               "3.0.0">
 
@@ -657,8 +516,4 @@
 <!ENTITY sendmail-version             "8.14.5">
 
-<!-- Obsolete
-<!ENTITY courier-version              "0.47">
--->
-
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "5.3.21">
@@ -672,8 +527,4 @@
 <!ENTITY soprano-version              "2.8.0">
 <!ENTITY xinetd-version               "2.3.15"> 
-
-<!-- removed 
-<!ENTITY leafnode-version             "1.11.5"> 
--->
 
 <!-- Part VI -->
@@ -699,8 +550,4 @@
 <!ENTITY xclock-version               "1.0.6">
 <!ENTITY xinit-version                "1.3.2">
-<!-- Obsolete
-<!ENTITY xorg-version                 "6.9.0">
-<!ENTITY xfree86-version              "4.6.0">
--->
 
 <!-- Chapter 25 -->
@@ -727,5 +574,4 @@
 <!ENTITY gtk-vnc-version              "0.5.1">
 <!ENTITY hicolor-icon-theme-version   "0.12">
-<!-- <!ENTITY lesstif-version              "0.95.2"> -->
 <!ENTITY libnotify-version            "0.7.5">
 <!ENTITY libsexy-version              "0.1.11">
@@ -894,72 +740,4 @@
 <!ENTITY libgnomeui-version           "2.24.5">
 
-<!-- Removed
-<!ENTITY accerciser-version           "3.4.1">
-<!ENTITY anjuta-version               "3.4.4">
-<!ENTITY cantarell-fonts-version      "0.0.9">
-<!ENTITY devhelp-version              "3.4.1">
-<!ENTITY gdl-version                  "3.4.2">
-<!ENTITY gdlmm-version                "3.3.2">
-<!ENTITY ghex-version                 "3.4.1">
-<!ENTITY glade-version                "3.12.1">
-<!ENTITY gnome-applets-version        "3.4.1">
-<!ENTITY gnome-boxes-version          "3.4.3">
-<!ENTITY gnome-devel-docs-version     "3.4.1">
-<!ENTITY gnome-documents-version      "0.4.2">
-<!ENTITY gnome-font-viewer-version    "3.4.0">
-<!ENTITY gssdp-version                "0.12.1">
-<!ENTITY gtksourceviewmm-version      "3.2.0">
-<!ENTITY gupnp-version                "0.18.3">
-<!ENTITY gupnp-av-version             "0.10.2">
-<!ENTITY gupnp-dlna-version           "0.6.6">
-<!ENTITY gupnp-vala-version           "0.10.3">
-<!ENTITY libgda-version               "5.0.3">
-<!ENTITY mobile-broadband-provider-info-version "20120614">
-<!ENTITY nemiver-version              "0.9.3">
-<!ENTITY rygel-version                "0.14.3">
-<!ENTITY sushi-version                "0.4.1">
-<!ENTITY tracker-version              "0.14.2">
-<!ENTITY yelp-tools-version           "3.4.1">
--->
-
-<!-- Obsolete
-<!ENTITY at-spi-version               "1.30.1">
-<!ENTITY bug-buddy-version            "2.30.0">
-<!ENTITY dasher-version               "4.11">
-<!ENTITY deskbar-applet-version       "2.30.1">
-<!ENTITY eel-version                  "2.18.3">
-<!ENTITY ekiga-version                "3.2.7">
-<!ENTITY gail-version                 "1.22.3">
-<!ENTITY gal-version                  "2.4.3">
-<!ENTITY gconf-editor-version         "2.30.0">
-<!ENTITY ggv-version                  "2.12.0">
-<!ENTITY gnome-audio-version          "2.0.0">
-<!ENTITY gnome-keyring-manager-version "2.18.0">
-<!ENTITY gnome-mount-version          "0.8">
-<!ENTITY gnome-mag-version            "0.16.1">
-<!ENTITY gnome-netstatus-version      "2.28.1">
-<!ENTITY gnome-speech-version         "0.4.25">
-<!ENTITY gnome-system-tools-version   "2.30.2">
-<!ENTITY gnome-themes-version         "2.30.2">
-<!ENTITY gnome-vfs-monikers-version   "2.15.3">
-<!ENTITY gnome-volume-manager-version "2.17.0">
-<!ENTITY gnome2-user-docs-version     "2.8.1">
-<!ENTITY gnomemeeting-version         "1.2.2">
-<!ENTITY gnopernicus-version          "1.1.1">
-<!ENTITY gok-version                  "2.30.0">
-<!ENTITY gpdf-version                 "2.10.0">
-<!ENTITY hamster-applet-version       "2.30.2">
-<!ENTITY java-access-bridge-version   "1.26.2">
-<!ENTITY libgail-gnome-version        "1.20.3">
-<!ENTITY libgnomecups-version         "0.2.3">
-<!ENTITY libgnomeprint-version        "2.18.7">
-<!ENTITY libgnomeprintui-version      "2.18.5">
-<!ENTITY liboobs-version              "2.30.1">
-<!ENTITY nautilus-cd-burner-version   "2.18.2">
-<!ENTITY nautilus-media-version       "0.8.1">
-<!ENTITY seahorse-plugins-version     "2.30.1">
-<!ENTITY system-tools-backends-version "2.9.4">
--->
-
 <!-- Xfce core -->
 <!ENTITY xfce4-version                "4.10">
@@ -998,17 +776,7 @@
 <!ENTITY libreoffice-version          "3.6.0">
 
-<!-- Removed
-<!ENTITY koffice-version              "1.6.3">
-<!ENTITY openoffice-version           "3.2.1">
--->
-
 <!-- Chapter 36 -->
 <!ENTITY seamonkey-version            "2.12.1">
 <!ENTITY firefox-version              "&xulrunner-version;">
-
-<!-- Obsolete
-<!ENTITY dillo-version                "0.8.5">
-<!ENTITY galeon-version               "2.0.1">
--->
 
 <!-- Chapter 37 -->
@@ -1088,14 +856,4 @@
 <!ENTITY xvid-version                 "1.3.2">
 
-<!-- Removed
-<!ENTITY celt051-version              "0.5.1.3">
-<!ENTITY farsight2-version            "0.0.26">
-<!ENTITY id3lib-version               "3.8.3">
-<!ENTITY libfame-version              "0.9.1">
-<!ENTITY libmikmod-version            "3.1.11">
-<!ENTITY nas-version                  "1.9.1">
-<!ENTITY openquicktime-version        "1.0">
--->
-
 <!-- Chapter 39 -->
 <!ENTITY mpg123-version               "1.14.4">
@@ -1109,9 +867,4 @@
 <!ENTITY gvolwheel-version            "1.0">
 
-<!-- Obsolete
-<!ENTITY XMMS-version                 "1.2.10">
-<!ENTITY gnome-media-version          "2.32.0">
--->
-
 <!-- Chapter 40 -->
 <!ENTITY dvb-apps-version             "2012-06-10">
@@ -1122,8 +875,4 @@
 <!ENTITY vlc-version                  "2.0.3">
 
-<!-- Removed
-<!ENTITY avifile-version              "0.7.45">
--->
-
 <!-- Chapter 41 -->
 <!ENTITY cdrdao-version               "1.2.3">
@@ -1134,9 +883,4 @@
 <!ENTITY libisofs-version             "1.2.4">
 
-<!-- Removed
-<!ENTITY cdrtools-version             "3.00">
-<!ENTITY udftools-version             "1.0.0b3">
--->
-
 <!-- Part XII -->
 <!-- Chapter 42 -->
@@ -1146,9 +890,4 @@
 <!ENTITY gs-version                   "9.06">
 <!ENTITY gutenprint-version           "5.2.7">
-
-<!-- Obsolete
-<!ENTITY espgs-version                "8.15.4">
-<!ENTITY gimp-print-version           "4.2.7">
--->
 
 <!-- Chapter 43 -->
@@ -1190,6 +929,2 @@
 <!ENTITY jadetex-version              "3.13">
 
-<!-- Obsolete
-<!ENTITY tetex-version                "3.0">
--->
-
Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/genlib/aspell.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -112,19 +112,4 @@
 make</userinput></screen>
 
-    <!-- <para>
-      Pre-built HTML documentation is included in the package. If you have
-      <application>teTeX</application> installed and you wish to build
-      additional formats of the documentation, issue any or all of the following
-      commands:
-    </para>
-
-<screen><userinput>make -C manual pdf &amp;&amp;
-make -C manual pdf &amp;&amp;
-make -C manual ps &amp;&amp;
-cd manual &amp;&amp;
-makeinfo -plaintext -o aspell.txt aspell.texi &amp;&amp;
-makeinfo -plaintext -o aspell-dev.txt aspell-dev.texi &amp;&amp;
-cd ..</userinput></screen> -->
-
     <para>
       This package does not come with a test suite.
@@ -141,13 +126,4 @@
 install -v -m644 manual/aspell-dev.html/* \
     /usr/share/doc/aspell-&aspell-version;/aspell-dev.html</userinput></screen>
-
-  <!-- <para>
-      If you built additional formats of the documentation, install them by
-      issuing the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 manual/aspell{,-dev}.{ps,pdf,dvi,txt} \
-    /usr/share/doc/aspell-&aspell-version;</userinput></screen> -->
 
     <para>
Index: general/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/genlib/libassuan.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -87,5 +87,5 @@
 
     <para>If you wish to build alternate formats of the documentation, you
-    must have <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>
+    must have <xref linkend="texlive"/>
     installed, then issue the following command:</para>
 
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/genlib/libgcrypt.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -86,5 +86,5 @@
     <para>Only <command>info</command> documentation is shipped in the package
     tarball. If you wish to build alternate formats of the documentation,
-    (you must have <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>
+    (you must have <xref linkend="texlive"/>
     installed to build the PDF and PostScript), then issue the following
     commands:</para>
Index: general/genlib/libidl.xml
===================================================================
--- general/genlib/libidl.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/genlib/libidl.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -64,5 +64,5 @@
 
     <bridgehead renderas="sect4">Optional to Build Documentation</bridgehead>
-    <para role="optional"><!-- <xref linkend="tetex"/> or -->
+    <para role="optional">
     <xref linkend="texlive"/></para>
 
@@ -83,5 +83,5 @@
 makeinfo --plaintext -o libIDL2.txt libIDL2.texi</userinput></screen>
 
-    <para>If you have <application>teTeX</application> or
+    <para>If you have 
     <application>Live TeX</application> installed and wish to
     build alternate forms of the documentation, issue the following
Index: general/genlib/libksba.xml
===================================================================
--- general/genlib/libksba.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/genlib/libksba.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -84,5 +84,5 @@
 
     <para>If you wish to build alternate formats of the documentation, you
-    must have <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/> installed,
+    must have <xref linkend="texlive"/> installed,
     then issue the following commands:</para>
 
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/genutils/imagemagick.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -167,5 +167,5 @@
     <ulink url="http://www.mpeg.org/MSSG/">MPEG-2 Video Codec</ulink>,
     <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
-    <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>,
+    <xref linkend="texlive"/>,
     <ulink url="http://www.xfig.org/">Transfig</ulink>,
     <ulink url="http://txt2html.sourceforge.net/">txt2html</ulink>
@@ -174,5 +174,4 @@
     Getopt::ArgvFile</ulink>), and
     <ulink url="http://www.cs.utah.edu/gdc/projects/urt/">Utah Raster Toolkit</ulink>
-    <!-- url="http://www.funet.fi/pub/graphics/packages/Utah-Raster-Toolkit/rel3/urt-3.1b.mlg.tar.gz"> -->
     (or <ulink url="http://www.mcmurchy.com/urt/urt-3.1b.tar.gz">URT-3.1b</ulink>)
     </para>
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/genutils/pinentry.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -104,5 +104,5 @@
 
     <para>If you wish to build alternate formats of the documentation, you
-    must have <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/> installed,
+    must have <xref linkend="texlive"/> installed,
     then issue the following command:</para>
 
@@ -132,10 +132,5 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!--
-    <para><parameter>- -enable-...</parameter>: These two parameters are used to
-    fix a problem with the <command>configure</command> script if the optional
-    dependencies are not installed. If the dependencies are installed, these
-    parameters may be omitted.</para>
--->
+
     <para><parameter>--disable-...</parameter>: These three parameters are used
     to fix a problem with the <command>configure</command> script if the
Index: general/prog/cvs.xml
===================================================================
--- general/prog/cvs.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/prog/cvs.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -131,5 +131,5 @@
 make</userinput></screen>
 
-    <para>If you have <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>
+    <para>If you have <xref linkend="texlive"/>
     installed and wish to create DVI, Postscript, HTML or text docs from the
     documentation source files, issue the following command:</para>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/prog/doxygen.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -103,5 +103,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>teTeX</application> or
+    <application>Python</application>, 
     <application>TeX Live</application> (for HTML docs) and
     <application>Ghostscript</application> (for PDF docs)
@@ -127,11 +127,10 @@
     <para>There is no real configuration necessary for the
     <application>Doxygen</application> package although three additional
-    packages are required if you wish to use extended capabilities. If you
-    need to use the language translation features, you must have
-    <xref linkend="python2"/> installed. If you require formulas to
-    create PDF documentation, then you must have <!--<xref linkend="tetex"/> or-->
-    <xref linkend="texlive"/> installed. If you require formulas to convert
-    PostScript files to bitmaps, then you must have <xref linkend="gs"/>
-    <!-- or <xref linkend="espgs"/> --> installed.</para>
+    packages are required if you wish to use extended capabilities. If you need
+    to use the language translation features, you must have <xref
+    linkend="python2"/> installed. If you require formulas to create PDF
+    documentation, then you must have <xref linkend="texlive"/> installed. If
+    you require formulas to convert PostScript files to bitmaps, then you must
+    have <xref linkend="gs"/> installed.</para>
 
   </sect2>
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ general/sysutils/cpio.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -57,12 +57,4 @@
     </itemizedlist>
 
-    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/cpio-&cpio-version;-gcc43_inline-1.patch"/></para>
-      </listitem>
-    </itemizedlist> -->
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/cpio"/></para>
@@ -87,5 +79,5 @@
 makeinfo --plaintext       -o doc/cpio.txt  doc/cpio.texi</userinput></screen>
 
-    <para>If you have <!-- <xref linkend="tetex"/> or --><xref linkend="texlive"/>
+    <para>If you have <xref linkend="texlive"/>
     installed and wish to create PDF or Postscript documentation, issue one or
     both of the following commands:</para>
Index: introduction/important/locale-issues.xml
===================================================================
--- introduction/important/locale-issues.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ introduction/important/locale-issues.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -113,7 +113,6 @@
     this causes problems with UTF-8 encoded TeX documents created in
     Linux. On Windows, most applications will assume that these documents
-    have been created using the default Windows 8-bit encoding. See the
-    <ulink url="&blfs-wiki;/tetex">teTeX</ulink> Wiki page for more
-    details.</para>
+    have been created using the default Windows 8-bit encoding. 
+    </para>
 
     <para>In extreme cases, Windows encoding compatibility issues may be
Index: multimedia/libdriv/libtheora.xml
===================================================================
--- multimedia/libdriv/libtheora.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ multimedia/libdriv/libtheora.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -68,5 +68,5 @@
     <xref linkend="libpng"/> (both to build the example players),
     <xref linkend="doxygen"/>,
-    <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>,
+    <xref linkend="texlive"/>,
     <ulink url="http://bibtexml.sourceforge.net">BibTex</ulink>, and
     <ulink url="http://www.xfig.org/">Transfig</ulink>
Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ postlfs/security/gnupg.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -6,5 +6,4 @@
 
   <!ENTITY gnupg-download-http "&sources-anduin-http;/g/gnupg-&gnupg-version;.tar.bz2">
-  <!--<!ENTITY gnupg-download-http "http://public.ftp.planetmirror.com/pub/gnupg/gnupg-&gnupg-version;.tar.bz2"> -->
   <!ENTITY gnupg-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg-version;.tar.bz2">
   <!ENTITY gnupg-md5sum        "ce3742e5c7912559cab7894ad8ba7f6b">
@@ -79,10 +78,4 @@
     <title>Installation of GnuPG</title>
 
-    <!-- <para>If <application>Curl</application> is already installed,
-    apply the patch:</para>
-
-<screen><userinput>patch -Np1 -i ../gnupg-&gnupg-version;-curl_fix-1.patch
-</userinput></screen> -->
-
     <para>Install <application>GnuPG</application> by running the following
     commands:</para>
@@ -91,5 +84,5 @@
 make</userinput></screen>
 
-    <para>If you have <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>
+    <para>If you have <xref linkend="texlive"/>
     installed and you wish to create documentation in alternate formats, issue
     the following command:</para>
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ postlfs/security/gnupg2.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -111,5 +111,5 @@
 makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput></screen>
 
-    <para>If you have <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>
+    <para>If you have <xref linkend="texlive"/>
     installed and you wish to create documentation in alternate formats,
     issue the following commands:</para>
@@ -120,11 +120,4 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-    <!-- Removing this from the commands as it doesn't appear
-         necessary any longer. See the gnupg.texi file (or some
-         TeX derivative) for additional information.
-
-         chmod -v 4755 /usr/bin/gpg &amp;&amp;
-    -->
 
 <screen role="root"><userinput>make install
@@ -135,15 +128,4 @@
 install -v -m644    doc/*.texi doc/gnupg.txt \
                     /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
-
-<!-- Documentation is installed by default -->
-
-<!-- <screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d         /usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
-ln -sv ../../gnupg/FAQ      /usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
-ln -sv ../../gnupg/faq.html /usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
-
-install -v -m644 doc/{DETAILS,KEYSERVER,OpenPGP,TRANSLATE} \
-                 /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen> -->
 
     <para>If you created alternate formats of the documentation, install it
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ postlfs/shells/zsh.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -107,5 +107,5 @@
 makeinfo  Doc/zsh.texi --plaintext -o Doc/zsh.txt</userinput></screen>
 
-    <para>If you have <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>
+    <para>If you have <xref linkend="texlive"/>
     installed, you can build PDF format of the documentation by issuing
     the following command:</para>
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ pst/printing/gutenprint.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -76,9 +76,8 @@
     <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
     <ulink url="http://www.linuxprinting.org/ijs/">IJS</ulink></para>
-    <!-- gtk2 is a dep of the gimp <xref linkend="gtk2"/></para>-->
 
     <bridgehead renderas="sect4">Optional (to Regenerate Documentation)</bridgehead>
     <para role="optional"><xref linkend="imagemagick"/>,
-    <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>,
+    <xref linkend="texlive"/>,
     <xref linkend="doxygen"/>, and
     <xref linkend="docbook-utils"/></para>
Index: pst/typesetting/jadetex.xml
===================================================================
--- pst/typesetting/jadetex.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ pst/typesetting/jadetex.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -96,5 +96,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>teTeX</application>
+    file already installed on the system by the <application>texlive</application>
     package, then build a new <filename>latex.fmt</filename> file using the
     following commands:</para>
@@ -208,5 +208,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>teTeX</application> is upgraded,
+    header of the file so that if <application>texlive</application> is upgraded,
     the file won't get overwritten. The next change adds a parameter to
     increase ConTeXt's memory size to accommodate
@@ -220,8 +220,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>teTeX</application> programs. <command>mktexlsr</command>
-    updates <application>teTeX</application>'s <filename>ls-R</filename> databases
+    to the <application>texlive</application> programs. <command>mktexlsr</command>
+    updates <application>texlive</application>'s <filename>ls-R</filename> databases
     used by the <filename class='libraryfile'>libkpathsea</filename> library so
-    that <application>teTeX</application> knows to use the
+    that <application>texlive</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/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision 79a9ef007e6a4687ac6be5d22b78ecca7496c6c0)
+++ pst/typesetting/texlive.xml	(revision 8aeb47403fdf0cef8a8b2705f5b8be1e97f9a572)
@@ -194,5 +194,5 @@
     <userinput>make install</userinput> to put then in a temproary location:</para>
 
-<screen><userinput>make DESTDIR=$PWD/livetex-tmp install</userinput></screen>
+<screen><userinput>make DESTDIR=$PWD/texlive-tmp install</userinput></screen>
 
     <para>Now copy the executables to the <application>TeX Live</application>
@@ -201,5 +201,5 @@
     user:</para>
 
-<screen><userinput>find livetex-tmp/usr/bin -type f -exec cp -v {} /opt/texlive/2011/bin/x86_64-linux \;</userinput></screen>
+<screen><userinput>find texlive-tmp/usr/bin -type f -exec cp -v {} /opt/texlive/2011/bin/x86_64-linux \;</userinput></screen>
 
     <note><para>If you passed the option <option>--enable-shared</option> to the
