Author: randy
Date: 2006-04-09 10:06:53 -0600 (Sun, 09 Apr 2006)
New Revision: 5825
Modified:
trunk/BOOK/basicnet/textweb/links.xml
trunk/BOOK/general/genutils/imagemagick.xml
trunk/BOOK/general/genutils/xterm.xml
trunk/BOOK/general/graphlib/aalib.xml
trunk/BOOK/general/graphlib/giflib.xml
trunk/BOOK/general/graphlib/imlib.xml
trunk/BOOK/general/graphlib/imlib2.xml
trunk/BOOK/general/graphlib/libtiff.xml
trunk/BOOK/general/graphlib/libungif.xml
trunk/BOOK/general/prog/jdk.xml
trunk/BOOK/general/prog/pdl.xml
trunk/BOOK/general/prog/php.xml
trunk/BOOK/general/prog/tk.xml
trunk/BOOK/general/sysutils/dbus.xml
trunk/BOOK/general/sysutils/mc.xml
trunk/BOOK/gnome/core/libbonobo.xml
trunk/BOOK/gnome/core/libgtop.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/libdriv/gst-plugins.xml
trunk/BOOK/multimedia/libdriv/libao.xml
trunk/BOOK/multimedia/libdriv/libdv.xml
trunk/BOOK/multimedia/libdriv/libmpeg2.xml
trunk/BOOK/multimedia/libdriv/nas.xml
trunk/BOOK/multimedia/libdriv/sdl.xml
trunk/BOOK/multimedia/libdriv/xine-lib.xml
trunk/BOOK/multimedia/videoutils/ffmpeg.xml
trunk/BOOK/multimedia/videoutils/mplayer.xml
trunk/BOOK/multimedia/videoutils/transcode.xml
trunk/BOOK/postlfs/editors/emacs.xml
trunk/BOOK/postlfs/editors/vim.xml
trunk/BOOK/postlfs/security/heimdal.xml
trunk/BOOK/pst/printing/espgs.xml
trunk/BOOK/pst/printing/gs.xml
trunk/BOOK/pst/ps/a2ps.xml
trunk/BOOK/pst/scanning/sane.xml
trunk/BOOK/pst/typesetting/tex.xml
trunk/BOOK/server/mail/exim.xml
trunk/BOOK/server/major/openssh.xml
trunk/BOOK/x/installing/installing.xml
trunk/BOOK/x/installing/xorg.xml
trunk/BOOK/x/installing/xorg7.xml
trunk/BOOK/x/lib/cairo.xml
trunk/BOOK/x/lib/freeglut.xml
trunk/BOOK/x/lib/gtk+.xml
trunk/BOOK/x/lib/lesstif.xml
trunk/BOOK/x/lib/libxklavier.xml
trunk/BOOK/x/lib/mesalib.xml
trunk/BOOK/x/lib/pango.xml
trunk/BOOK/x/lib/qt.xml
trunk/BOOK/x/lib/startup-notification.xml
trunk/BOOK/x/wm/fluxbox.xml
trunk/BOOK/x/wm/other-wms.xml
Log:
Changed all the references to X Window System links to a common entity
displayed as 'X Window System' - now if there is ever an addition or removal of
one of the X packages, an update in only one place will be required
Modified: trunk/BOOK/basicnet/textweb/links.xml
===================================================================
--- trunk/BOOK/basicnet/textweb/links.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/basicnet/textweb/links.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -70,9 +70,8 @@
<xref linkend="libtiff"/>,
<xref linkend="sdl"/>,
<ulink url="http://www.svgalib.org/";>SVGAlib</ulink>,
- <ulink url="http://www.directfb.org/";>DirectFB</ulink> and
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>)</para>
+ <ulink url="http://www.directfb.org/";>DirectFB</ulink>, and
+ <xref linkend="x-window-system"/></para>
</sect2>
Modified: trunk/BOOK/general/genutils/imagemagick.xml
===================================================================
--- trunk/BOOK/general/genutils/imagemagick.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/general/genutils/imagemagick.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -76,8 +76,7 @@
<bridgehead renderas="sect3">ImageMagick Dependencies</bridgehead>
<bridgehead renderas="sect4">Recommended</bridgehead>
- <para role="recommended">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+ <para role="recommended"><xref linkend="x-window-system"/></para>
<para>The optional dependencies listed below should be installed if you
need support for the specific format or the conversion tool the dependency
Modified: trunk/BOOK/general/genutils/xterm.xml
===================================================================
--- trunk/BOOK/general/genutils/xterm.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/general/genutils/xterm.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -61,8 +61,7 @@
<bridgehead renderas="sect3">xterm Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para>X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>,
- or <xref linkend="xorg7"/>)</para>
+ <para><xref linkend="x-window-system"/></para>
<bridgehead renderas="sect4">Required</bridgehead>
<para><xref linkend="pkgconfig"/></para>
Modified: trunk/BOOK/general/graphlib/aalib.xml
===================================================================
--- trunk/BOOK/general/graphlib/aalib.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/general/graphlib/aalib.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -61,9 +61,8 @@
<bridgehead renderas="sect3">AAlib Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
- <xref linkend="slang"/> and
+ <para role="optional"><xref linkend="x-window-system"/>,
+ <xref linkend="slang"/>, and
<xref linkend="gpm"/></para>
</sect2>
Modified: trunk/BOOK/general/graphlib/giflib.xml
===================================================================
--- trunk/BOOK/general/graphlib/giflib.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/general/graphlib/giflib.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -72,8 +72,7 @@
<bridgehead renderas="sect3">giflib Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+ <para role="optional"><xref linkend="x-window-system"/></para>
</sect2>
Modified: trunk/BOOK/general/graphlib/imlib.xml
===================================================================
--- trunk/BOOK/general/graphlib/imlib.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/general/graphlib/imlib.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -69,8 +69,7 @@
<xref linkend="giflib"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>,
- or <xref linkend="xfree86"/>) and
+ <para role="optional"><xref linkend="x-window-system"/> and
<xref linkend="GTK"/></para>
</sect2>
Modified: trunk/BOOK/general/graphlib/imlib2.xml
===================================================================
--- trunk/BOOK/general/graphlib/imlib2.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/general/graphlib/imlib2.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -66,8 +66,7 @@
<xref linkend="libjpeg"/></para>
<bridgehead renderas="sect4">Recommended</bridgehead>
- <para role="recommended">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or or <xref linkend="xorg7"/>)</para>
+ <para role="recommended"><xref linkend="x-window-system"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="libtiff"/>, and
Modified: trunk/BOOK/general/graphlib/libtiff.xml
===================================================================
--- trunk/BOOK/general/graphlib/libtiff.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/general/graphlib/libtiff.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -64,8 +64,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="libjpeg"/>,
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
- <xref linkend="xorg7"/>) and a GLUT library
+ <xref linkend="x-window-system"/> and a GLUT library
(<xref linkend="mesalib"/> or <xref linkend="freeglut"/>)</para>
</sect2>
Modified: trunk/BOOK/general/graphlib/libungif.xml
===================================================================
--- trunk/BOOK/general/graphlib/libungif.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/general/graphlib/libungif.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -73,8 +73,7 @@
<bridgehead renderas="sect3">Libungif Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+ <para role="optional"><xref linkend="x-window-system"/></para>
</sect2>
Modified: trunk/BOOK/general/prog/jdk.xml
===================================================================
--- trunk/BOOK/general/prog/jdk.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/general/prog/jdk.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -155,10 +155,7 @@
<bridgehead renderas="sect3">JDK Dependencies</bridgehead>
<bridgehead renderas="sect4">Required (to Build JDK from
Source)</bridgehead>
- <para role="required">X
- (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/> or
- <xref linkend="xorg7"/>),
+ <para role="required"><xref linkend="x-window-system"/>,
<xref linkend="zip"/>,
<xref linkend="unzip"/>,
<xref linkend="cpio"/>,
Modified: trunk/BOOK/general/prog/pdl.xml
===================================================================
--- trunk/BOOK/general/prog/pdl.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/general/prog/pdl.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -141,8 +141,7 @@
<itemizedlist spacing='compact'>
<listitem>
- <para>OpenGL (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+ <para>OpenGL (<xref linkend="x-window-system"/>)</para>
</listitem>
</itemizedlist>
@@ -175,9 +174,9 @@
url="http://www.astro.caltech.edu/~tjp/pgplot/";>PGPLOT</ulink></para>
<itemizedlist>
<listitem>
- <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+ <para><xref linkend="x-window-system"/>,
<xref linkend="lesstif"/>,
- <xref linkend="tk"/> and
+ <xref linkend="tk"/>, and
<xref linkend="gcc"/> (Fortran compiler)</para>
</listitem>
</itemizedlist>
@@ -197,7 +196,7 @@
<itemizedlist>
<listitem>
<para><xref linkend="pkgconfig"/>,
- X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+ <xref linkend="x-window-system"/>,
<xref linkend="GTK"/>,
<xref linkend="freetype2"/>,
<ulink url="http://www.boutell.com/gd/";>GD</ulink>,
@@ -206,9 +205,9 @@
<xref linkend="jdk"/>,
<xref linkend="tk"/>,
<xref linkend="python"/> (with the
- <ulink url="http://www.pfdubois.com/numpy/";>Numerical
Extension</ulink>),
+ <ulink url="http://www.numpy.org/";>Numeric Python</ulink>),
<xref linkend="gcc"/> (Fortran compiler),
- <ulink url="http://www.swig.org/";>SWIG</ulink>,
+ <ulink url="http://www.swig.org/";>SWIG</ulink>, and
<ulink
url="http://sourceforge.net/projects/incrtcl/";>iTcl</ulink></para>
</listitem>
</itemizedlist>
@@ -227,7 +226,7 @@
url="http://tdc-www.harvard.edu/software/saoimage.html";>SAOimage</ulink></para>
<itemizedlist>
<listitem>
- <para>X (<xref linkend="xfree86"/> or <xref
linkend="xorg"/>)</para>
+ <para><xref linkend="x-window-system"/></para>
</listitem>
</itemizedlist>
</listitem>
@@ -237,7 +236,7 @@
IRAF</ulink></para>
<itemizedlist>
<listitem>
- <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>) and
+ <para><xref linkend="x-window-system"/> and
<xref linkend="tk"/></para>
</listitem>
</itemizedlist>
@@ -256,7 +255,7 @@
url="http://www.atnf.csiro.au/computing/software/karma/";>Karma</ulink></para>
<itemizedlist>
<listitem>
- <para>X (<xref linkend="xfree86"/> or <xref
linkend="xorg"/>)</para>
+ <para><xref linkend="x-window-system"/></para>
</listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/general/prog/php.xml
===================================================================
--- trunk/BOOK/general/prog/php.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/general/prog/php.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -103,8 +103,7 @@
<xref linkend="libpng"/>,
<xref linkend="libexif"/>,
<xref linkend="freetype2"/>,
- X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>, or
- <xref linkend="xfree86"/>),
+ <xref linkend="x-window-system"/>,
<ulink url="http://www.fastio.com/";>ClibPDF</ulink>,
<ulink url="http://www.boutell.com/gd/";>GD</ulink>,
<ulink
url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz";>
Modified: trunk/BOOK/general/prog/tk.xml
===================================================================
--- trunk/BOOK/general/prog/tk.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/general/prog/tk.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -62,8 +62,7 @@
<bridgehead renderas="sect3">Tk Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>) and
+ <para role="required"><xref linkend="x-window-system"/> and
<xref linkend="tcl"/></para>
</sect2>
Modified: trunk/BOOK/general/sysutils/dbus.xml
===================================================================
--- trunk/BOOK/general/sysutils/dbus.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/general/sysutils/dbus.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -73,14 +73,13 @@
<xref linkend="glib2"/>,
<xref linkend="gtk2"/>,
<xref linkend="qt"/>,
- X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>, or
- <xref linkend="xfree86"/>),
+ <xref linkend="x-window-system"/>,
<xref linkend="gcc"/> (for the Java compiler and tools),
<ulink
url="http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/";>Pyrex</ulink>
(requires <xref linkend="python"/>),
<ulink url="http://go-mono.org";>Mono</ulink> (and
<ulink url="http://www.mono-project.com/GtkSharp";>GtkSharp-1.0.x</ulink>),
- <xref linkend="doxygen"/> and
+ <xref linkend="doxygen"/>, and
<ulink url="http://cyberelk.net/tim/xmlto/";>xmlto</ulink></para>
<bridgehead renderas="sect4" id="hal-requirements"
Modified: trunk/BOOK/general/sysutils/mc.xml
===================================================================
--- trunk/BOOK/general/sysutils/mc.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/general/sysutils/mc.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -76,8 +76,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="gpm"/>,
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>),
+ <xref linkend="x-window-system"/>,
<xref linkend="samba3"/>,
<xref linkend="slang"/>,
<xref linkend="zip"/>,
Modified: trunk/BOOK/gnome/core/libbonobo.xml
===================================================================
--- trunk/BOOK/gnome/core/libbonobo.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/gnome/core/libbonobo.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -68,8 +68,7 @@
<xref linkend="perl-xml-parser"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>) and
+ <para role="optional"><xref linkend="x-window-system"/> and
<xref linkend="gtk-doc"/></para>
</sect2>
Modified: trunk/BOOK/gnome/core/libgtop.xml
===================================================================
--- trunk/BOOK/gnome/core/libgtop.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/gnome/core/libgtop.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -66,8 +66,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="popt"/>,
<xref linkend="gdbm"/>, and
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
- <xref linkend="xorg7"/>)</para>
+ <xref linkend="x-window-system"/></para>
</sect2>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2006-04-09 12:58:45 UTC
(rev 5824)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2006-04-09 16:06:53 UTC
(rev 5825)
@@ -45,6 +45,10 @@
<para>April 9th, 2006</para>
<itemizedlist>
<listitem>
+ <para>[randy] - Changed all the references to X Window System links
+ to a common entity displayed as 'X Window System'.</para>
+ </listitem>
+ <listitem>
<para>[randy] - Updated to Doxygen-1.4.6.</para>
</listitem>
</itemizedlist>
Modified: trunk/BOOK/multimedia/libdriv/gst-plugins.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gst-plugins.xml 2006-04-09 12:58:45 UTC
(rev 5824)
+++ trunk/BOOK/multimedia/libdriv/gst-plugins.xml 2006-04-09 16:06:53 UTC
(rev 5825)
@@ -91,8 +91,7 @@
<xref linkend="libpng"/>,
<xref linkend="NASM"/>,
<xref linkend="pango"/>, and
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/> or
- <xref linkend="xorg7"/>)</para>
+ <xref linkend="x-window-system"/></para>
<bridgehead renderas="sect4">Optional Audio
Libraries/Drivers/CODECs</bridgehead>
<para role="optional"><xref linkend="alsa"/>,
Modified: trunk/BOOK/multimedia/libdriv/libao.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/libao.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/multimedia/libdriv/libao.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -65,12 +65,11 @@
<bridgehead renderas="sect3">Libao Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>
- or <xref linkend="xorg7"/>),
+ <para role="optional"><xref linkend="x-window-system"/>,
<xref linkend="esound"/>,
<xref linkend="alsa"/>,
<xref linkend="arts"/>,
- <xref linkend="nas"/> and
+ <xref linkend="nas"/>, and
<ulink
url="http://0pointer.de/lennart/projects/polypaudio/";>polypaudio</ulink></para>
</sect2>
Modified: trunk/BOOK/multimedia/libdriv/libdv.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/libdv.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/multimedia/libdriv/libdv.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -64,9 +64,8 @@
<para role="optional"><xref linkend="popt"/>,
<xref linkend="pkgconfig"/>,
<xref linkend="sdl"/>,
- <xref linkend="GTK"/> and
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>)</para>
+ <xref linkend="GTK"/>, and
+ <xref linkend="x-window-system"/></para>
</sect2>
Modified: trunk/BOOK/multimedia/libdriv/libmpeg2.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/libmpeg2.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/multimedia/libdriv/libmpeg2.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -65,9 +65,8 @@
<bridgehead renderas="sect3">libmpeg2 Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>
- or <xref linkend="xorg7"/>)
- and <xref linkend="sdl"/></para>
+ <para role="optional"><xref linkend="x-window-system"/> and
+ <xref linkend="sdl"/></para>
</sect2>
Modified: trunk/BOOK/multimedia/libdriv/nas.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/nas.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/multimedia/libdriv/nas.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -74,8 +74,7 @@
<bridgehead renderas="sect3">NAS Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/> or <xref linkend="xorg7"/>)</para>
+ <para role="required"><xref linkend="x-window-system"/></para>
</sect2>
Modified: trunk/BOOK/multimedia/libdriv/sdl.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/sdl.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/multimedia/libdriv/sdl.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -75,15 +75,14 @@
<xref linkend="arts"/>,
<xref linkend="nas"/>,
<xref linkend="NASM"/>,
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/> or
- <xref linkend="xorg7"/>),
+ <xref linkend="x-window-system"/>,
<xref linkend="aalib"/>,
<ulink url="http://www.directfb.org/";>DirectFB</ulink>,
<ulink url="http://www.svgalib.org/";>SVGAlib</ulink>,
- <ulink url="http://www.gnu.org/software/pth/";>GNU Pth</ulink>
-<!-- Dead link,
+ <ulink url="http://www.gnu.org/software/pth/";>GNU Pth</ulink>, and
+ <!-- Dead link,
<ulink url="http://www.trolltech.com/download/qtopia/";>Qtopia</ulink>
---> and
+ -->
<ulink url="http://picogui.org/";>PicoGUI</ulink></para>
</sect2>
Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -63,9 +63,8 @@
<bridgehead renderas="sect3">Xine Libraries Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>
- or <xref linkend="xorg7"/>)
- and <xref linkend="esound"/> or OSS or
+ <para role="required"><xref linkend="x-window-system"/>, and
+ <xref linkend="esound"/> or OSS or
<xref linkend="alsa"/> or <xref linkend="arts"/> or
<ulink
url="http://0pointer.de/lennart/projects/polypaudio/";>polypaudio</ulink></para>
Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -83,8 +83,7 @@
<para role="optional"><xref linkend="libvorbis"/>,
<xref linkend="lame"/>,
<xref linkend="imlib2"/>,
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>),
+ <xref linkend="x-window-system"/>,
<xref linkend="sdl"/>,
<xref linkend="freetype2"/>,
<xref linkend="mplayer"/> (for the shared post-processing library),
Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml 2006-04-09 12:58:45 UTC
(rev 5824)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml 2006-04-09 16:06:53 UTC
(rev 5825)
@@ -195,8 +195,7 @@
<ulink url="http://www.ladspa.org/";>LADSPA</ulink></para>
<bridgehead renderas="sect4">Optional Video Output Drivers and
Libraries</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>),
+ <para role="optional"><xref linkend="x-window-system"/>,
<xref linkend="libpng"/>,
<xref linkend="libjpeg"/>,
<!-- <xref linkend="libungif"/> or -->
Modified: trunk/BOOK/multimedia/videoutils/transcode.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/transcode.xml 2006-04-09 12:58:45 UTC
(rev 5824)
+++ trunk/BOOK/multimedia/videoutils/transcode.xml 2006-04-09 16:06:53 UTC
(rev 5825)
@@ -72,8 +72,7 @@
<bridgehead renderas="sect4">Optional (Listed in the Order That the
<command>configure</command> Script Looks for Them)</bridgehead>
<para role="optional"><xref linkend="pkgconfig"/>,
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>),
+ <xref linkend="x-window-system"/>,
<xref linkend="xvid"/>,
<!-- Adding this comment in case this package gets any momentum and
actually uses an updated DivX. Here is the new URL to the new codec:
Modified: trunk/BOOK/postlfs/editors/emacs.xml
===================================================================
--- trunk/BOOK/postlfs/editors/emacs.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/postlfs/editors/emacs.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -61,13 +61,14 @@
<bridgehead renderas="sect3">Emacs Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
+ <para role="optional"><xref linkend="x-window-system"/>,
<xref linkend="libjpeg"/>,
<xref linkend="libpng"/>,
<xref linkend="libtiff"/>, and
<!-- <xref linkend="libungif"/> or -->
- <xref linkend="giflib"/></para>
+ <ulink
+ url="http://sourceforge.net/projects/libungif";>libungif</ulink></para>
+ <!-- <xref linkend="giflib"/></para> -->
</sect2>
Modified: trunk/BOOK/postlfs/editors/vim.xml
===================================================================
--- trunk/BOOK/postlfs/editors/vim.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/postlfs/editors/vim.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -79,16 +79,15 @@
<bridgehead renderas="sect3">Vim Dependencies</bridgehead>
<bridgehead renderas="sect4">Recommended</bridgehead>
- <para role="recommended">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+ <para role="recommended"><xref linkend="x-window-system"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="gtk2"/>,
<xref linkend="lesstif"/>,
<xref linkend="python"/>,
<xref linkend="tcl"/>,
- <xref linkend="ruby"/>
- and <xref linkend="gpm"/></para>
+ <xref linkend="ruby"/>, and
+ <xref linkend="gpm"/></para>
</sect2>
Modified: trunk/BOOK/postlfs/security/heimdal.xml
===================================================================
--- trunk/BOOK/postlfs/security/heimdal.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/postlfs/security/heimdal.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -93,8 +93,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="linux-pam"/>,
<xref linkend="openldap"/>,
- X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>,
- or <xref linkend="xorg7"/>),
+ <xref linkend="x-window-system"/>,
<xref linkend="cracklib"/> (compiled with the <filename>heimdal</filename>
patch), and
<ulink url="http://www.pdc.kth.se/kth-krb/";>krb4</ulink></para>
Modified: trunk/BOOK/pst/printing/espgs.xml
===================================================================
--- trunk/BOOK/pst/printing/espgs.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/pst/printing/espgs.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -105,8 +105,7 @@
<para role="optional"><xref linkend="cups"/>,
<xref linkend="libjpeg"/>,
<xref linkend="libpng"/>,
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
- <xref linkend="xorg7"/>), and
+ <xref linkend="x-window-system"/>, and
<xref linkend="GTK"/></para>
</sect2>
Modified: trunk/BOOK/pst/printing/gs.xml
===================================================================
--- trunk/BOOK/pst/printing/gs.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/pst/printing/gs.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -100,9 +100,8 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="libjpeg"/>,
<xref linkend="libpng"/>,
- <xref linkend="GTK"/> and
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
- <xref linkend="xorg7"/>)</para>
+ <xref linkend="GTK"/>, and
+ <xref linkend="x-window-system"/></para>
<bridgehead renderas="sect3">Conflicts</bridgehead>
<para>This version of Ghostscript does not work with
Modified: trunk/BOOK/pst/ps/a2ps.xml
===================================================================
--- trunk/BOOK/pst/ps/a2ps.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/pst/ps/a2ps.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -71,15 +71,14 @@
<bridgehead renderas="sect3">a2ps Dependencies</bridgehead>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
+ <para role="optional"><xref linkend="x-window-system"/>,
<xref linkend="psutils"/>,
<xref linkend="tex"/>,
<xref linkend="gs"/> or <xref linkend="espgs"/>,
<ulink
url="http://packages.debian.org/unstable/source/libpaper";>libpaper</ulink>,
<ulink url="http://www.adobe.com/products/acrobat/readstep2.html";>Adobe
- Reader</ulink> and
+ Reader</ulink>, and
<ulink
url="http://www.gnu.org/software/ghostview/ghostview.html";>Ghostview</ulink></para>
Modified: trunk/BOOK/pst/scanning/sane.xml
===================================================================
--- trunk/BOOK/pst/scanning/sane.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/pst/scanning/sane.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -106,8 +106,7 @@
<xref linkend="tex"/></para>
<bridgehead renderas="sect4">Optional (Front Ends)</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
+ <para role="optional"><xref linkend="x-window-system"/>,
<xref linkend="gtk2"/>, and
<xref linkend="gimp"/></para>
Modified: trunk/BOOK/pst/typesetting/tex.xml
===================================================================
--- trunk/BOOK/pst/typesetting/tex.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/pst/typesetting/tex.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -132,7 +132,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="libpng"/>,
- <xref linkend="x-installing"/>,
+ <xref linkend="x-window-system"/>,
<xref linkend="tk-perl"/>,
<ulink
url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz";>
t1lib</ulink>
Modified: trunk/BOOK/server/mail/exim.xml
===================================================================
--- trunk/BOOK/server/mail/exim.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/server/mail/exim.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -76,8 +76,7 @@
<ulink url="http://sourceforge.net/projects/tdb";>TDB</ulink></para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
+ <para role="optional"><xref linkend="x-window-system"/>,
<xref linkend="openldap"/>,
<xref linkend="openssl"/> or
<ulink url="http://www.gnu.org/software/gnutls/";>GnuTLS</ulink>,
Modified: trunk/BOOK/server/major/openssh.xml
===================================================================
--- trunk/BOOK/server/major/openssh.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/server/major/openssh.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -68,8 +68,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="linux-pam"/>,
<xref linkend="tcpwrappers"/>,
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>),
+ <xref linkend="x-window-system"/>,
<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
<xref linkend="jdk"/>,
<xref linkend="net-tools"/>,
Modified: trunk/BOOK/x/installing/installing.xml
===================================================================
--- trunk/BOOK/x/installing/installing.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/x/installing/installing.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -5,13 +5,37 @@
%general-entities;
]>
-<chapter id="x-installing">
+<chapter id="x-window-system" xreflabel="X Window System">
<?dbhtml filename="installing.html" ?>
<title>X Window System Environment</title>
- <para>This chapter contains a graphical user environment.</para>
+ <para>This chapter contains instructions to build and configure a graphical
+ user environment. You will need to choose one of the three packages in BLFS
+ that implements the <application>X Window System</application>:
+ <application>Xorg</application> X11R6 or X11R7 (<xref linkend="xorg"/> or
+ <xref linkend="xorg7"/>), or <application>XFree86</application>
+ (<xref linkend="xfree86"/>). These packages are all quite similar. In fact,
+ the base system of <application>Xorg</application> is
+ <application>XFree86</application>-4.4.0RC2. Differences in the licensing
+ philosophies was the original reason for the split.</para>
+ <para>A second reason for the forking of <application>X</application>
+ packages is the stated goals of the developers. Some developers were unhappy
+ with the administration and progress of <application>XFree86</application>.
+ The X.org Foundation's future plans include significant improvements to the
+ internals of the system and more frequent releases.</para>
+
+ <para><application>Xorg</application>-&xorg7-version; introduces a completely
+ autotooled build system, but is otherwise the same codebase as
+ <application>Xorg</application>-&xorg-version;. Most large commercial
+ distributions have decided to use the <application>Xorg</application>
+ package, but several still provide <application>XFree86</application>.</para>
+
+ <para><application>XFree86</application> continues to be a solid,
+ conservative application with excellent driver support.</para>
+
+
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="xorg.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="xorg7.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="xfree86.xml"/>
Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/installing/xorg.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -12,7 +12,7 @@
<!ENTITY xorg-time "11.68 SBU">
]>
-<sect1 id="xorg" xreflabel="X.org-&xorg-version;">
+<sect1 id="xorg" xreflabel="Xorg-&xorg-version;">
<?dbhtml filename="xorg.html"?>
<sect1info>
@@ -33,7 +33,7 @@
<sect2 role="package">
<title>Introduction to Xorg</title>
- <note>
+ <!-- <note>
<para>There are three packages in BLFS that implement the <application>X
Window System</application>: <application>Xorg</application>
(X11R6 and X11R7) and <application>XFree86</application>. These
@@ -56,9 +56,8 @@
<para><application>XFree86</application> continues to be a solid,
conservative application with excellent driver support.</para>
+ </note> -->
- </note>
-
<para><application>Xorg</application> is a freely redistributable
open-source
implementation of the <application>X</application> Window System. This
system provides a client/server interface between display hardware (the
Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/installing/xorg7.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="xorg7" xreflabel="X.org-&xorg7-version;">
+<sect1 id="xorg7" xreflabel="Xorg-&xorg7-version;">
<?dbhtml filename="xorg7.html"?>
<sect1info>
Modified: trunk/BOOK/x/lib/cairo.xml
===================================================================
--- trunk/BOOK/x/lib/cairo.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/lib/cairo.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -72,9 +72,8 @@
<bridgehead renderas="sect3">cairo Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>,
- or <xref linkend="xfree86"/>)
- and <xref linkend="pkgconfig"/></para>
+ <para role="required"><xref linkend="x-window-system"/> and
+ <xref linkend="pkgconfig"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><ulink
Modified: trunk/BOOK/x/lib/freeglut.xml
===================================================================
--- trunk/BOOK/x/lib/freeglut.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/lib/freeglut.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -64,8 +64,7 @@
<bridgehead renderas="sect3">freeglut Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+ <para role="required"><xref linkend="x-window-system"/></para>
</sect2>
Modified: trunk/BOOK/x/lib/gtk+.xml
===================================================================
--- trunk/BOOK/x/lib/gtk+.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/lib/gtk+.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -64,8 +64,7 @@
<para role="required"><xref linkend="GLib"/>,
<xref linkend="libtiff"/>,
<xref linkend="libjpeg"/>, and
- X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>)</para>
+ <xref linkend="x-window-system"/></para>
</sect2>
Modified: trunk/BOOK/x/lib/lesstif.xml
===================================================================
--- trunk/BOOK/x/lib/lesstif.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/lib/lesstif.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -69,8 +69,7 @@
<bridgehead renderas="sect3">LessTif Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+ <para role="required"><xref linkend="x-window-system"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="lynx"/> or <xref linkend="Links"/>
Modified: trunk/BOOK/x/lib/libxklavier.xml
===================================================================
--- trunk/BOOK/x/lib/libxklavier.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/lib/libxklavier.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -61,9 +61,8 @@
<bridgehead renderas="sect3">libxklavier Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>),
- <xref linkend="pkgconfig"/> and
+ <para role="required"><xref linkend="x-window-system"/>,
+ <xref linkend="pkgconfig"/>, and
<xref linkend="libxml2"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
Modified: trunk/BOOK/x/lib/mesalib.xml
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/lib/mesalib.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -64,9 +64,9 @@
<bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para>X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>, or
- <xref linkend="xorg7"/> Libs and Utilities), and
- <xref linkend="libdrm"/></para>
+ <para><xref linkend="x-window-system"/> or
+ <xref linkend="xorg7"/> Libs and Utilities and <xref linkend="libdrm"/>
+ </para>
<bridgehead renderas="sect3">Optional Downloads</bridgehead>
<para><ulink
Modified: trunk/BOOK/x/lib/pango.xml
===================================================================
--- trunk/BOOK/x/lib/pango.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/lib/pango.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -74,9 +74,8 @@
<bridgehead renderas="sect4">Optional (If <application>cairo</application>
is Not Installed)</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
- or <xref linkend="xorg7"/>)
- and <xref linkend="fontconfig"/></para>
+ <para role="optional"><xref linkend="x-window-system"/> and
+ <xref linkend="fontconfig"/></para>
<bridgehead renderas="sect4">Optional (To Rebuild the API
Documentation)</bridgehead>
<para role="optional"><xref linkend="gtk-doc"/></para>
Modified: trunk/BOOK/x/lib/qt.xml
===================================================================
--- trunk/BOOK/x/lib/qt.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/lib/qt.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -67,8 +67,7 @@
<bridgehead renderas="sect3">Qt Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+ <para role="required"><xref linkend="x-window-system"/></para>
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended"><xref linkend="libjpeg"/> and
Modified: trunk/BOOK/x/lib/startup-notification.xml
===================================================================
--- trunk/BOOK/x/lib/startup-notification.xml 2006-04-09 12:58:45 UTC (rev
5824)
+++ trunk/BOOK/x/lib/startup-notification.xml 2006-04-09 16:06:53 UTC (rev
5825)
@@ -64,8 +64,7 @@
<bridgehead renderas="sect3">startup-notification Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="optional">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, xref linkend="xorg7"/>)</para>
+ <para role="required"><xref linkend="x-window-system"/></para>
</sect2>
Modified: trunk/BOOK/x/wm/fluxbox.xml
===================================================================
--- trunk/BOOK/x/wm/fluxbox.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/wm/fluxbox.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -61,8 +61,7 @@
<bridgehead renderas="sect3">Fluxbox Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xfree86"/>,
- <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+ <para role="required"><xref linkend="x-window-system"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="imlib2"/> Image display library</para>
Modified: trunk/BOOK/x/wm/other-wms.xml
===================================================================
--- trunk/BOOK/x/wm/other-wms.xml 2006-04-09 12:58:45 UTC (rev 5824)
+++ trunk/BOOK/x/wm/other-wms.xml 2006-04-09 16:06:53 UTC (rev 5825)
@@ -16,9 +16,8 @@
<title>Other Window Managers</title>
<para><command>twm</command> is the Tab Window Manager. This is the default
- window manager installed by the <xref linkend="xorg"/>,
- <xref linkend="xorg7"/>, and <xref linkend="xfree86"/> <application>X
- Window Systems</application>.</para>
+ window manager installed by the <xref linkend="x-window-system"/>
+ packages.</para>
<para><command>mwm</command> is the Motif� Window Manager. It is an
<application>OSF/Motif�</application> clone packaged and installed with
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
