Author: dj Date: 2011-12-06 02:26:39 -0700 (Tue, 06 Dec 2011) New Revision: 9069
Modified: trunk/BOOK/general.ent trunk/BOOK/general/genlib/libdrm.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/x/installing/installing.xml trunk/BOOK/x/installing/mesalib.xml trunk/BOOK/x/installing/util-macros.xml trunk/BOOK/x/installing/x7app.xml trunk/BOOK/x/installing/x7driver.xml trunk/BOOK/x/installing/x7lib.xml trunk/BOOK/x/installing/x7proto.xml trunk/BOOK/x/installing/x7server.xml trunk/BOOK/x/installing/xcb-util.xml trunk/BOOK/x/installing/xorg-config.xml trunk/BOOK/x/installing/xorg7.xml trunk/BOOK/x/installing/xterm.xml Log: Update to Xorg-7.6-2. Modified: trunk/BOOK/general/genlib/libdrm.xml =================================================================== --- trunk/BOOK/general/genlib/libdrm.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/general/genlib/libdrm.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -6,9 +6,9 @@ <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2";> <!ENTITY libdrm-download-ftp " "> - <!ENTITY libdrm-md5sum "7577ff36ec364d88fae466d4f7fc5fc6"> - <!ENTITY libdrm-size "404 KB"> - <!ENTITY libdrm-buildsize "5.0 MB"> + <!ENTITY libdrm-md5sum "0fba4f42735cd3d24dd7a8cde0023fbd"> + <!ENTITY libdrm-size "484 KB"> + <!ENTITY libdrm-buildsize "7.1 MB"> <!ENTITY libdrm-time "less than 0.1 SBU"> ]> @@ -58,10 +58,12 @@ <bridgehead renderas="sect3">libdrm Dependencies</bridgehead> <bridgehead renderas="sect4">Required</bridgehead> - <para role="required"><xref linkend="cairo"/>, - <xref linkend="libpthread-stubs"/>, and + <para role="required"><xref linkend="libpthread-stubs"/> and <xref linkend="libatomic_ops"/> (required on x86 only)</para> + <bridgehead renderas="sect4">Optional</bridgehead> + <para role="optional"><xref linkend="cairo"/></para> + <para condition="html" role="usernotes">User Notes: <ulink url="&blfs-wiki;/libdrm"/></para> @@ -86,6 +88,18 @@ </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <para><parameter>--with-nouveau-experimental-api</parameter>: This parameter + enables use of nouveau's experimental kernel API (required for ATI r300 + and r660 cards).</para> + + <para><parameter>--enable-vmwgfx-experimental-api</parameter>: This + parameter enables use of vmwgfx's experimental kernel api.</para> + + </sect2> + <sect2 role="content"> <title>Contents</title> @@ -96,7 +110,8 @@ <seglistitem> <seg>None</seg> - <seg>libdrm.so, libdrm_intel.so, and libdrm_radeon.so</seg> + <seg>libdrm.so, libdrm_intel.so, libdrm_nouveau.so, + libdrm_radeon.so, and libkms</seg> <seg><envar>$XORG_PREFIX</envar>/include/drm</seg> </seglistitem> </segmentedlist> @@ -107,16 +122,25 @@ <?dbhtml list-presentation="table"?> <varlistentry id="libdrm-lib"> - <term><filename class='libraryfile'>libdrm{,_intel,_radeon}.so</filename></term> + <term><filename class='libraryfile'>libdrm{,_intel,_nouveau,_radeon}.so</filename></term> <listitem> <para>contains the Direct Rendering Module library functions, and - additional vendor specific functions for intel and radeon + additional vendor specific functions for Intel and NVidia, and Radeon devices.</para> <indexterm zone="libdrm libdrm-lib"> - <primary sortas="c-libdrm">libdrm{,_intel,_radeon}.so</primary> + <primary sortas="c-libdrm">libdrm{,_intel,_nouveau,_radeon}.so</primary> </indexterm> </listitem> </varlistentry> + <varlistentry id="libkms-lib"> + <term><filename class='libraryfile'>libkms.so</filename></term> + <listitem> + <para>contains functions necessary for kernel modesetting.</para> + <indexterm zone="libdrm libkms-lib"> + <primary sortas="c-libkms">libkms.so</primary> + </indexterm> + </listitem> + </varlistentry> </variablelist> Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/general.ent 2011-12-06 09:26:39 UTC (rev 9069) @@ -3,7 +3,7 @@ $Date$ --> -<!ENTITY day "05"> <!-- Always 2 digits --> +<!ENTITY day "06"> <!-- Always 2 digits --> <!ENTITY month "12"> <!-- Always 2 digits --> <!ENTITY year "2011"> <!ENTITY copyrightdate "2001-&year;"> @@ -179,7 +179,7 @@ <!ENTITY gmime-version "2.4.21"> <!ENTITY libidn-version "1.22"> <!ENTITY libatomic_ops-version "1.2"> -<!ENTITY libdrm-version "2.4.23"> +<!ENTITY libdrm-version "2.4.27"> <!ENTITY dbus-glib-version "0.88"> <!ENTITY dbus-python-version "0.83.2"> <!ENTITY dbus-qt3-version "0.62"> @@ -530,8 +530,8 @@ <!-- Chapter 25 --> <!ENTITY xfree86-version "4.6.0"> <!ENTITY xorg7-version "7.6"> -<!ENTITY xorg7-release "7.6-1"> -<!ENTITY util-macros-version "1.11.0"> +<!ENTITY xorg7-release "7.6-2"> +<!ENTITY util-macros-version "1.15.0"> <!ENTITY makedepend-version "1.0.3"> <!ENTITY libXau-version "1.0.6"> <!ENTITY libXdmcp-version "1.1.0"> @@ -539,10 +539,10 @@ <!ENTITY libxcb-version "1.7"> <!ENTITY xcursor-themes-version "1.0.3"> <!ENTITY xkeyboard-config-version "2.0"> -<!ENTITY mesalib-version "7.9"> -<!ENTITY xcb-util-version "0.3.6"> -<!ENTITY xorg-server-version "1.9.3"> -<!ENTITY xterm-version "267"> +<!ENTITY mesalib-version "7.11.2"> +<!ENTITY xcb-util-version "0.3.8"> +<!ENTITY xorg-server-version "1.11.2"> +<!ENTITY xterm-version "276"> <!-- Obsolete <!ENTITY xorg-version "6.9.0"> --> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/introduction/welcome/changelog.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -42,6 +42,38 @@ --> <listitem> + <para>December 6th, 2011</para> + <itemizedlist> + <listitem> + <para>[dj] - Updated to Xorg-7.6-2.</para> + </listitem> + <listitem> + <para>[dj] - Updated to xorg-util-macros-1.15.0.</para> + </listitem> + <listitem> + <para>[dj] - Updated to xterm-276.</para> + </listitem> + <listitem> + <para>[dj] - Updated to libdrm-2.4.27.</para> + </listitem> + <listitem> + <para>[dj] - Updated to xcb-util-0.3.8.</para> + </listitem> + <listitem> + <para>[dj] - Updated to Mesa-7.11.2.</para> + </listitem> + <listitem> + <para>[dj] - Updated to xorg-server-1.11.2.</para> + </listitem> + <listitem> + <para>[dj] - Removed "X Window System Components" and + "Additional X Window System Configuration" pages, replaced by + single "Xorg-7.6-2 Configuration" page.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>December 5th, 2011</para> <itemizedlist> <listitem> Modified: trunk/BOOK/x/installing/installing.xml =================================================================== --- trunk/BOOK/x/installing/installing.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/installing.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -44,9 +44,9 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="x7server.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="x7driver.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xterm.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xconfig-dummy.xml"/> +<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xconfig-dummy.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="x-setup.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="x-config.xml"/> - -<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xorg-config.xml"/> --> +--> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xorg-config.xml"/> </chapter> Modified: trunk/BOOK/x/installing/mesalib.xml =================================================================== --- trunk/BOOK/x/installing/mesalib.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/mesalib.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -6,10 +6,10 @@ <!ENTITY mesalib-download-http " "> <!ENTITY mesalib-download-ftp "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2";> - <!ENTITY mesalib-md5sum "82c740c49d572baa6da2b1a1eee90bca"> - <!ENTITY mesalib-size "5.4 MB"> - <!ENTITY mesalib-buildsize "249 MB"> - <!ENTITY mesalib-time "3.1 SBU"> + <!ENTITY mesalib-md5sum "0837c52698fe3252369c3fdb5195afcc"> + <!ENTITY mesalib-size "6.0 MB"> + <!ENTITY mesalib-buildsize "356 MB"> + <!ENTITY mesalib-time "4.0 SBU"> ]> <sect1 id="mesalib" xreflabel="MesaLib-&mesalib-version;"> @@ -63,7 +63,7 @@ <itemizedlist spacing="compact"> <listitem> <para>Recommended patch: <ulink - url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-2.patch"/> + url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-1.patch"/> (Needed if testing the Xorg installation per BLFS instructions)</para> </listitem> </itemizedlist> @@ -74,8 +74,9 @@ <para role="required"><xref linkend="xorg7-lib"/>, <xref linkend="makedepend"/>, <xref linkend="libdrm"/>, - <xref linkend="expat"/>, and - <xref linkend="talloc"/></para> + <xref linkend="expat"/>, + <xref linkend="talloc"/>, and + <ulink url="http://llvm.org";>LLVM</ulink></para> <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"><xref linkend="lesstif"/> (required to build motif @@ -99,7 +100,7 @@ commands:</para> <screen><userinput>sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure && -patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-2.patch && +patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-1.patch && ./configure $XORG_CONFIG --enable-xcb && make</userinput></screen> @@ -136,6 +137,9 @@ <para><option>--enable-motif</option>: build motif widgets into the GL widgets library (requires <application>lesstif</application>).</para> + <para><option>--with-gallium-driver=...</option>: build additional gallium + drivers. Defaults to r300, r600, and swrast. You must specify i9xx and + nouveau drivers.</para> </sect2> <sect2 role="content"> Modified: trunk/BOOK/x/installing/util-macros.xml =================================================================== --- trunk/BOOK/x/installing/util-macros.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/util-macros.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -6,9 +6,9 @@ <!ENTITY util-macros-download-http "http://xorg.freedesktop.org/releases/individual/util/util-macros-&util-macros-version;.tar.bz2";> <!ENTITY util-macros-download-ftp "ftp://ftp.x.org/pub/individual/util/util-macros-&util-macros-version;.tar.bz2";> - <!ENTITY util-macros-md5sum "22d5cdff672450cb6902e0d68c200dcb"> - <!ENTITY util-macros-size "72 KB"> - <!ENTITY util-macros-buildsize "428 KB"> + <!ENTITY util-macros-md5sum "357efdfa69f3e092de3b7000b90f6f4a"> + <!ENTITY util-macros-size "71 KB"> + <!ENTITY util-macros-buildsize "540 KB"> <!ENTITY util-macros-time "less than 0.1 SBU"> ]> Modified: trunk/BOOK/x/installing/x7app.xml =================================================================== --- trunk/BOOK/x/installing/x7app.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/x7app.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -8,8 +8,8 @@ <!ENTITY x7apps-download-ftp "ftp://ftp.x.org/pub/individual/app/";> <!ENTITY x7apps-wget "&files-anduin;/xorg/app-&xorg7-release;.wget"> <!ENTITY x7apps-md5sum "&files-anduin;/xorg/app-&xorg7-release;.md5"> - <!ENTITY x7apps-size "4.5 MB"> - <!ENTITY x7apps-buildsize "35.6 MB"> + <!ENTITY x7apps-size "5.3 MB"> + <!ENTITY x7apps-buildsize "60 MB"> <!ENTITY x7apps-time "1.2 SBU"> ]> Modified: trunk/BOOK/x/installing/x7driver.xml =================================================================== --- trunk/BOOK/x/installing/x7driver.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/x7driver.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -8,9 +8,9 @@ <!ENTITY x7drivers-download-ftp "ftp://ftp.x.org/pub/individual/driver/";> <!ENTITY x7drivers-wget "&files-anduin;/xorg/driver-&xorg7-release;.wget"> <!ENTITY x7drivers-md5sum "&files-anduin;/xorg/driver-&xorg7-release;.md5"> - <!ENTITY x7drivers-size "17.3 MB"> - <!ENTITY x7drivers-buildsize "212 MB"> - <!ENTITY x7drivers-time "4.0 SBU"> + <!ENTITY x7drivers-size "18.1 MB"> + <!ENTITY x7drivers-buildsize "71.6 MB"> + <!ENTITY x7drivers-time "3.9 SBU"> ]> Modified: trunk/BOOK/x/installing/x7lib.xml =================================================================== --- trunk/BOOK/x/installing/x7lib.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/x7lib.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -8,9 +8,9 @@ <!ENTITY x7libs-download-ftp "ftp://ftp.x.org/pub/individual/lib/";> <!ENTITY x7libs-wget "&files-anduin;/xorg/lib-&xorg7-release;.wget"> <!ENTITY x7libs-md5sum "&files-anduin;/xorg/lib-&xorg7-release;.md5"> - <!ENTITY x7libs-size "10.7 MB"> - <!ENTITY x7libs-buildsize "336 MB"> - <!ENTITY x7libs-time "4.2 SBU"> + <!ENTITY x7libs-size "11.9 MB"> + <!ENTITY x7libs-buildsize "266 MB"> + <!ENTITY x7libs-time "4.0 SBU"> ]> Modified: trunk/BOOK/x/installing/x7proto.xml =================================================================== --- trunk/BOOK/x/installing/x7proto.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/x7proto.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -8,14 +8,14 @@ <!ENTITY x7proto-download-ftp "ftp://ftp.x.org/pub/individual/proto/";> <!ENTITY x7proto-wget "&files-anduin;/xorg/proto-&xorg7-release;.wget"> <!ENTITY x7proto-md5sum "&files-anduin;/xorg/proto-&xorg7-release;.md5"> - <!ENTITY x7proto-size "1.9 MB"> + <!ENTITY x7proto-size "3.0 MB"> <!-- Editors note: Because we recommend a scripted build that removes the source directories after installation, the xorg buildsizes are determined by the sum of all package source tarballs, the size of installed files, and the size of the largest package's build directory after running make install. --> - <!ENTITY x7proto-buildsize "10.2 MB"> - <!ENTITY x7proto-time "0.8 SBU"> + <!ENTITY x7proto-buildsize "8.4 MB"> + <!ENTITY x7proto-time "0.5 SBU"> ]> Modified: trunk/BOOK/x/installing/x7server.xml =================================================================== --- trunk/BOOK/x/installing/x7server.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/x7server.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -6,9 +6,9 @@ <!ENTITY xorg-server-download-http "http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2";> <!ENTITY xorg-server-download-ftp "ftp://ftp.x.org/pub/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2";> - <!ENTITY xorg-server-md5sum "5bef6839a76d029204ab31aa2fcb5201"> - <!ENTITY xorg-server-size "5.1 MB"> - <!ENTITY xorg-server-buildsize "286 MB"> + <!ENTITY xorg-server-md5sum "8796fff441e5435ee36a72579008af24"> + <!ENTITY xorg-server-size "4.8 MB"> + <!ENTITY xorg-server-buildsize "441 MB"> <!ENTITY xorg-server-time "1.9 SBU"> ]> @@ -71,7 +71,7 @@ <xref linkend="xmlto"/>, (to build documentation), <xref linkend="fop"/>, (to build documentation), <xref linkend="gs"/> (to build documentation), - <xref linkend="hal"/> (not recommended, disabled by default), + <xref linkend="hal"/>, <xref linkend="mesalib"/> (required for DRI)</para> <para condition="html" role="usernotes">User Notes: @@ -87,8 +87,7 @@ <screen><userinput>./configure $XORG_CONFIG \ --with-module-dir=$XORG_PREFIX/lib/X11/modules \ --with-xkb-output=/var/lib/xkb \ - --enable-install-setuid \ - --disable-config-hal && + --enable-install-setuid && make</userinput></screen> <para>This package does not come with a test suite.</para> @@ -96,7 +95,8 @@ <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 && +ln -s $XORG_PREFIX/share/X11/xorg.conf.d /etc/X11</userinput></screen> </sect2> @@ -110,9 +110,6 @@ run as the root user. This switch ensures that the binary is installed setuid when <command>make</command> is run by an unprivileged user.</para> - <para><parameter>--disable-config-hal</parameter>: Disable the use of - <application>HAL</application>.</para> - <para><option>--disable-glx</option>: Disable building of the GLX extension. This parameter is required if building without <application>Mesa</application>.</para> @@ -121,8 +118,6 @@ extension. This parameter is required if building without <application>Mesa</application>.</para> - <para><option>--disable-config-dbus</option>: Disable the use of - <application>D-Bus</application>.</para> </sect2> <sect2 role="content"> @@ -134,7 +129,8 @@ <segtitle>Installed Directories</segtitle> <seglistitem> - <seg>cvt, gtf, X, Xnest, Xorg, and Xvfb</seg> + <seg>cvt, dmx*, gtf, vdltodmx, X, Xnest, Xorg, Xvfb, + and xdmxconfig</seg> <seg>None</seg> <seg>/var/lib/xkb and the following subdirectories of <envar>$XORG_PREFIX</envar>/: include/xorg, include/X11/pixmaps, @@ -157,6 +153,16 @@ </listitem> </varlistentry> + <varlistentry id="dmx-x7"> + <term><command>dmx*</command></term> + <listitem> + <para>are various tools for manipulating the dmx server.</para> + <indexterm zone="xorg7-server dmx-x7"> + <primary sortas="b-dmx">dmx*</primary> + </indexterm> + </listitem> + </varlistentry> + <varlistentry id="gtf-x7"> <term><command>gtf</command></term> <listitem> @@ -167,6 +173,17 @@ </listitem> </varlistentry> + <varlistentry id="vdltodmx-x7"> + <term><command>vdltodmx</command></term> + <listitem> + <para>is a tool to convert VDL config files to DMX config + files.</para> + <indexterm zone="xorg7-server vdltodmx-x7"> + <primary sortas="b-vdltodmx">vdltodmx</primary> + </indexterm> + </listitem> + </varlistentry> + <varlistentry id="X-x7"> <term><command>X</command></term> <listitem> @@ -207,6 +224,16 @@ </listitem> </varlistentry> + <varlistentry id="xdmxconfig-x7"> + <term><command>xdmxconfig</command></term> + <listitem> + <para>is a graphical configuration utility for the dmx server.</para> + <indexterm zone="xorg7-server xdmxconfig-x7"> + <primary sortas="b-xdmxconfig">xdmxconfig</primary> + </indexterm> + </listitem> + </varlistentry> + </variablelist> </sect2> Modified: trunk/BOOK/x/installing/xcb-util.xml =================================================================== --- trunk/BOOK/x/installing/xcb-util.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/xcb-util.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -6,9 +6,9 @@ <!ENTITY xcb-util-download-http "http://xcb.freedesktop.org/dist/xcb-util-&xcb-util-version;.tar.bz2";> <!ENTITY xcb-util-download-ftp " "> - <!ENTITY xcb-util-md5sum "dd8968b8ee613cb027a8ef1fcbdc8fc9"> - <!ENTITY xcb-util-size "292 KB"> - <!ENTITY xcb-util-buildsize "4.3 MB"> + <!ENTITY xcb-util-md5sum "8ce019c4bbf20dce246b98f177cfccff"> + <!ENTITY xcb-util-size "268 KB"> + <!ENTITY xcb-util-buildsize "2.7 MB"> <!ENTITY xcb-util-time "0.1 SBU"> ]> @@ -94,31 +94,28 @@ <seglistitem> <seg>None</seg> - <seg>libxcb-atom.{a,so}, libxcb-aux.{a,so}, libxcb-event.{a,so}, - libxcb-icccm.{a,so}, libxcb-image.{a,so}, libxcb-keysyms.{a,so}, - libxcb-property.{a,so}, libxcb-render-util.{a,so}, and - libxcb-reply.{a,so}</seg> + <seg>libxcb-util.{a,so}</seg> <seg>None</seg> </seglistitem> </segmentedlist> -<!-- + <variablelist> <bridgehead renderas="sect3">Short Descriptions</bridgehead> <?dbfo list-presentation="list"?> <?dbhtml list-presentation="table"?> - <varlistentry id="xcb-util-libs"> - <term><filename class='libraryfile'>libxcb-*.{so,a}</filename></term> + <varlistentry id="libxcb-util"> + <term><filename class='libraryfile'>libxcb-util.{so,a}</filename></term> <listitem> - <para>.</para> - <indexterm zone="xcb-util xcb-util-libs"> - <primary sortas="c-xcb-util">libxcb-*.{so,a}</primary> + <para>Provides utility functions for other XCB utilities.</para> + <indexterm zone="xcb-util libxcb-util"> + <primary sortas="c-xcb-util">libxcb-util.{so,a}</primary> </indexterm> </listitem> </varlistentry> </variablelist> ---> + </sect2> </sect1> Modified: trunk/BOOK/x/installing/xorg-config.xml =================================================================== --- trunk/BOOK/x/installing/xorg-config.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/xorg-config.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -5,8 +5,8 @@ %general-entities; ]> -<sect1 id="x-config"> - <?dbhtml filename="xconfig.html"?> +<sect1 id="xorg-config"> + <?dbhtml filename="xorg-config.html"?> <sect1info> <othername>$LastChangedBy$</othername> @@ -14,7 +14,7 @@ </sect1info> - <title>Configuring Xorg-&xorg7-version;</title> + <title>Xorg-&xorg7-release; Confgiruation</title> <sect2 role="configuration" id='X11R6-compat-symlink' xreflabel="Creating an X11R6 Compatibility Symlink"> Modified: trunk/BOOK/x/installing/xorg7.xml =================================================================== --- trunk/BOOK/x/installing/xorg7.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/xorg7.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -13,7 +13,7 @@ <date>$Date$</date> </sect1info> - <title>Introduction to Xorg-&xorg7-version;</title> + <title>Introduction to Xorg-&xorg7-release;</title> <indexterm zone="xorg7"> <primary sortas="a-xorg7">Xorg</primary> Modified: trunk/BOOK/x/installing/xterm.xml =================================================================== --- trunk/BOOK/x/installing/xterm.xml 2011-12-06 05:56:33 UTC (rev 9068) +++ trunk/BOOK/x/installing/xterm.xml 2011-12-06 09:26:39 UTC (rev 9069) @@ -6,9 +6,9 @@ <!ENTITY xterm-download-http " "> <!ENTITY xterm-download-ftp "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz";> - <!ENTITY xterm-md5sum "3945ab70cfa2a9e95804157ee1b0f8e8"> - <!ENTITY xterm-size "932 KB"> - <!ENTITY xterm-buildsize "10.6 MB"> + <!ENTITY xterm-md5sum "50ca8ee40e8a0992019f8f35042c9abb"> + <!ENTITY xterm-size "984 KB"> + <!ENTITY xterm-buildsize "12.4 MB"> <!ENTITY xterm-time "0.2 SBU"> ]> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
