Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision eb38c8a5c897dbcedd6fdedfa7548354820fe9e6)
+++ pst/typesetting/texlive.xml	(revision c5a4b231f4ce64d022466abb78abb77baaeaa187)
@@ -76,37 +76,19 @@
       <xref linkend="x-window-system"/>
     </para>
-    <para role="recommended">
-      The source ships with its own versions of <emphasis>many</emphasis>
-      libraries, and will use them unless it is forced to use the system
-      versions.  The following are recommended so that the system version
-      will be used:
-      <xref linkend="fontconfig"/>,
-      <xref linkend="freetype2"/>,
-      <xref linkend="gc"/>,
-      <xref linkend="graphite2"/>,
-      <xref linkend="harfbuzz"/> (linked to graphite2),
-      <xref linkend="icu"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="poppler"/>
-    </para>
+
+    <!-- text for recommended libraries, shared with pass 1 -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/texrecommendlibs.xml"/>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      The source ships with its own versions of several libraries which are either
-      not under active development, or only used for limited functionality.  If
-      you install these, as with some other optional dependencies in this book you
-      will need to tell <command>configure</command> to use the system versions.
-      <ulink url="http://libgd.bitbucket.org">GD</ulink>,
-      <ulink url="http://fossies.org/linux/misc/t1lib-5.1.2.tar.gz/">t1lib</ulink>,
-      <ulink url="http://sourceforge.net/projects/zziplib/">ZZIPlib</ulink>,
-      <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=TECkitDownloads">TECkit</ulink>
-    </para>
+    <!-- text for optional deps, shared with pass 1 -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/texoptional.xml"/>
+
 
     <bridgehead renderas="sect4">Runtime dependencies</bridgehead>
-    <para role="recommended">
-      Some scripts will use
-      <xref linkend="python2"/> or <xref linkend="ruby"/>.
-    </para>
+    <!-- text for runtime deps, shared with tl-installer and pass 1 -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/texruntime.xml"/>
 
     <para condition="html" role="usernotes">User Notes:
@@ -121,4 +103,5 @@
     overwrite the programs it installed.</para>
 
+<!-- the first part of this is the same as in texlive pass 1 -->
 <screen role="root"><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
 mkdir texlive-build &amp;&amp;
@@ -204,40 +187,28 @@
     <title>Command Explanations</title>
 
-    <para>
-      <parameter>--prefix=, --bindir=, --datarootdir=, --infodir=, --mandir= ...
-      </parameter>: these switches ensure that the files installed from source
-      will overwrite the corresponding files previously installed by
-      <application>install-tl</application>.
-    </para>
-
-    <para>
-      <parameter>--includedir=, --libdir= ...</parameter> : these switches ensure
-      that the libraries will be found at runtime, and that programs can be
-      compiled against them.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/tex-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/tex-lib.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
-    <para>
-      <parameter>--enable-shared</parameter>: Use shared versions of
-      <filename class="libraryfile">libkpathsea</filename> and
-      <filename class="libraryfile">libptexenc</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-system-...</parameter>: Unless this parameter is used,
-      the included versions of these libraries  will be statically compiled
-      into the programs which need them.  If you decided not to install a
-      recommended library, omit the corresponding switches.
-    </para>
-
-    <para>
-      <parameter>--with-system-xpdf</parameter>: Uniquely, this parameter has
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/tex-shared.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/tex-system.xml"/>
+
+<!--    <para>
+      <parameter>\-\-with-system-xpdf</parameter>: Uniquely, this parameter has
       a non-standard meaning, it tells <command>configure</command> to use the
       system-installed <application>poppler</application> headers and library.
       Again, omit this if you have not installed
       <application>poppler</application>.
-    </para>
+    </para> -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/tex-xpdf.xml"/>
 
     <para>
