Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ basicnet/netprogs/cvs.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -131,7 +131,7 @@
 make</userinput></screen>
 
-    <para>If you have <xref linkend="tetex"/> installed and wish to create
-    DVI, Postscript, HTML or text docs from the documentation source files,
-    issue the following command:</para>
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed and wish to create DVI, Postscript, HTML or text docs from the
+    documentation source files, issue the following command:</para>
 
 <screen><userinput>make -C doc html txt dvi ps</userinput></screen>
Index: general.ent
===================================================================
--- general.ent	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general.ent	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
@@ -850,4 +850,5 @@
 
 <!-- Chapter 47 -->
+<!ENTITY texlive-version              "20100722">
 <!ENTITY tetex-version                "3.0">
 <!ENTITY jadetex-version              "3.13">
Index: general/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/genlib/libassuan.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -89,14 +89,14 @@
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
+make &amp;&amp;
 
-    <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"/> installed, then issue the following
-    commands:</para>
-
-<screen><userinput>make -k -C doc pdf ps html &amp;&amp;
 makeinfo --html --no-split -o doc/assuan_nochunks.html doc/assuan.texi &amp;&amp;
 makeinfo --plaintext       -o doc/assuan.txt           doc/assuan.texi</userinput></screen>
+
+    <para>If you wish to build alternate formats of the documentation, you
+    must have <xref linkend="tetex"/> or <xref linkend="texlive"/> installed,
+    then issue the following command:</para>
+
+<screen><userinput>make -k -C doc pdf ps html</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -106,5 +106,8 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D README /usr/share/doc/libassuan-&libassuan-version;/README</userinput></screen>
+
+install -v -m755 -d /usr/share/doc/libassuan-&libassuan-version; &amp;&amp;
+install -v -m644    README doc/{assuan{_nochunks.html,.txt,.texi \
+                    /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
 
     <para>If you built the additional documentation, install it by issuing the
@@ -112,11 +115,8 @@
     user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
-install -v -m644 doc/assuan.html/* \
-                    /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
-install -v -m644 doc/assuan_*.html \
-                    /usr/share/doc/libassuan-&libassuan-version; &amp;&amp;
-install -v -m644 doc/assuan.{pdf,ps,dvi,txt,texi} \
-                    /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
+<screen role="root"><userinput>install -v -m644 doc/assuan.html/* \
+                 /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
+install -v -m644 doc/assuan.{pdf,ps,dvi} \
+                 /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
 
   </sect2>
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/genlib/libgcrypt.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -86,6 +86,7 @@
     <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"/> installed to build the PDF and
-    PostScript), then issue the following commands:</para>
+    (you must have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed to build the PDF and PostScript), then issue the following
+    commands:</para>
 
 <screen><userinput>make -C doc pdf ps html &amp;&amp;
Index: general/genlib/libidl.xml
===================================================================
--- general/genlib/libidl.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/genlib/libidl.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -64,5 +64,6 @@
 
     <bridgehead renderas="sect4">Optional to Build Documentation</bridgehead>
-    <para role="optional"><xref linkend="tetex"/></para>
+    <para role="optional"><xref linkend="tetex"/> or
+    <xref linkend="texlive"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -78,12 +79,14 @@
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
+make &amp;&amp;
 
-    <para>If you have <application>teTeX</application> installed and wish to
-    build the documentation, issue the following commands:</para>
+makeinfo --plaintext -o libIDL2.txt libIDL2.texi</userinput></screen>
 
-<screen><userinput>make pdf &amp;&amp;
-make ps &amp;&amp;
-makeinfo --plaintext libIDL2.texi &gt;libIDL2.txt</userinput></screen>
+    <para>If you have <application>teTeX</application> or
+    <application>Live TeX</application> installed and wish to
+    build alternate forms of the documentation, issue the following
+    command:</para>
+
+<screen><userinput>make pdf ps</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -91,12 +94,16 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install
 
-    <para>If you built the documentation, issue the following commands as the
-    <systemitem class="username">root</systemitem> user to install it:</para>
+install -v -m755 -d /usr/share/doc/libIDL-&libidl-version; &amp;&amp;
+install -v -m644    README libIDL2.{txt,texi} \
+                    /usr/share/doc/libIDL-&libidl-version;</userinput></screen>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/libIDL-&libidl-version; &amp;&amp;
-install -v -m644 libIDL2.{pdf,dvi,ps,txt} README \
-    /usr/share/doc/libIDL-&libidl-version;</userinput></screen>
+    <para>If you built the additional documentation, issue the following
+    command as the <systemitem class="username">root</systemitem> user to
+    install it:</para>
+
+<screen role="root"><userinput>install -v -m644 libIDL2.{pdf,dvi,ps} \
+                 /usr/share/doc/libIDL-&libidl-version;</userinput></screen>
   </sect2>
 
Index: general/genlib/libksba.xml
===================================================================
--- general/genlib/libksba.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/genlib/libksba.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -78,16 +78,16 @@
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
+make &amp;&amp;
 
-    <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"/> installed, then issue the following
-    commands:</para>
+makeinfo --html --no-split -o doc/ksba_nochunks.html doc/ksba.texi &amp;&amp;
+makeinfo --plaintext       -o doc/ksba.txt           doc/ksba.texi</userinput></screen>
+
+    <para>If you wish to build alternate formats of the documentation, you
+    must have <xref linkend="tetex"/> or <xref linkend="texlive"/> installed,
+    then issue the following commands:</para>
 
 <screen><userinput>tex --output-directory=doc ksba.texi &amp;&amp;
 dvips -o doc/ksba.ps doc/ksba.dvi    &amp;&amp;
-make -C doc pdf html                 &amp;&amp;
-makeinfo --html --no-split -o doc/ksba_nochunks.html doc/ksba.texi &amp;&amp;
-makeinfo --plaintext       -o doc/ksba.txt           doc/ksba.texi</userinput></screen>
+make -C doc pdf html</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -97,5 +97,8 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D README /usr/share/doc/libksba-&libksba-version;/README</userinput></screen>
+
+install -v -m755 -d /usr/share/doc/libksba-&libksba-version; &amp;&amp;
+install -v -m644    README doc/ksba{_nochunks.html,.txt,.texi} \
+                    /usr/share/doc/libksba-&libksba-version;</userinput></screen>
 
     <para>If you built the additional documentation, install it by issuing the
@@ -106,7 +109,5 @@
 install -v -m644 doc/ksba.html/* \
                     /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
-install -v -m644 doc/ksba_*.html \
-                    /usr/share/doc/libksba-&libksba-version; &amp;&amp;
-install -v -m644 doc/ksba.{pdf,ps,dvi,txt,texi} \
+install -v -m644 doc/ksba.{pdf,ps,dvi} \
                     /usr/share/doc/libksba-&libksba-version;</userinput></screen>
 
Index: general/genlib/slib.xml
===================================================================
--- general/genlib/slib.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/genlib/slib.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -95,7 +95,7 @@
 makeinfo -o slib.html --html --no-split slib.texi</userinput></screen>
 
-    <para>If you have <xref linkend="tetex"/> installed and wish to
-    build PDF or Postscript documentation, issue any or all of
-    the following commands:</para>
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed and wish to build PDF or Postscript documentation, issue any or
+    all of the following commands:</para>
 
 <screen><userinput>texi2pdf  slib.texi &amp;&amp;
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/genutils/imagemagick.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -158,5 +158,5 @@
     <ulink url="http://www.mpeg.org/MSSG/">MPEG-2 Video Codec</ulink>,
     <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
-    <xref linkend="tetex"/>,
+    <xref linkend="tetex"/> or <xref linkend="texlive"/>,
     <ulink url="http://www.xfig.org/">Transfig</ulink>,
     <ulink url="http://txt2html.sourceforge.net/">txt2html</ulink>
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/genutils/pinentry.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -98,15 +98,15 @@
             --disable-pinentry-gtk2          \
             --disable-pinentry-qt            &amp;&amp;
-make</userinput></screen>
-
-    <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"/> installed, then issue the following
-    commands:</para>
-
-<screen><userinput>make -k -C doc pdf ps html &amp;&amp;
+make &amp;&amp;
+
 makeinfo --html --no-split -o doc/pinentry_nochunks.html doc/pinentry.texi &amp;&amp;
 makeinfo --plaintext       -o doc/pinentry.txt           doc/pinentry.texi</userinput></screen>
 
+    <para>If you wish to build alternate formats of the documentation, you
+    must have <xref linkend="tetex"/> or <xref linkend="texlive"/> installed,
+    then issue the following command:</para>
+
+<screen><userinput>make -k -C doc pdf ps html</userinput></screen>
+
     <para>This package does not come with a test suite.</para>
 
@@ -114,5 +114,8 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D README /usr/share/doc/pinentry-&pinentry-version;/README</userinput></screen>
+
+install -v -m755 -d /usr/share/doc/pinentry-&pinentry-version;/html &amp;&amp;
+install -v -m644    README doc/pinentry{_*.html,.txt,.texi} \
+                    /usr/share/doc/pinentry-&pinentry-version;</userinput></screen>
 
     <para>If you built the additional documentation, install it by issuing the
@@ -120,11 +123,8 @@
     user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/pinentry-&pinentry-version;/html &amp;&amp;
-install -v -m644 doc/pinentry.html/* \
-                    /usr/share/doc/pinentry-&pinentry-version;/html &amp;&amp;
-install -v -m644 doc/pinentry_*.html \
-                    /usr/share/doc/pinentry-&pinentry-version; &amp;&amp;
-install -v -m644 doc/pinentry.{pdf,ps,dvi,txt,texi} \
-                    /usr/share/doc/pinentry-&pinentry-version;</userinput></screen>
+<screen role="root"><userinput>install -v -m644 doc/pinentry.html/* \
+                 /usr/share/doc/pinentry-&pinentry-version;/html &amp;&amp;
+install -v -m644 doc/pinentry.{pdf,ps,dvi} \
+                 /usr/share/doc/pinentry-&pinentry-version;</userinput></screen>
 
   </sect2>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/prog/doxygen.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -75,5 +75,5 @@
     <xref linkend="graphviz"/>,
     <xref linkend="python"/>,
-    <xref linkend="tetex"/>,
+    <xref linkend="tetex"/> or <xref linkend="texlive"/>,
     <!-- <xref linkend="espgs"/> or --><xref linkend="gs"/></para>
 
@@ -106,6 +106,7 @@
     <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> (for
-    HTML docs) and <application>Ghostscript</application> (for PDF docs)
+    <application>Python</application>, <application>teTeX</application> or
+    <application>TeX Live</application> (for HTML docs) and
+    <application>Ghostscript</application> (for PDF docs)
     installed, then issue the following command as the
     <systemitem class="username">root</systemitem> user:</para>
@@ -132,8 +133,8 @@
     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="tetex"/>
-    installed. If you require formulas to convert PostScript files to bitmaps,
-    then you must have <xref linkend="gs"/><!-- or <xref linkend="espgs"/> -->
-    installed.</para>
+    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>
 
   </sect2>
Index: general/prog/guile.xml
===================================================================
--- general/prog/guile.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/prog/guile.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -103,7 +103,7 @@
 unset DIRNAME</userinput></screen>
 
-    <para>If you have <xref linkend="tetex"/> installed and wish to
-    build alternate formats (PDF and postscript) of the documentation, issue
-    the following commands:</para>
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed and wish to build alternate formats (PDF and postscript) of the
+    documentation, issue the following commands:</para>
 
 <screen><userinput>for DIRNAME in goops r5rs ref tutorial
Index: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/prog/nasm.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -69,5 +69,6 @@
 
     <bridgehead renderas="sect4">Optional (for Building Documentation)</bridgehead>
-    <para role="optional"><xref linkend="tetex"/>, and
+    <para role="optional"><xref linkend="tetex"/> or
+    <xref linkend="texlive"/>, and
     <!-- <xref linkend="espgs"/> or --><xref linkend="gs"/></para>
 
@@ -99,5 +100,6 @@
 
     <para>To build the RDOFF PDF and Postscript documentation,
-    ensure you have <xref linkend="tetex"/> installed and issue:</para>
+    ensure you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed and issue:</para>
 
 <screen><userinput>sed -i -e "s/dvips \$&lt;/&amp; -o rdoff.ps/" rdoff/doc/Makefile &amp;&amp;
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ general/sysutils/cpio.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -86,7 +86,7 @@
 makeinfo --plaintext       -o doc/cpio.txt  doc/cpio.texi</userinput></screen>
 
-    <para>If you have <xref linkend="tetex"/> installed and wish to create
-    PDF or Postscript documentation, issue one or both of the following
-    commands:</para>
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed and wish to create PDF or Postscript documentation, issue one or
+    both of the following commands:</para>
 
 <screen><userinput>make -C doc pdf &amp;&amp;
Index: gnome/add/evince.xml
===================================================================
--- gnome/add/evince.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ gnome/add/evince.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -86,5 +86,5 @@
     <xref linkend="gtk-doc"/>,
     <xref linkend="libtiff"/>,
-    <xref linkend="tetex"/> (required to build the DVI viewer),
+    <xref linkend="tetex"/> or <xref linkend="texlive"/> (required to build the DVI viewer),
     <xref linkend="nautilus"/>
       (required to build the <application>Nautilus</application> plugin),
@@ -187,6 +187,6 @@
 
     <para><option>--enable-dvi</option>: Use this parameter if you have the
-    <application>teTeX</application> package installed and you wish to build
-    support to view DVI files.</para>
+    <application>teTeX</application> or <application>TeX Live</application>
+    package installed and you wish to build support to view DVI files.</para>
 
     <para><option>--enable-t1lib</option>: Use this parameter if you have the
Index: gnome/add/obsolete/gpdf.xml
===================================================================
--- gnome/add/obsolete/gpdf.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ gnome/add/obsolete/gpdf.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -64,7 +64,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="tetex"/> and
-    <ulink
-    url="http://packages.qa.debian.org/libp/libpaper.html">libpaper</ulink></para>
+    <para role="optional"><xref linkend="tetex"/> or
+    <xref linkend="texlive"/>, and
+    <ulink url="http://packages.qa.debian.org/libp/libpaper.html">libpaper</ulink></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ introduction/welcome/changelog.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -41,4 +41,13 @@
 
 -->
+
+    <listitem>
+      <para>January 18th, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Added new package TeX Live-20100722.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ kde/add/kdegraphics.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -93,5 +93,5 @@
          outside version. Commenting this out for now
     <xref linkend="xpdf"/>, -->
-    <xref linkend="tetex"/>,
+    <xref linkend="tetex"/> or <xref linkend="texlive"/>,
     <xref linkend="fribidi"/>,
     <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ multimedia/libdriv/gstreamer.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -95,5 +95,5 @@
     Manuals)</bridgehead>
     <para role="optional"><xref linkend="libxslt"/>,
-    <xref linkend="tetex"/>,
+    <xref linkend="tetex"/> or <xref linkend="texlive"/>,
     <xref linkend="docbook-utils"/>,
     <ulink url="http://www.xfig.org/">Transfig</ulink> (all needed
Index: multimedia/libdriv/libdvdcss.xml
===================================================================
--- multimedia/libdriv/libdvdcss.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ multimedia/libdriv/libdvdcss.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -61,6 +61,6 @@
 
     <bridgehead renderas="sect4">Optional (to Create Documentation)</bridgehead>
-    <para role="optional"><xref linkend="doxygen"/> and
-    <xref linkend="tetex"/></para>
+    <para role="optional"><xref linkend="doxygen"/>, and
+    <xref linkend="tetex"/> or <xref linkend="texlive"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -93,8 +93,8 @@
 
     <para>If you have <application>Doxygen</application> and
-    <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>
+    <application>teTeX</application> or <application>TeX Live</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>
 
 <screen><userinput>make -C doc/latex pdf</userinput></screen>
@@ -107,10 +107,9 @@
 
     <para>If you have <application>Doxygen</application> and
-    <application>teTeX</application> installed, install the documentation using
-    the following commands as the
+    <application>teTeX</application> or <application>TeX Live</application>
+    installed, install the documentation using the following commands as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>
-install -v -m755 -d         /usr/share/doc/libdvdcss-&libdvdcss-version;/html &amp;&amp;
+<screen role="root"><userinput>install -v -m755 -d         /usr/share/doc/libdvdcss-&libdvdcss-version;/html &amp;&amp;
 install -v -m644 doc/html/* /usr/share/doc/libdvdcss-&libdvdcss-version;/html &amp;&amp;
 install -v -m644 doc/latex/*.{pdf,ps,dvi} \
Index: multimedia/libdriv/libtheora.xml
===================================================================
--- multimedia/libdriv/libtheora.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ multimedia/libdriv/libtheora.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -68,5 +68,6 @@
     <para role="optional"><xref linkend="sdl"/> and
     <xref linkend="libpng"/> (both to build the example players),
-    <xref linkend="doxygen"/>, <xref linkend="tetex"/>,
+    <xref linkend="doxygen"/>,
+    <xref linkend="tetex"/> or <xref linkend="texlive"/>,
     <ulink url="http://bibtexml.sourceforge.net">BibTex</ulink>, and
     <ulink url="http://www.xfig.org/">Transfig</ulink>
Index: multimedia/libdriv/libvorbis.xml
===================================================================
--- multimedia/libdriv/libvorbis.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ multimedia/libdriv/libvorbis.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -66,7 +66,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">both
-    <xref linkend="doxygen"/> and
-    <xref linkend="tetex"/> (specifically, pdflatex and htlatex)
-    to build the PDF documentation</para>
+    <xref linkend="doxygen"/>, and
+    <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    (specifically, pdflatex and htlatex) to build the PDF documentation</para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ multimedia/videoutils/ffmpeg.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -143,6 +143,6 @@
     documentation was built during the <command>make</command> process. If you
     wish to create additional formats of the documentation, you must have
-    <application>teTeX</application> installed, and issue the following
-    commands:</para>
+    <application>teTeX</application> or <xref linkend="texlive"/> installed,
+    and issue the following commands:</para>
 
 <screen><userinput>cd doc &amp;&amp;
Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ postlfs/security/gnupg.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -99,6 +99,7 @@
 make</userinput></screen>
 
-    <para>If you have <xref linkend="tetex"/> installed and you wish to create
-    documentation in alternate formats, issue the following command:</para>
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed and you wish to create documentation in alternate formats, issue
+    the following command:</para>
 
 <screen><userinput>make -C doc pdf html</userinput></screen>
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ postlfs/security/gnupg2.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -106,13 +106,14 @@
             --libexecdir=/usr/lib/gnupg2 \
             --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>If you have <xref linkend="tetex"/> installed and you wish to create
-    documentation in alternate formats, issue the following commands:</para>
-
-<screen><userinput>make -C doc pdf ps html &amp;&amp;
-makeinfo --html --no-split -o doc/gnupg_nochunks.html \
-                              doc/gnupg.texi &amp;&amp;
-makeinfo --plaintext -o doc/gnupg.txt doc/gnupg.texi</userinput></screen>
+make
+
+makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &amp;&amp;
+makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput></screen>
+
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed and you wish to create documentation in alternate formats,
+    issue the following commands:</para>
+
+<screen><userinput>make -C doc pdf ps html</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -127,5 +128,11 @@
     -->
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install
+
+install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
+install -v -m644    doc/gnupg_nochunks.html \
+                    /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &amp;&amp;
+install -v -m644    doc/*.texi doc/gnupg.txt \
+                    /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
 
 <!-- Documentation is installed by default -->
@@ -144,12 +151,7 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
-install -v -m644 doc/gnupg.html/* \
+<screen role="root"><userinput>install -v -m644 doc/gnupg.html/* \
                  /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
-install -v -m644 doc/gnupg_nochunks.html \
-                 /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &amp;&amp;
-install -v -m644 doc/*.texi \
-                 /usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
-install -v -m644 doc/gnupg.{pdf,dvi,ps,txt} \
+install -v -m644 doc/gnupg.{pdf,dvi,ps} \
                  /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
 
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ postlfs/security/heimdal.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -144,8 +144,8 @@
 makeinfo --plaintext       -o doc/hx509.txt    doc/hx509.texi</userinput></screen>
 
-    <para>If you have <xref linkend="tetex"/> installed and wish to create
-    PDF and Postscript forms of the documentation, change into the
-    <filename class='directory'>doc</filename> directory and issue any or all
-    of the following commands:</para>
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed and wish to create PDF and Postscript forms of the documentation,
+    change into the <filename class='directory'>doc</filename> directory and
+    issue any or all of the following commands:</para>
 
 <screen><userinput>pushd doc                        &amp;&amp;
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ postlfs/shells/zsh.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -107,16 +107,17 @@
             --sysconfdir=/etc/zsh \
             --enable-etcdir=/etc/zsh &amp;&amp;
-make</userinput></screen>
-
-    <para>If you have <xref linkend="tetex"/> installed, you can build
-    additional formats of the documentation by issuing any or all of
-    the following commands:</para>
-
-<screen><userinput>texi2pdf  Doc/zsh.texi -o Doc/zsh.pdf &amp;&amp;
-texi2html Doc/zsh.texi --output=Doc/zsh_1file_t.html &amp;&amp;
-makeinfo  Doc/zsh.texi --html --no-split --no-headers \
-                       -o Doc/zsh_1file_m.html &amp;&amp;
+make &amp;&amp;
+
+makeinfo  Doc/zsh.texi --html      -o Doc/html             &amp;&amp;
+makeinfo  Doc/zsh.texi --html --no-split --no-headers      \
+                                   -o Doc/zsh.html &amp;&amp;
 makeinfo  Doc/zsh.texi --plaintext -o Doc/zsh.txt</userinput></screen>
 
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed, you can build PDF format of the documentation by issuing
+    the following command:</para>
+
+<screen><userinput>texi2pdf  Doc/zsh.texi -o Doc/zsh.pdf</userinput></screen>
+
     <para>To test the results, issue: <command>make check</command>.</para>
 
@@ -124,5 +125,11 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-make infodir=/usr/share/info install.info</userinput></screen>
+make infodir=/usr/share/info install.info
+
+install -v -m755 -d /usr/share/doc/zsh-&zsh-version;/html &amp;&amp;
+install -v -m644    Doc/html/* \
+                    /usr/share/doc/zsh-&zsh-version;/html &amp;&amp;
+install -v -m644    Doc/zsh.{html,txt} \
+                    /usr/share/doc/zsh-&zsh-version;</userinput></screen>
 
     <para>If you downloaded the optional documentation, install it by issuing
@@ -133,9 +140,9 @@
 install -v -m644 Doc/zsh.dvi /usr/share/doc/zsh-&zsh-version;</userinput></screen>
 
-    <para>If you built any additional formats of the documentation, install
-    them by issuing the following command as the
+    <para>If you built the PDF format of the documentation, install
+    it by issuing the following command as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m644 Doc/{zsh_1file*,*.{pdf,txt}} \
+<screen role="root"><userinput>install -v -m644 Doc/zsh.pdf \
         /usr/share/doc/zsh-&zsh-version;</userinput></screen>
 
Index: pst/printing/gimp-print.xml
===================================================================
--- pst/printing/gimp-print.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ pst/printing/gimp-print.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -69,5 +69,5 @@
     <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
     <ulink url="http://www.linuxprinting.org/ijs/">IJS</ulink>,
-    <xref linkend="tetex"/>,
+    <xref linkend="tetex"/> or <xref linkend="texlive"/>,
     <xref linkend="docbook-utils"/> and
     <!-- <xref linkend="espgs"/> or --><xref linkend="gs"/></para>
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ pst/printing/gutenprint.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -73,5 +73,5 @@
     <bridgehead renderas="sect4">Optional (to Regenerate Documentation)</bridgehead>
     <para role="optional"><xref linkend="imagemagick"/>,
-    <xref linkend="tetex"/>,
+    <xref linkend="tetex"/> or <xref linkend="texlive"/>,
     <xref linkend="doxygen"/>, and
     <xref linkend="docbook-utils"/></para>
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ pst/ps/a2ps.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -91,5 +91,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="x-window-system"/>,
-    <xref linkend="tetex"/>,
+    <xref linkend="tetex"/> or <xref linkend="texlive"/>,
     <xref linkend="gs"/><!-- or <xref linkend="espgs"/> -->,
     <ulink
Index: pst/ps/enscript.xml
===================================================================
--- pst/ps/enscript.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ pst/ps/enscript.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -93,17 +93,15 @@
             --localstatedir=/var \
             --with-media=Letter &amp;&amp;
-make</userinput></screen>
-
-    <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>
-
-<screen><userinput>make -C docs ps &amp;&amp;
-make -C docs pdf &amp;&amp;
-
-cd docs &amp;&amp;
-texi2html enscript.texi &amp;&amp;
-makeinfo --plaintext -o enscript.txt enscript.texi &amp;&amp;
-cd ..</userinput></screen>
+make &amp;&amp;
+
+makeinfo --html            -o docs/html          enscript.texi &amp;&amp;
+makeinfo --html --no-split -o docs/enscript.html enscript.texi &amp;&amp;
+makeinfo --plaintext       -o enscript.txt       enscript.texi</userinput></screen>
+
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed, you can create Postscript and PDF documentation by issuing
+    the following command:</para>
+
+<screen><userinput>make -C docs ps pdf</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -112,14 +110,17 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/enscript-&enscript-version; &amp;&amp;
-install -v -m644 README* *.txt docs/FAQ.html \
-    /usr/share/doc/enscript-&enscript-version;</userinput></screen>
-
-    <para>If you built any of the alternate forms of documentation, install it
+
+install -v -m755 -d /usr/share/doc/enscript-&enscript-version;/html &amp;&amp;
+install -v -m644    docs/html/* \
+                    /usr/share/doc/enscript-&enscript-version;/html &amp;&amp;
+install -v -m644    README* *.txt docs/{FAQ.html,enscript.{html,txt}} \
+                    /usr/share/doc/enscript-&enscript-version;</userinput></screen>
+
+    <para>If you built Postscript and PDF documentation, install it
     using the following command as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m644 docs/*.{dvi,html,pdf,ps,txt} \
-    /usr/share/doc/enscript-&enscript-version;</userinput></screen>
+<screen role="root"><userinput>install -v -m644 docs/*.{dvi,pdf,ps} \
+                 /usr/share/doc/enscript-&enscript-version;</userinput></screen>
 
   </sect2>
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ pst/scanning/sane.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -102,5 +102,5 @@
     <ulink url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>,
     <ulink url="http://www.gphoto.org/">libgphoto2</ulink>, and
-    <xref linkend="tetex"/></para>
+    <xref linkend="tetex"/> or <xref linkend="texlive"/></para>
 
     <bridgehead renderas="sect4">Optional (Front Ends)</bridgehead>
Index: pst/typesetting/jadetex.xml
===================================================================
--- pst/typesetting/jadetex.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ pst/typesetting/jadetex.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -4,16 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
   <!ENTITY jadetex-download-http "&sourceforge-repo;/jadetex/jadetex-&jadetex-version;.tar.gz">
@@ -46,4 +34,11 @@
     <application>JadeTeX</application> transforms high level LaTeX macros into
     DVI/PostScript and Portable Document Format (PDF) forms.</para>
+
+    <important>
+      <para>Do not install this package if you have already installed
+      <xref linkend="texlive"/>. The <application>TeX Live</application>
+      installation includes the <application>JadeTeX</application>
+      components.</para>
+    </important>
 
     &lfs67_checked;
Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
+++ pst/typesetting/texlive.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY texlive-source-download-http " ">
+  <!ENTITY texlive-source-download-ftp  "ftp://tug.org/texlive/historic/2010/texlive-&texlive-version;-source.tar.xz">
+  <!ENTITY texlive-source-md5sum        "156fa34c56acb901fdc687b8d9860f1f">
+  <!ENTITY texlive-source-size          "32 MB">
+
+  <!ENTITY texlive-texmf-download-http  " ">
+  <!ENTITY texlive-texmf-download-ftp   "ftp://tug.org/texlive/historic/2010/texlive-&texlive-version;-texmf.tar.xz">
+  <!ENTITY texlive-texmf-md5sum         "12dec3a323c4eb75b98a3160c62dc865">
+  <!ENTITY texlive-texmf-size           "1.1 GB">
+
+  <!ENTITY texlive-buildsize            "~5 GB">
+  <!ENTITY texlive-time                 "10 SBU">
+]>
+
+<sect1 id="texlive" xreflabel="TeX Live-&texlive-version;">
+  <?dbhtml filename="texlive.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>TeX Live-&texlive-version;</title>
+
+  <indexterm zone="texlive">
+    <primary sortas="a-texlive">texlive</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to TeX Live</title>
+
+    <para>The <application>TeX Live</application> package is the forked
+    successor of the <application>teTeX</application> TeX document production
+    system invented by Donald Knuth. Both packages have been maintained and
+    supported through the <ulink url="http://www.tug.org/">TeX Users
+    Group</ulink>, although <application>teTeX</application> has been
+    unmaintained for several years now.</para>
+
+    <para>The <command>texi2html</command> Perl script previously shipped with
+    the <application>teTeX</application> package is no longer shipped. You can
+    use the <command>makeinfo</command> program as a replacement, or install
+    the stand-alone
+    <ulink url="http://www.nongnu.org/texi2html/">Texi2HTML</ulink>
+    package.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&texlive-source-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&texlive-source-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &texlive-source-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &texlive-source-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &texlive-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &texlive-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required TeX MetaFonts and additional components:
+        <ulink url="&texlive-texmf-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &texlive-texmf-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &texlive-texmf-size;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">TeX Live Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="xz-utils"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gs"/>,
+    <xref linkend="poppler"/>,
+    <xref linkend="freetype2"/>,
+    <xref linkend="libpng"/>,
+    <xref linkend="xorg7"/>,
+    <xref linkend="recode"/>,
+    <xref linkend="icu"/>,
+    <ulink url="http://www.libgd.org/Main_Page">GD</ulink>,
+    <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>,
+    <ulink url="http://sourceforge.net/projects/zziplib/">ZZIPlib</ulink>,
+    <ulink url="http://www.gnu.org/software/clisp/">CLISP</ulink>,
+    <ulink url="http://www.lua.org/">Lua</ulink>,
+    <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=TECkitDownloads">TECkit</ulink>,
+    and
+    <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;cat_id=RenderingGraphite">
+    Graphite</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/texlive"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of TeX Live</title>
+
+    <para>Before building <application>TeX Live</application>, the macros and
+    fonts package (<filename>texmf</filename> tarball) must be installed and
+    two temporary symbolic links need to be created. Install the macros, fonts
+    and symlinks using the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>tar xf ../texlive-&texlive-version;-texmf.tar.xz \
+    -C /usr/share --strip-components=1 &amp;&amp;
+
+ln -v -s share/texmf      /usr &amp;&amp;
+ln -v -s share/texmf-dist /usr</userinput></screen>
+
+    <para>Install <application>TeX Live</application> by running the following
+    commands:</para>
+
+<screen><userinput>sed -i -e 's|PARENT/\.\./texmf-local|PARENT/texmf-local|' \
+       -e 's|\$TEXMFVAR/fonts|/var/lib/livetex/fonts|'    \
+          texk/kpathsea/texmf.cnf &amp;&amp;
+
+./configure --prefix=/usr                  \
+            --disable-native-texlive-build \
+            --enable-shared                \
+            --without-luatex               \
+            --enable-mktextex-default      \
+            --with-banner-add=" - BLFS"    &amp;&amp;
+
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+
+rm      -v           /usr/texmf{,-dist}                         &amp;&amp;
+install -v -m1777 -d /var/lib/livetex/fonts                     &amp;&amp;
+install -v -m755  -d /usr/share/texmf-{config,var,local}        &amp;&amp;
+install -v -m755  -d /usr/share/doc/texlive-&texlive-version;            &amp;&amp;
+ln  -s  -v           ../../texmf/doc \
+                     /usr/share/doc/texlive-&texlive-version;/texmf      &amp;&amp;
+ln  -s  -v           ../../texmf-dist/doc \
+                     /usr/share/doc/texlive-&texlive-version;/texmf-dist &amp;&amp;
+
+for FN in `ls -l /usr/bin | grep "\.\./texmf"`
+do ln -svf `readlink $FN | sed 's|\.\./texmf|../share/texmf|'` $FN             
+done</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>ln -v -s share/texmf /usr</command> &amp;
+    <command>ln -v -s share/texmf-dist /usr</command> &amp;
+    <command>rm -v /usr/texmf{,-dist}</command>: These commands are used to
+    create and then remove temporary symbolic links so that files are not
+    installed in
+    <filename class="directory">/usr/texmf{,-dist}</filename></para>
+
+    <para><command>sed -i -e '...' -e '...' texk/kpathsea/texmf.cnf</command>:
+    This command is used to modify the default so that local items are
+    installed in <filename class="directory">/usr/share/texmf-local</filename>
+    instead of <filename class="directory">/usr/texmf-local</filename>. It also
+    changes the path for user-installed fonts to the run-time variable location
+    <filename class="directory">/var/lib/livetex/fonts</filename>.</para>
+
+    <para><parameter>--disable-native-texlive-build</parameter>: This parameter
+    is required if the build is not for a binary distribution.</para>
+
+    <para><parameter>--without-luatex</parameter>: This parameter is required
+    if the <application>Lua</application> programming language is not 
+    installed. Remove this parameter if <application>Lua</application> is
+    installed.</para>
+
+    <para><parameter>--enable-mktextex-default</parameter>: This parameter
+    is used so that TeX will automatically invokde mktextex if TeX source is
+    missing.</para>
+
+    <para><parameter>--with-banner-add=" - BLFS"</parameter>: This parameter
+    is used so that the build can be easily recognized as a non-TUG binary
+    build.</para>
+
+    <para><option>--with-system-...</option> &amp;
+    <option>--with-libgs-includes=/usr/include/ghostscript</option>: These
+    options are required to use any system-installed libraries. Run
+    <command>./configure --help</command> to see a full list of available
+    options.</para>
+
+    <para><command>for FN in `...`; do ...; done</command>This command is
+    used to change the installed symbolic links to point to scripts installed
+    in <filename class="directory">/usr/share/texmf</filename> instead of
+    <filename class="directory">/usr/texmf</filename>.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring TeX Live</title>
+
+    <sect3 id="texlive-config">
+      <title>Config Files</title>
+      <para>Several <filename class="extension">.cnf</filename> files are used
+      in a complete TeX system. Typically these files are not directly modified
+      (unless you know your way around a TeX system very well), but instead
+      TeX programs are used to make the modifications.</para>
+
+    </sect3>
+
+    <sect3><title>Configuration Information</title>
+
+      <para>Issue the following commands as the
+      <systemitem class="username">root</systemitem> user to configure and
+      finalize the TeX installation:</para>
+
+<screen role="root"><userinput>mktexlsr /usr/share/texmf        \
+         /usr/share/texmf-config \
+         /usr/share/texmf-dist   \
+         /usr/share/texmf-var    \
+         /usr/share/texmf-local  \
+         /var/lib/livetex/fonts  &amp;&amp;
+
+texconfig-sys font rw            &amp;&amp;
+texconfig-sys paper letter       &amp;&amp;
+fmtutil-sys --all                &amp;&amp;
+updmap-sys                       &amp;&amp;
+
+mktexlsr /usr/share/texmf        \
+         /usr/share/texmf-config \
+         /usr/share/texmf-dist   \
+         /usr/share/texmf-var    \
+         /usr/share/texmf-local  \
+         /var/lib/livetex/fonts  &amp;&amp;
+
+texlinks                         &amp;&amp;
+
+mktexlsr /usr/share/texmf        \
+         /usr/share/texmf-config \
+         /usr/share/texmf-dist   \
+         /usr/share/texmf-var    \
+         /usr/share/texmf-local  \
+         /var/lib/livetex/fonts</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>Over 300 binaries and symlinks to scripts</seg>
+        <seg>libkpathsea.{so,a} and libptexenc.{so,a}</seg>
+        <seg>/usr/include/kpathsea,
+        /usr/include/ptexenc,
+        /usr/share/doc/texlive-&texlive-version;,
+        /usr/share/texmf-config,
+        /usr/share/texmf-dist,
+        /usr/share/texmf-local,
+        /usr/share/texmf-var,
+        /use/share/texmf, and
+        /var/lib/livetex</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="texlive-programs">
+        <term><command>TeX programs</command></term>
+        <listitem>
+          <para>included in the <application>TeX Live</application> package are
+          too numerous to individually list. Please refer to the individual
+          program man pages and
+          <ulink url="file:///usr/share/texmf/doc/texlive/index.html"/> for
+          details, as well as a tour of the expansive
+          <application>TeX Live</application> documentation.</para>
+          <indexterm zone="texlive texlive-programs">
+            <primary sortas="b-texlive-programs">TeX Live programs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libkpathseaTL">
+        <term><filename class='libraryfile'>libkpathsea.{so,a}</filename></term>
+        <listitem>
+          <para>contains the functions used by the TeX programs to resolve
+          pathnames used in the Tex installation.</para>
+          <indexterm zone="texlive libkpathseaTL">
+            <primary sortas="c-libkpathseaTL">libkpathsea.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: pst/typesetting/typesetting.xml
===================================================================
--- pst/typesetting/typesetting.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ pst/typesetting/typesetting.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -19,4 +19,5 @@
   typesetting.</para>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texlive.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tetex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jadetex.xml"/>
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ server/major/bind.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -74,5 +74,6 @@
 
     <bridgehead renderas="sect4">Optional (to rebuild documentation)</bridgehead>
-    <para role="optional"><xref linkend="tetex"/> and
+    <para role="optional"><xref linkend="tetex"/> or
+    <xref linkend="texlive"/>, and
     <xref linkend="libxslt"/></para>
 
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision 7afe2f1f4aa241e9e630f85bae2490c0da84f6a8)
+++ xsoft/office/gnucash.xml	(revision f1e103ab0bcbc4097d9dbf07b5698e0946b29573)
@@ -130,6 +130,6 @@
     have <xref linkend="doxygen"/> and <xref linkend="graphviz"/> installed,
     then issue: <command>make doc</command>. If you wish to create the API
-    Design Guide in several formats, you must have <xref linkend="tetex"/>
-    installed and issue:
+    Design Guide in several formats, you must have <xref linkend="tetex"/> or
+    <xref linkend="texlive"/> installed and issue:
     <command>make -C src/doc/design html pdf ps</command>.</para>
 
