Index: pst/typesetting/texlive-pass1.xml
===================================================================
--- pst/typesetting/texlive-pass1.xml	(revision b2d5567dd5c5ea5ce08709c9432655eb19a3b946)
+++ 	(revision )
@@ -1,294 +1,0 @@
-<?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-download-http " ">
-  <!ENTITY texlive-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
-  <!ENTITY texlive-md5sum        "09ee265ff51637827559affc7304078c">
-  <!ENTITY texlive-size          "40 MB">
-
-  <!ENTITY texlive-buildsize      "3.6 GB including the additional download">
-  <!ENTITY texlive-time           "8.2 SBU including the additional download">
-
-  <!ENTITY texlive-texmf-download-http " ">
-  <!ENTITY texlive-texmf-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-texmf.tar.xz">
-  <!ENTITY texlive-texmf-md5sum        "645a6f1d3a0ef4a9c279dae02588eab7">
-  <!ENTITY texlive-texmf-size          "1.7 GB">
-
-]>
-
-
-<sect1 id="texlive" xreflabel="texlive-&texlive-version;">
-  <?dbhtml filename="texlive.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>texlive-&texlive-version;-source</title>
-
-  <indexterm zone="texlive">
-    <primary sortas="a-texlive">texlive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TeX Live from source</title>
-
-    <para>Most of TeX Live can be built from source without a pre-existing
-    installation, but <application>xindy</application> (for indexing) needs
-    working versions of <command>latex</command> and <command>pdflatex</command>
-    when configure is run, and the testsuite and install for
-    <command>asy</command> (for vector graphics) will fail if TeX has not
-    already been installed. Additionally, <application>biber</application> is
-    not provided within the <application>texlive</application> source.</para>
-
-    <para>All of those packages are dealt with on their own pages and can be
-    built after installing this package and proceeding to
-    <xref linkend="tex-path"/>.</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&texlive-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&texlive-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &texlive-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &texlive-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">Required Additional Download</bridgehead>
-
-      <para>Much of the texlive environment (including scripts, documentation,
-      fonts and various other files) is not part of the source tarball. You must
-      download it separately. This will give you all of the additional files
-      which are provided by a full install of the binary version, there is no
-      realistic way to restrict which parts get installed.</para>
-
-      <para>
-        Because of the size of this package, it is unlikely to be mirrored by
-        BLFS mirrors.  In case of difficulty, go to http://www.ctan.org/mirrors/
-        to find a more-accessible mirror.
-      </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (FTP): <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 from source Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <!-- text for recommended libraries, shared with texlive itself -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texrecommendlibs.xml"/>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <!-- text for optional deps, shared with texlive itself -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texoptional.xml"/>
-
-    <bridgehead renderas="sect4">Runtime dependencies</bridgehead>
-    <!-- text for runtime deps, shared with tl-installer -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texruntime.xml"/>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/texlive"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of TeX Live</title>
-
-    <para>
-      Install TeX Live by running the following commands:
-    </para>
-
-<!-- the configure switches should be identical to those in the
- first part of texlive itself -->
-<screen role="root"><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
-mkdir texlive-build &amp;&amp;
-cd texlive-build    &amp;&amp;
-
-../configure                                        \
-    --prefix=/opt/texlive/&texlive-year;                      \
-    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH         \
-    --datarootdir=/opt/texlive/&texlive-year;                 \
-    --includedir=/usr/include                       \
-    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
-    --libdir=/usr/lib                               \
-    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
-    --disable-native-texlive-build                  \
-    --disable-static --enable-shared                \
-    --with-system-cairo                             \
-    --with-system-fontconfig                        \
-    --with-system-freetype2                         \
-    --with-system-graphite2                         \
-    --with-system-harfbuzz                          \
-    --with-system-icu                               \
-    --with-system-libgs                             \
-    --with-system-libpng                            \
-    --with-system-pixman                            \
-    --with-system-poppler                           \
-    --with-system-xpdf                              \
-    --with-system-zlib                              \
-    --with-banner-add=" - BLFS" &amp;&amp;
-unset TEXARCH &amp;&amp;
-
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make -k check</command>
-    One test in each of web2c, dvipng and ttf2pk2 will SKIP because kpathsea
-    has not yet been installed.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen><userinput role="root">make install &amp;&amp;
-make texlinks</userinput></screen>
-
-    <para>And now, install the additional files as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen><userinput role="root">mkdir -pv /opt/texlive/&texlive-year; &amp;&amp;
-tar -xf texlive-&texlive-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</userinput></screen>
-
-    <para>Now proceed to <xref linkend="tex-path"/>.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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"/>
-
-    <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> -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-xpdf.xml"/>
-
-    <para>
-      <option>--without-x</option>: use this if you do not have Xorg installed.
-    </para>
-
-    <para>
-      <parameter>make texlinks</parameter> : this runs the texlinks.sh script
-      to create (or recreate) symbolic links from formats to engines.  In
-      practice, several of the targets such as <command>xetex</command> are now
-      separate binaries and for these it will report "file already exists".
-    </para>
-    <para>
-      <parameter>tar -xf texlive-&texlive-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</parameter>:
-      the tarball contains the files for the texmf-dist directory, and because
-      of its size we do not want to waste time and space untarring it and then
-      copying the files.
-    </para>
-
-  </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, libptexenc.so</seg>
-        <seg>/opt/texlive/&texlive-year;/bin, /opt/texlive/&texlive-year;/texmf-dist,
-        /usr/include/kpathsea, /usr/include/ptexenc</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&nbsp;programs</command></term>
-        <listitem>
-          <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-          href="../../xincludes/texprogs.xml"/>
-          <indexterm zone="texlive texlive-programs">
-            <primary sortas="b-texlive-programs">TeX Live programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkpathsea">
-        <term><filename class="libraryfile">libkpathsea.so</filename></term>
-        <listitem>
-          <para>
-            (kpathsearch) exists to look up a file in a list of directories.
-          </para>
-          <indexterm zone="texlive libkpathsea">
-            <primary sortas="c-libkpathsea">libkpathsea.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libptexenc">
-        <term><filename class="libraryfile">libptexenc.so</filename></term>
-        <listitem>
-          <para>
-            is a library for Japanese pTeX (publishing TeX).
-          </para>
-          <indexterm zone="texlive libptexenc">
-            <primary sortas="c-libptexenc">libptexenc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision df5ee0806408dc11b4426237241393eab5617c55)
+++ pst/typesetting/texlive.xml	(revision df5ee0806408dc11b4426237241393eab5617c55)
@@ -0,0 +1,294 @@
+<?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-download-http " ">
+  <!ENTITY texlive-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
+  <!ENTITY texlive-md5sum        "09ee265ff51637827559affc7304078c">
+  <!ENTITY texlive-size          "40 MB">
+
+  <!ENTITY texlive-buildsize      "3.6 GB including the additional download">
+  <!ENTITY texlive-time           "8.2 SBU including the additional download">
+
+  <!ENTITY texlive-texmf-download-http " ">
+  <!ENTITY texlive-texmf-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-texmf.tar.xz">
+  <!ENTITY texlive-texmf-md5sum        "645a6f1d3a0ef4a9c279dae02588eab7">
+  <!ENTITY texlive-texmf-size          "1.7 GB">
+
+]>
+
+
+<sect1 id="texlive" xreflabel="texlive-&texlive-version;">
+  <?dbhtml filename="texlive.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>texlive-&texlive-version;-source</title>
+
+  <indexterm zone="texlive">
+    <primary sortas="a-texlive">texlive</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to TeX Live from source</title>
+
+    <para>Most of TeX Live can be built from source without a pre-existing
+    installation, but <application>xindy</application> (for indexing) needs
+    working versions of <command>latex</command> and <command>pdflatex</command>
+    when configure is run, and the testsuite and install for
+    <command>asy</command> (for vector graphics) will fail if TeX has not
+    already been installed. Additionally, <application>biber</application> is
+    not provided within the <application>texlive</application> source.</para>
+
+    <para>All of those packages are dealt with on their own pages and can be
+    built after installing this package and proceeding to
+    <xref linkend="tex-path"/>.</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&texlive-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&texlive-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &texlive-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &texlive-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">Required Additional Download</bridgehead>
+
+      <para>Much of the texlive environment (including scripts, documentation,
+      fonts and various other files) is not part of the source tarball. You must
+      download it separately. This will give you all of the additional files
+      which are provided by a full install of the binary version, there is no
+      realistic way to restrict which parts get installed.</para>
+
+      <para>
+        Because of the size of this package, it is unlikely to be mirrored by
+        BLFS mirrors.  In case of difficulty, go to http://www.ctan.org/mirrors/
+        to find a more-accessible mirror.
+      </para>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (FTP): <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 from source Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="x-window-system"/>
+    </para>
+
+    <!-- text for recommended libraries, shared with texlive itself -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/texrecommendlibs.xml"/>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <!-- text for optional deps, shared with texlive itself -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/texoptional.xml"/>
+
+    <bridgehead renderas="sect4">Runtime dependencies</bridgehead>
+    <!-- text for runtime deps, shared with tl-installer -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/texruntime.xml"/>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/texlive"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of TeX Live</title>
+
+    <para>
+      Install TeX Live by running the following commands:
+    </para>
+
+<!-- the configure switches should be identical to those in the
+ first part of texlive itself -->
+<screen role="root"><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
+mkdir texlive-build &amp;&amp;
+cd texlive-build    &amp;&amp;
+
+../configure                                        \
+    --prefix=/opt/texlive/&texlive-year;                      \
+    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH         \
+    --datarootdir=/opt/texlive/&texlive-year;                 \
+    --includedir=/usr/include                       \
+    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
+    --libdir=/usr/lib                               \
+    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
+    --disable-native-texlive-build                  \
+    --disable-static --enable-shared                \
+    --with-system-cairo                             \
+    --with-system-fontconfig                        \
+    --with-system-freetype2                         \
+    --with-system-graphite2                         \
+    --with-system-harfbuzz                          \
+    --with-system-icu                               \
+    --with-system-libgs                             \
+    --with-system-libpng                            \
+    --with-system-pixman                            \
+    --with-system-poppler                           \
+    --with-system-xpdf                              \
+    --with-system-zlib                              \
+    --with-banner-add=" - BLFS" &amp;&amp;
+unset TEXARCH &amp;&amp;
+
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make -k check</command>
+    One test in each of web2c, dvipng and ttf2pk2 will SKIP because kpathsea
+    has not yet been installed.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install &amp;&amp;
+make texlinks</userinput></screen>
+
+    <para>And now, install the additional files as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen><userinput role="root">mkdir -pv /opt/texlive/&texlive-year; &amp;&amp;
+tar -xf texlive-&texlive-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</userinput></screen>
+
+    <para>Now proceed to <xref linkend="tex-path"/>.</para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <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"/>
+
+    <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> -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/tex-xpdf.xml"/>
+
+    <para>
+      <option>--without-x</option>: use this if you do not have Xorg installed.
+    </para>
+
+    <para>
+      <parameter>make texlinks</parameter> : this runs the texlinks.sh script
+      to create (or recreate) symbolic links from formats to engines.  In
+      practice, several of the targets such as <command>xetex</command> are now
+      separate binaries and for these it will report "file already exists".
+    </para>
+    <para>
+      <parameter>tar -xf texlive-&texlive-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</parameter>:
+      the tarball contains the files for the texmf-dist directory, and because
+      of its size we do not want to waste time and space untarring it and then
+      copying the files.
+    </para>
+
+  </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, libptexenc.so</seg>
+        <seg>/opt/texlive/&texlive-year;/bin, /opt/texlive/&texlive-year;/texmf-dist,
+        /usr/include/kpathsea, /usr/include/ptexenc</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&nbsp;programs</command></term>
+        <listitem>
+          <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+          href="../../xincludes/texprogs.xml"/>
+          <indexterm zone="texlive texlive-programs">
+            <primary sortas="b-texlive-programs">TeX Live programs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libkpathsea">
+        <term><filename class="libraryfile">libkpathsea.so</filename></term>
+        <listitem>
+          <para>
+            (kpathsearch) exists to look up a file in a list of directories.
+          </para>
+          <indexterm zone="texlive libkpathsea">
+            <primary sortas="c-libkpathsea">libkpathsea.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libptexenc">
+        <term><filename class="libraryfile">libptexenc.so</filename></term>
+        <listitem>
+          <para>
+            is a library for Japanese pTeX (publishing TeX).
+          </para>
+          <indexterm zone="texlive libptexenc">
+            <primary sortas="c-libptexenc">libptexenc.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: pst/typesetting/typesetting.xml
===================================================================
--- pst/typesetting/typesetting.xml	(revision b2d5567dd5c5ea5ce08709c9432655eb19a3b946)
+++ pst/typesetting/typesetting.xml	(revision df5ee0806408dc11b4426237241393eab5617c55)
@@ -52,5 +52,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tl-installer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texlive-pass1.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texlive.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tex-path.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="biber.xml"/>
