Index: ome/add/acme.xml
===================================================================
--- gnome/add/acme.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<sect1 id="acme" xreflabel="acme-&acme-version;">
-<?dbhtml filename="acme.html"?>
-<title>acme-&acme-version;</title>
-
-&acme-intro;
-&acme-inst;
-&acme-desc;
-
-</sect1>
-
Index: ome/add/acme/acme-desc.xml
===================================================================
--- gnome/add/acme/acme-desc.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application>acme</application> package contains <command>
-acme</command>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>acme</title>
-<para><command>acme</command> captures non-standard keystrokes and
-executes commands, if available.</para></sect3>
-
-</sect2>
Index: ome/add/acme/acme-inst.xml
===================================================================
--- gnome/add/acme/acme-inst.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect2>
-<title>Installation of <application>acme</application></title>
-
-<para>Install <application>acme</application> by running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: ome/add/acme/acme-intro.xml
===================================================================
--- gnome/add/acme/acme-intro.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<sect2>
-<title>Introduction to <application>acme</application></title>
-
-<para>The <application>acme</application> package contains interface
-programs that are useful for capturing non-standard keyboard keys and
-executing programs or scripts that enable those keys.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&acme-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&acme-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &acme-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &acme-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &acme-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>acme</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libgnomeui"/> and <xref
-linkend="libwnck"/></para></sect4>
-</sect3>
-
-</sect2>
Index: ome/add/acme/acme.ent
===================================================================
--- gnome/add/acme/acme.ent	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<!ENTITY acme SYSTEM "../acme.xml">
-<!ENTITY acme-intro SYSTEM "acme-intro.xml">
-<!ENTITY acme-inst SYSTEM "acme-inst.xml">
-<!ENTITY acme-exp SYSTEM "acme-exp.xml">
-<!ENTITY acme-desc SYSTEM "acme-desc.xml">
-<!ENTITY acme-config SYSTEM "acme-config.xml">
-<!ENTITY acme-buildsize "5.7 MB">
-<!ENTITY acme-version "2.4.2">
-<!ENTITY acme-download-http "http://ftp.gnome.org/pub/GNOME/sources/acme/2.4/acme-&acme-version;.tar.bz2">
-<!ENTITY acme-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/acme/2.4/acme-&acme-version;.tar.bz2">
-<!ENTITY acme-size "288 KB">
-<!ENTITY acme-time "0.01 SBU">
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ gnome/add/add.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -9,5 +9,5 @@
 &libgnomeprint;
 &libgnomeprintui;
-&gtkhtml2;
+&gtkhtml;
 &libgtkhtml;
 &yelp;
@@ -20,5 +20,5 @@
 &gconf-editor;
 &gnome-utils;
-&gal2;
+&gal;
 &gnome-system-monitor;
 &gnome-media;
@@ -37,5 +37,4 @@
 &epiphany;
 &gnomemeeting;
-
 &gnome-games;
 &gnome2-user-docs;
Index: gnome/add/at-spi.xml
===================================================================
--- gnome/add/at-spi.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/at-spi.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,11 @@
+<sect1 id="at-spi" xreflabel="AT SPI-&at-spi-version;">
+<?dbhtml filename="at-spi.html"?>
+<title>AT SPI-&at-spi-version;</title>
+
+&at-spi-intro;
+&at-spi-inst;
+&at-spi-exp;
+&at-spi-desc;
+
+</sect1>
+
Index: gnome/add/at-spi/at-spi-desc.xml
===================================================================
--- gnome/add/at-spi/at-spi-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/at-spi/at-spi-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>AT</acronym> <acronym>SPI</acronym></application> package contains <filename
+class="libraryfile">libcspi</filename>
+libraries, <filename class="libraryfile">libspi</filename> libraries and
+<command>at-spi-registryd</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>at-spi-registryd</title>
+<para><command>at-spi-registryd</command> is the registry daemon that allows communication
+between the <acronym>UI</acronym> and assistance devices.</para></sect3>
+
+</sect2>
Index: gnome/add/at-spi/at-spi-exp.xml
===================================================================
--- gnome/add/at-spi/at-spi-exp.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/at-spi/at-spi-exp.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--libexecdir=`pkg-config --variable=prefix
+ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
+<filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+<para><option>--disable-gtk-doc</option>: This switch prevent the
+rebuilding of the documentation during the <command>make</command> command.</para>
+
+
+</sect2>
+
Index: gnome/add/at-spi/at-spi-inst.xml
===================================================================
--- gnome/add/at-spi/at-spi-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/at-spi/at-spi-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Installation of <application><acronym>AT</acronym> <acronym>SPI</acronym></application></title>
+
+<para>Install <application><acronym>AT</acronym> <acronym>SPI</acronym></application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
+    --disable-gtk-doc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/add/at-spi/at-spi-intro.xml
===================================================================
--- gnome/add/at-spi/at-spi-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/at-spi/at-spi-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Introduction to <application><acronym>AT</acronym>
+<acronym>SPI</acronym></application></title>
+
+<para>The <application><acronym>AT</acronym> <acronym>SPI</acronym></application> package contains Assistive Technology Service Provider
+Interface. This is useful for redirecting <acronym>UI</acronym> events to accessible
+applications and adaptive/assistive technologies.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&at-spi-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&at-spi-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &at-spi-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&at-spi-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&at-spi-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>AT</acronym> <acronym>SPI</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="gail"/> and <xref linkend="libbonobo"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/></para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/add/at-spi/at-spi.ent
===================================================================
--- gnome/add/at-spi/at-spi.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/at-spi/at-spi.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,11 @@
+<!ENTITY at-spi SYSTEM "../at-spi.xml">
+<!ENTITY at-spi-intro SYSTEM "at-spi-intro.xml">
+<!ENTITY at-spi-inst SYSTEM "at-spi-inst.xml">
+<!ENTITY at-spi-exp SYSTEM "at-spi-exp.xml">
+<!ENTITY at-spi-desc SYSTEM "at-spi-desc.xml">
+<!ENTITY at-spi-version "1.4.2">
+<!ENTITY at-spi-download-http "http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.4/at-spi-&at-spi-version;.tar.bz2">
+<!ENTITY at-spi-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/at-spi/1.4/at-spi-&at-spi-version;.tar.bz2">
+<!ENTITY at-spi-size "499 KB">
+<!ENTITY at-spi-buildsize "29 MB">
+<!ENTITY at-spi-time "0.68 SBU">
Index: ome/add/docs/gnome2-user-docs-desc.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-desc.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application>GNOME2 User Docs</application> package contains
-<acronym>OMF</acronym> files.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>OMF files</title>
-<para><acronym>OMF</acronym> files contain user documentation.  These include introductions and 
-help on the core packages.</para></sect3>
-
-</sect2>
Index: ome/add/docs/gnome2-user-docs-exp.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-exp.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--localstatedir=/var/lib</parameter>: This switch
-puts <application>ScrollKeeper</application> files in <filename
-class="directory">/var/lib/scrollkeeper</filename>
-instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
-
-</sect2>
-
Index: ome/add/docs/gnome2-user-docs-inst.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-inst.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect2>
-<title>Installation of <application>GNOME2 User Docs</application></title>
-
-<para>Install <application>GNOME2 User Docs</application> by running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
Index: ome/add/docs/gnome2-user-docs-intro.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-intro.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<sect2>
-<title>Introduction to <application>GNOME2 User Docs</application></title>
-
-<para>The <application>GNOME2 User Docs</application> package contains end user documents for
-GNOME.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gnome2-user-docs-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gnome2-user-docs-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &gnome2-user-docs-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&gnome2-user-docs-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gnome2-user-docs-time;</para></listitem></itemizedlist>
-</sect3>
-                                                                                
-<sect3><title><application>GNOME2 User Docs</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="scrollkeeper"/></para></sect4>
-<sect4><title>Optional</title>
-<para>
-<ulink url="http://sources.redhat.com/docbook-tools/">docbook-utils</ulink>
-</para></sect4>
-</sect3>
-</sect2>
Index: ome/add/docs/gnome2-user-docs.ent
===================================================================
--- gnome/add/docs/gnome2-user-docs.ent	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!ENTITY gnome2-user-docs SYSTEM "../gnome2-user-docs.xml">
-<!ENTITY gnome2-user-docs-intro SYSTEM "gnome2-user-docs-intro.xml">
-<!ENTITY gnome2-user-docs-inst SYSTEM "gnome2-user-docs-inst.xml">
-<!ENTITY gnome2-user-docs-exp SYSTEM "gnome2-user-docs-exp.xml">
-<!ENTITY gnome2-user-docs-desc SYSTEM "gnome2-user-docs-desc.xml">
-<!ENTITY gnome2-user-docs-version "2.6.0.1">
-<!ENTITY gnome2-user-docs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.6/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
-<!ENTITY gnome2-user-docs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.6/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
-<!ENTITY gnome2-user-docs-size "995 KB">
-<!ENTITY gnome2-user-docs-buildsize "3.1 MB">
-<!ENTITY gnome2-user-docs-time "0.01 SBU">
Index: gnome/add/gal.xml
===================================================================
--- gnome/add/gal.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gal.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,9 @@
+<sect1 id="gal" xreflabel="GAL-&gal-version;">
+<?dbhtml filename="gal.html"?>
+<title>GAL-&gal-version;</title>
+
+&gal-intro;
+&gal-inst;
+&gal-desc;
+
+</sect1>
Index: gnome/add/gal/gal-desc.xml
===================================================================
--- gnome/add/gal/gal-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gal/gal-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>GAL</application> package contains library
+routines refactored from Evolution and Gnumeric.</para>
+
+</sect2>
+
Index: gnome/add/gal/gal-inst.xml
===================================================================
--- gnome/add/gal/gal-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gal/gal-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>GAL</application></title>
+
+<para>Install <application>GAL</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/add/gal/gal-intro.xml
===================================================================
--- gnome/add/gal/gal-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gal/gal-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,30 @@
+<sect2>
+<title>Introduction to <application>GAL</application></title>
+
+<para>The <application>GAL</application> package contains library
+functions that came from <application>Evolution</application> and
+<application>Gnumeric</application>.
+<application><acronym>GAL</acronym></application> is short for
+<application><acronym>GNOME</acronym></application> Application Libs.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&gal-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&gal-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gal-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &gal-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &gal-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>GAL</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeprintui"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="gtk-doc"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/add/gal/gal.ent
===================================================================
--- gnome/add/gal/gal.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gal/gal.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,10 @@
+<!ENTITY gal SYSTEM "../gal.xml">
+<!ENTITY gal-intro SYSTEM "gal-intro.xml">
+<!ENTITY gal-inst SYSTEM "gal-inst.xml">
+<!ENTITY gal-desc SYSTEM "gal-desc.xml">
+<!ENTITY gal-version "2.1.8">
+<!ENTITY gal-download-http "http://ftp.gnome.org/pub/gnome/sources/gal/2.1/gal-&gal-version;.tar.bz2">
+<!ENTITY gal-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/gal/2.1/gal-&gal-version;.tar.bz2">
+<!ENTITY gal-size "1.1 KB">
+<!ENTITY gal-buildsize "142 MB">
+<!ENTITY gal-time "1.70 SBU">
Index: ome/add/games/gnome-games-desc.xml
===================================================================
--- gnome/add/games/gnome-games-desc.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application><acronym>GNOME</acronym> Games</application> package contains
-<command>aisleriot</command>, <command>freecell</command>,
-<command>gataxx</command>, <command>glines</command>,
-<command>gnect</command>, <command>gnibbles</command>,
-<command>gnobots2</command>, <command>gnome-stones</command>,
-<command>gnome-xbill</command>, <command>gnometris</command>,
-<command>gnomine</command>, <command>gnotravex</command>,
-<command>gnotski</command>, <command>gtali</command>,
-<command>iagno</command>, <command>mahjongg</command> and
-<command> same-gnome</command>.</para>
-
-</sect2>
-
Index: ome/add/games/gnome-games-exp.xml
===================================================================
--- gnome/add/games/gnome-games-exp.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--localstatedir=/var/lib</parameter>: This switch
-puts <application>ScrollKeeper</application> files in <filename class="directory">/var/lib/scrollkeeper</filename>
-instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
-
-<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
-configuration files in <filename class="directory">/etc/gnome</filename> instead of
-<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
-
-<para><parameter>--disable-setgid</parameter>: This will not prevent the setgid bit
-on the executables from being set. Though it also means that the functionality to
-save high game scores will be disabled.</para>
-
-</sect2>
-
Index: ome/add/games/gnome-games-inst.xml
===================================================================
--- gnome/add/games/gnome-games-inst.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<sect2>
-<title>Installation of <application><acronym>GNOME</acronym> Games</application></title>
-
-<para><application><acronym>GNOME</acronym> Games</application> needs to
-be setgid to track high scores. Create a seperate user and group for games.
-See the <filename>README</filename> file in the source directory for more
-information:</para>
-
-<screen><userinput><command>install -d /var/lib/games &amp;&amp;
-groupadd games &amp;&amp;
-useradd -c 'games' -d /var/lib/games -g games -s /bin/false games &amp;&amp;
-chown games:games /var/lib/games</command></userinput></screen>
-
-<para>Install <application><acronym>GNOME</acronym> Games</application> by running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
Index: ome/add/games/gnome-games-intro.xml
===================================================================
--- gnome/add/games/gnome-games-intro.xml	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<sect2>
-<title>Introduction to <application><acronym>GNOME</acronym> Games</application></title>
-
-<para>The <application><acronym>GNOME</acronym> Games</application> package contains games.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gnome-games-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gnome-games-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &gnome-games-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&gnome-games-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gnome-games-time;</para></listitem></itemizedlist>
-</sect3>
-                                                                                
-<sect3><title><application><acronym>GNOME</acronym> Games</application> dependencies</title>
-<sect4><title>Required</title>
-<para>
-<xref linkend="libgnomeui"/>,
-<xref linkend="scrollkeeper"/> and
-<xref linkend="librsvg"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="esound"/> and
-<xref linkend="guile"/>
-</para></sect4>
-</sect3>
-
-</sect2>
Index: ome/add/games/gnome-games.ent
===================================================================
--- gnome/add/games/gnome-games.ent	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!ENTITY gnome-games SYSTEM "../gnome-games.xml">
-<!ENTITY gnome-games-intro SYSTEM "gnome-games-intro.xml">
-<!ENTITY gnome-games-inst SYSTEM "gnome-games-inst.xml">
-<!ENTITY gnome-games-exp SYSTEM "gnome-games-exp.xml">
-<!ENTITY gnome-games-desc SYSTEM "gnome-games-desc.xml">
-<!ENTITY gnome-games-version "2.6.1">
-<!ENTITY gnome-games-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-&gnome-games-version;.tar.bz2">
-<!ENTITY gnome-games-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-&gnome-games-version;.tar.bz2">
-<!ENTITY gnome-games-size "7.9 MB">
-<!ENTITY gnome-games-buildsize "92 MB">
-<!ENTITY gnome-games-time "0.99 SBU">
Index: gnome/add/gconf-editor.xml
===================================================================
--- gnome/add/gconf-editor.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gconf-editor.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,10 @@
+<sect1 id="gconf-editor" xreflabel="GConf Editor-&gconf-editor-version;">
+<?dbhtml filename="gconf-editor.html"?>
+<title>GConf Editor-&gconf-editor-version;</title>
+
+&gconf-editor-intro;
+&gconf-editor-inst;
+&gconf-editor-desc;
+
+</sect1>
+
Index: gnome/add/gconf-editor/gconf-editor-desc.xml
===================================================================
--- gnome/add/gconf-editor/gconf-editor-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gconf-editor/gconf-editor-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>GConf Editor</application> package contains
+<command>gconf-editor</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gconf-editor</title>
+<para><command>gconf-editor</command> allows direct modification of the
+<application>GConf</application>
+configuration database.</para></sect3>
+
+
+</sect2>
+
Index: gnome/add/gconf-editor/gconf-editor-inst.xml
===================================================================
--- gnome/add/gconf-editor/gconf-editor-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gconf-editor/gconf-editor-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>GConf Editor</application></title>
+
+<para>Install <application>GConf Editor</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/add/gconf-editor/gconf-editor-intro.xml
===================================================================
--- gnome/add/gconf-editor/gconf-editor-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gconf-editor/gconf-editor-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,27 @@
+<sect2>
+<title>Introduction to <application>GConf Editor</application></title>
+
+<para>The <application>GConf Editor</application> package contains a
+<acronym>GUI</acronym> editor for the <application>GConf</application>
+configuration database.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gconf-editor-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gconf-editor-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gconf-editor-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gconf-editor-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gconf-editor-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>GConf Editor</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GConf"/></para></sect4>
+</sect3>
+
+
+</sect2>
Index: gnome/add/gconf-editor/gconf-editor.ent
===================================================================
--- gnome/add/gconf-editor/gconf-editor.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gconf-editor/gconf-editor.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,10 @@
+<!ENTITY gconf-editor SYSTEM "../gconf-editor.xml">
+<!ENTITY gconf-editor-intro SYSTEM "gconf-editor-intro.xml">
+<!ENTITY gconf-editor-inst SYSTEM "gconf-editor-inst.xml">
+<!ENTITY gconf-editor-desc SYSTEM "gconf-editor-desc.xml">
+<!ENTITY gconf-editor-version "2.6.1">
+<!ENTITY gconf-editor-download-http "http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.6/gconf-editor-&gconf-editor-version;.tar.bz2">
+<!ENTITY gconf-editor-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.6/gconf-editor-&gconf-editor-version;.tar.bz2">
+<!ENTITY gconf-editor-size "368 KB">
+<!ENTITY gconf-editor-buildsize "6.2 MB">
+<!ENTITY gconf-editor-time "0.07 SBU">
Index: gnome/add/gdm.xml
===================================================================
--- gnome/add/gdm.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gdm.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,12 @@
+<sect1 id="gdm" xreflabel="GDM-&gdm-version;">
+<?dbhtml filename="gdm.html"?>
+<title>GDM-&gdm-version;</title>
+
+&gdm-intro;
+&gdm-inst;
+&gdm-exp;
+&gdm-config;
+&gdm-desc;
+
+</sect1>
+
Index: gnome/add/gdm/gdm-config.xml
===================================================================
--- gnome/add/gdm/gdm-config.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gdm/gdm-config.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,45 @@
+<sect2>
+<title>Configuring <application>GDM</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>gdm.conf</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>The <application>GDM</application> <application>PAM</application>
+config files contain modules not present in a <acronym>BLFS</acronym>
+installation.  The following commands will replace those files:</para>
+<screen><userinput><command>cat &gt; /etc/pam.d/gdm &lt;&lt; "EOF"</command>
+auth        required    pam_unix.so
+auth        required    pam_nologin.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so
+<command>EOF
+cat &gt; /etc/pam.d/gdm-autologin &lt;&lt; "EOF"</command>
+auth        required    pam_env.so
+auth        required    pam_nologin.so
+auth        required    pam_permit.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so
+<command>EOF</command></userinput></screen>
+
+<para><command>gdm</command> can be tested by executing it from a root console.</para>
+
+<para>To start a graphical login at boot, install <filename>/etc/rc.d/init.d/gdm</filename>
+init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
+
+<screen><userinput><command>make install-gdm</command></userinput></screen>
+
+<para>To autostart with a graphical login, edit
+<filename>/etc/inittab</filename> so that the line reading</para>
+<screen>id:3:initdefault:</screen>
+<para>is changed to</para>
+<screen>id:5:initdefault:</screen>
+
+</sect3>
+
+</sect2>
+
Index: gnome/add/gdm/gdm-desc.xml
===================================================================
--- gnome/add/gdm/gdm-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gdm/gdm-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,52 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GDM</acronym></application> package contains
+<command>gdm</command>,
+<command>gdm-binary</command>,
+<command>gdmXnest</command>,
+<command>gdmXnestchooser</command>,
+<command>gdmchooser</command>,
+<command>gdmflexiserver</command>,
+<command>gdmgreeter</command>,
+<command>gdmlogin</command>,
+<command>gdmphotosetup</command>,
+<command>gdmsetup</command>,
+<command>gdmthemetester</command>,
+<command>gdm-restart</command>,
+<command>gdm-safe-restart</command>,
+<command>gdm-stop</command>,
+<command>gdmconfig</command>,
+<command>gdmopen</command> and
+<command>gdmtranslate</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gdm</title>
+<para><command>gdm</command> is a wrapper script to execute the
+<application><acronym>GDM</acronym></application> binary, the configurable
+<application><acronym>GNOME</acronym></application> based login prompt.</para></sect3>
+
+<sect3><title>gdmchooser</title>
+<para><command>gdmchooser</command> is an application for selecting
+<acronym>XDMCP</acronym> enabled hosts on
+the local network.</para></sect3>
+
+<sect3><title>gdmsetup</title>
+<para><command>gdmsetup</command> is a graphical interface to edit the
+<filename>gdm.conf</filename>.</para></sect3>
+
+<sect3><title>gdm-restart and gdm-safe-restart</title>
+<para><command>gdm-restart</command> sends the <acronym>HUP</acronym>
+signal and <command>gdm-safe-restart</command> sends the
+<acronym>USR</acronym>1 signal to the daemon so that it restarts. They are used after the
+config file is edited.</para></sect3>
+
+<sect3><title>gdmconfig</title>
+<para><command>gdmconfig</command> is an application for managing the configuration of the
+entire <application>GDM</application> applications suite.  It handles look and feel, security,
+<acronym>XDMCP</acronym>, GDMchooser and more.</para></sect3>
+
+</sect2>
Index: gnome/add/gdm/gdm-exp.xml
===================================================================
--- gnome/add/gdm/gdm-exp.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gdm/gdm-exp.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This command puts
+configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">/opt/gnome2/etc</filename>.</para>
+
+<para><parameter>--localstatedir=/var/lib</parameter>: This command
+puts files in <filename class="directory">/var/lib</filename> instead of
+<filename class="directory">/opt/gnome2/var</filename>.</para>
+
+<para><parameter>--with-pam-prefix=/etc</parameter>: This command puts
+<application><acronym>PAM</acronym></application>
+configuration files in <filename class="directory">/etc/pam.d</filename> instead of
+<filename class="directory">/etc/gnome</filename>.</para>
+
+</sect2>
+
Index: gnome/add/gdm/gdm-inst.xml
===================================================================
--- gnome/add/gdm/gdm-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gdm/gdm-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Installation of <application><acronym>GDM</acronym></application></title>
+
+<para>Install <application><acronym>GDM</acronym></application> by running the following commands:</para>
+
+<screen><userinput><command>groupadd gdm &amp;&amp;
+useradd -c gdm -d /dev/null -g gdm -s /bin/bash gdm &amp;&amp;
+./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib \
+    --with-pam-prefix=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: gnome/add/gdm/gdm-intro.xml
===================================================================
--- gnome/add/gdm/gdm-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gdm/gdm-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,36 @@
+<sect2>
+<title>Introduction to <application><acronym>GDM</acronym></application></title>
+
+<para>The <application><acronym>GDM</acronym></application> package
+contains <application><acronym>GNOME</acronym></application>'s Display Manager daemon. This is
+useful for allowing configurable graphical logins.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gdm-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gdm-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gdm-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gdm-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gdm-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GDM</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/>,
+<xref linkend="scrollkeeper"/> and
+<xref linkend="librsvg"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="Linux_PAM"/>,
+<xref linkend="tcpwrappers"/> and
+<ulink url="http://www.nsa.gov/selinux/">SELinux</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/add/gdm/gdm.ent
===================================================================
--- gnome/add/gdm/gdm.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gdm/gdm.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,12 @@
+<!ENTITY gdm SYSTEM "../gdm.xml">
+<!ENTITY gdm-intro SYSTEM "gdm-intro.xml">
+<!ENTITY gdm-inst SYSTEM "gdm-inst.xml">
+<!ENTITY gdm-exp SYSTEM "gdm-exp.xml">
+<!ENTITY gdm-config SYSTEM "gdm-config.xml">
+<!ENTITY gdm-desc SYSTEM "gdm-desc.xml">
+<!ENTITY gdm-version "2.6.0.2">
+<!ENTITY gdm-download-http "http://ftp.gnome.org/pub/GNOME/sources/gdm/2.6/gdm-&gdm-version;.tar.bz2">
+<!ENTITY gdm-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gdm/2.6/gdm-&gdm-version;.tar.bz2">
+<!ENTITY gdm-size "2.9 MB">
+<!ENTITY gdm-buildsize "54 MB">
+<!ENTITY gdm-time "0.65 SBU">
Index: gnome/add/gnome-games/gnome-games-desc.xml
===================================================================
--- gnome/add/gnome-games/gnome-games-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-games/gnome-games-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GNOME</acronym> Games</application> package contains
+<command>aisleriot</command>, <command>freecell</command>,
+<command>gataxx</command>, <command>glines</command>,
+<command>gnect</command>, <command>gnibbles</command>,
+<command>gnobots2</command>, <command>gnome-stones</command>,
+<command>gnome-xbill</command>, <command>gnometris</command>,
+<command>gnomine</command>, <command>gnotravex</command>,
+<command>gnotski</command>, <command>gtali</command>,
+<command>iagno</command>, <command>mahjongg</command> and
+<command> same-gnome</command>.</para>
+
+</sect2>
+
Index: gnome/add/gnome-games/gnome-games-exp.xml
===================================================================
--- gnome/add/gnome-games/gnome-games-exp.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-games/gnome-games-exp.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
+configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+
+<para><parameter>--disable-setgid</parameter>: This will not prevent the setgid bit
+on the executables from being set. Though it also means that the functionality to
+save high game scores will be disabled.</para>
+
+</sect2>
+
Index: gnome/add/gnome-games/gnome-games-inst.xml
===================================================================
--- gnome/add/gnome-games/gnome-games-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-games/gnome-games-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,21 @@
+<sect2>
+<title>Installation of <application><acronym>GNOME</acronym> Games</application></title>
+
+<para><application><acronym>GNOME</acronym> Games</application> needs to
+be setgid to track high scores. Create a seperate user and group for games.
+See the <filename>README</filename> file in the source directory for more
+information:</para>
+
+<screen><userinput><command>install -d /var/lib/games &amp;&amp;
+groupadd games &amp;&amp;
+useradd -c 'games' -d /var/lib/games -g games -s /bin/false games &amp;&amp;
+chown games:games /var/lib/games</command></userinput></screen>
+
+<para>Install <application><acronym>GNOME</acronym> Games</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: gnome/add/gnome-games/gnome-games-intro.xml
===================================================================
--- gnome/add/gnome-games/gnome-games-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-games/gnome-games-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,33 @@
+<sect2>
+<title>Introduction to <application><acronym>GNOME</acronym> Games</application></title>
+
+<para>The <application><acronym>GNOME</acronym> Games</application> package contains games.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-games-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-games-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-games-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-games-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-games-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GNOME</acronym> Games</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/>,
+<xref linkend="scrollkeeper"/> and
+<xref linkend="librsvg"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="esound"/> and
+<xref linkend="guile"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/add/gnome-games/gnome-games.ent
===================================================================
--- gnome/add/gnome-games/gnome-games.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-games/gnome-games.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,11 @@
+<!ENTITY gnome-games SYSTEM "../gnome-games.xml">
+<!ENTITY gnome-games-intro SYSTEM "gnome-games-intro.xml">
+<!ENTITY gnome-games-inst SYSTEM "gnome-games-inst.xml">
+<!ENTITY gnome-games-exp SYSTEM "gnome-games-exp.xml">
+<!ENTITY gnome-games-desc SYSTEM "gnome-games-desc.xml">
+<!ENTITY gnome-games-version "2.6.1">
+<!ENTITY gnome-games-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-&gnome-games-version;.tar.bz2">
+<!ENTITY gnome-games-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-&gnome-games-version;.tar.bz2">
+<!ENTITY gnome-games-size "7.9 MB">
+<!ENTITY gnome-games-buildsize "92 MB">
+<!ENTITY gnome-games-time "0.99 SBU">
Index: gnome/add/gnome-media/gnome-media-desc.xml
===================================================================
--- gnome/add/gnome-media/gnome-media-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-media/gnome-media-desc.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,32 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GNOME</acronym> Media</application> package contains
+<command>gnome-sound-recorder</command>,
+<command>gnome-cd</command>,
+<command>gnome-volume-control</command> and
+<command>vumeter</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gnome-sound-recorder</title>
+<para><command>gnome-sound-recorder</command> is
+<application><acronym>GNOME</acronym></application>'s recorder.</para></sect3>
+
+<sect3><title>gnome-cd</title>
+<para><command>gnome-cd</command> is
+<application><acronym>GNOME</acronym></application>'s
+<acronym>CD</acronym> Player.</para></sect3>
+
+<sect3><title>gnome-volume-control</title>
+<para><command>gnome-volume-control</command> is
+<application><acronym>GNOME</acronym></application>'s mixer with volume
+applet.</para></sect3>
+
+<sect3><title>vumeter</title>
+<para><command>vumeter</command> is a visual volume meter.</para></sect3>
+
+</sect2>
+
Index: gnome/add/gnome-media/gnome-media-exp.xml
===================================================================
--- gnome/add/gnome-media/gnome-media-exp.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-media/gnome-media-exp.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--libexecdir=`pkg-config --variable=prefix
+ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
+<filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
+configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename
+class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+
+</sect2>
+
Index: gnome/add/gnome-media/gnome-media-inst.xml
===================================================================
--- gnome/add/gnome-media/gnome-media-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-media/gnome-media-inst.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Installation of <application><acronym>GNOME</acronym> Media</application></title>
+
+<para>Install <application><acronym>GNOME</acronym> Media</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/add/gnome-media/gnome-media-intro.xml
===================================================================
--- gnome/add/gnome-media/gnome-media-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-media/gnome-media-intro.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,35 @@
+<sect2>
+<title>Introduction to <application><acronym>GNOME</acronym> Media</application></title>
+
+<para>The <application><acronym>GNOME</acronym> Media</application>
+package contains <application><acronym>GNOME</acronym></application>'s media
+applications.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-media-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-media-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-media-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-media-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-media-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GNOME</acronym> Media</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/> and
+<xref linkend="scrollkeeper"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="gstreamer"/>,
+<xref linkend="gst-plugins"/> and
+<xref linkend="esound"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/add/gnome-media/gnome-media.ent
===================================================================
--- gnome/add/gnome-media/gnome-media.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gnome-media/gnome-media.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,11 @@
+<!ENTITY gnome-media SYSTEM "../gnome-media.xml">
+<!ENTITY gnome-media-intro SYSTEM "gnome-media-intro.xml">
+<!ENTITY gnome-media-inst SYSTEM "gnome-media-inst.xml">
+<!ENTITY gnome-media-exp SYSTEM "gnome-media-exp.xml">
+<!ENTITY gnome-media-desc SYSTEM "gnome-media-desc.xml">
+<!ENTITY gnome-media-version "2.6.1">
+<!ENTITY gnome-media-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.6/gnome-media-&gnome-media-version;.tar.bz2">
+<!ENTITY gnome-media-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.6/gnome-media-&gnome-media-version;.tar.bz2">
+<!ENTITY gnome-media-size "2.9 MB">
+<!ENTITY gnome-media-buildsize "49 MB">
+<!ENTITY gnome-media-time "0.49 SBU">
Index: gnome/add/gtkhtml.xml
===================================================================
--- gnome/add/gtkhtml.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gtkhtml.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,9 @@
+<sect1 id="gtkhtml" xreflabel="GtkHTML-&gtkhtml-version;">
+<?dbhtml filename="gtkhtml.html"?>
+<title>GtkHTML-&gtkhtml-version;</title>
+
+&gtkhtml-intro;
+&gtkhtml-inst;
+&gtkhtml-desc;
+
+</sect1>
Index: gnome/add/gtksourceview.xml
===================================================================
--- gnome/add/gtksourceview.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/gtksourceview.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,10 @@
+<sect1 id="gtksourceview" xreflabel="gtksourceview-&gtksourceview-version;">
+<?dbhtml filename="gtksourceview.html"?>
+<title>gtksourceview-&gtksourceview-version;</title>
+
+&gtksourceview-intro;
+&gtksourceview-inst;
+&gtksourceview-desc;
+
+</sect1>
+
Index: gnome/add/libgnomeprint.xml
===================================================================
--- gnome/add/libgnomeprint.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/libgnomeprint.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,11 @@
+<sect1 id="libgnomeprint" xreflabel="libgnomeprint-&libgnomeprint-version;">
+<?dbhtml filename="libgnomeprint.html"?>
+<title>libgnomeprint-&libgnomeprint-version;</title>
+
+&libgnomeprint-intro;
+&libgnomeprint-inst;
+&libgnomeprint-exp;
+&libgnomeprint-desc;
+
+</sect1>
+
Index: gnome/add/libgnomeprintui.xml
===================================================================
--- gnome/add/libgnomeprintui.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/libgnomeprintui.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,11 @@
+<sect1 id="libgnomeprintui" xreflabel="libgnomeprintui-&libgnomeprintui-version;">
+<?dbhtml filename="libgnomeprintui.html"?>
+<title>libgnomeprintui-&libgnomeprintui-version;</title>
+
+&libgnomeprintui-intro;
+&libgnomeprintui-inst;
+&libgnomeprintui-exp;
+&libgnomeprintui-desc;
+
+</sect1>
+
Index: gnome/add/libgtkhtml.xml
===================================================================
--- gnome/add/libgtkhtml.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
+++ gnome/add/libgtkhtml.xml	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -0,0 +1,10 @@
+<sect1 id="libgtkhtml" xreflabel="libgtkhtml-&libgtkhtml-version;">
+<?dbhtml filename="libgtkhtml.html"?>
+<title>libgtkhtml-&libgtkhtml-version;</title>
+
+&libgtkhtml-intro;
+&libgtkhtml-inst;
+&libgtkhtml-desc;
+
+</sect1>
+
Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision 1073bc7d2fb000bff7042387e7e8048600f2df3b)
+++ gnome/gnome.ent	(revision 91557b0fd2a79da3160180801b50e9f4e14d75a1)
@@ -82,11 +82,11 @@
 <!-- GNOME Additional Packages -->
 <!ENTITY gnome-add SYSTEM "add/add.xml">
-<!ENTITY % libgnomeprint SYSTEM "lib/libgnomeprint/libgnomeprint.ent">
+<!ENTITY % libgnomeprint SYSTEM "add/libgnomeprint/libgnomeprint.ent">
 %libgnomeprint;
-<!ENTITY % libgnomeprintui SYSTEM "lib/libgnomeprintui/libgnomeprintui.ent">
+<!ENTITY % libgnomeprintui SYSTEM "add/libgnomeprintui/libgnomeprintui.ent">
 %libgnomeprintui;
-<!ENTITY % gtkhtml2 SYSTEM "lib/gtkhtml/gtkhtml2.ent">
-%gtkhtml2;
-<!ENTITY % libgtkhtml SYSTEM "lib/libgtkhtml/libgtkhtml.ent">
+<!ENTITY % gtkhtml SYSTEM "add/gtkhtml/gtkhtml.ent">
+%gtkhtml;
+<!ENTITY % libgtkhtml SYSTEM "add/libgtkhtml/libgtkhtml.ent">
 %libgtkhtml;
 <!ENTITY % yelp SYSTEM "add/yelp/yelp.ent">
@@ -94,5 +94,5 @@
 <!ENTITY % bug-buddy SYSTEM "add/bug-buddy/bug-buddy.ent">
 %bug-buddy;
-<!ENTITY % gtksourceview SYSTEM "lib/gtksourceview/gtksourceview.ent">
+<!ENTITY % gtksourceview SYSTEM "add/gtksourceview/gtksourceview.ent">
 %gtksourceview;
 <!ENTITY % gedit SYSTEM "add/gedit/gedit.ent">
@@ -104,13 +104,13 @@
 <!ENTITY % file-roller SYSTEM "add/file-roller/file-roller.ent">
 %file-roller;
-<!ENTITY % gconf-editor SYSTEM "other/gconf-editor/gconf-editor.ent">
+<!ENTITY % gconf-editor SYSTEM "add/gconf-editor/gconf-editor.ent">
 %gconf-editor;
-<!ENTITY % gnome-utils SYSTEM "add/utils/gnome-utils.ent">
+<!ENTITY % gnome-utils SYSTEM "add/gnome-utils/gnome-utils.ent">
 %gnome-utils;
-<!ENTITY % gal2 SYSTEM "lib/gal/gal2.ent">
-%gal2;
-<!ENTITY % gnome-system-monitor SYSTEM "add/monitor/gnome-system-monitor.ent">
+<!ENTITY % gal SYSTEM "add/gal/gal.ent">
+%gal;
+<!ENTITY % gnome-system-monitor SYSTEM "add/gnome-system-monitor/gnome-system-monitor.ent">
 %gnome-system-monitor;
-<!ENTITY % gnome-media SYSTEM "add/media/gnome-media.ent">
+<!ENTITY % gnome-media SYSTEM "add/gnome-media/gnome-media.ent">
 %gnome-media;
 <!ENTITY % nautilus-media SYSTEM "add/nautilus-media/nautilus-media.ent">
@@ -130,5 +130,5 @@
 <!ENTITY % gnome-speech SYSTEM "add/gnome-speech/gnome-speech.ent">
 %gnome-speech;
-<!ENTITY % at-spi SYSTEM "lib/at-spi/at-spi.ent">
+<!ENTITY % at-spi SYSTEM "add/at-spi/at-spi.ent">
 %at-spi;
 <!ENTITY % gnome-mag SYSTEM "add/gnome-mag/gnome-mag.ent">
@@ -142,23 +142,9 @@
 <!ENTITY % gnomemeeting SYSTEM "add/gnomemeeting/gnomemeeting.ent">
 %gnomemeeting;
-
-<!ENTITY % linc SYSTEM "lib/linc/linc.ent">
-<!ENTITY % bonobo-activation SYSTEM "lib/bonobo/bonobo-activation.ent">
-<!ENTITY % gtk-thinice-engine SYSTEM "lib/gtk-thinice-engine/gtk-thinice-engine.ent">
-<!ENTITY % libgail-gnome SYSTEM "lib/libgail-gnome/libgail-gnome.ent">
-%linc;
-%bonobo-activation;
-%gtk-thinice-engine;
-%libgail-gnome;
-
-<!ENTITY % gnome-games SYSTEM "add/games/gnome-games.ent">
-<!ENTITY % gnome2-user-docs SYSTEM "add/docs/gnome2-user-docs.ent">
-<!ENTITY % acme SYSTEM "add/acme/acme.ent">
+<!ENTITY % gnome-games SYSTEM "add/gnome-games/gnome-games.ent">
 %gnome-games;
+<!ENTITY % gnome2-user-docs SYSTEM "add/gnome2-user-docs/gnome2-user-docs.ent">
 %gnome2-user-docs;
-%acme;
-
-<!ENTITY gnome-other SYSTEM "other/other.xml">
-<!ENTITY % gdm SYSTEM "other/gdm/gdm.ent">
+<!ENTITY % gdm SYSTEM "add/gdm/gdm.ent">
 %gdm;
 
@@ -175,9 +161,9 @@
 <!ENTITY % gnome-vfs1 SYSTEM "otherlibs/gnome-vfs/gnome-vfs1.ent">
 <!ENTITY % libglade14 SYSTEM "otherlibs/libglade14/libglade14.ent">
-<!ENTITY % gal SYSTEM "otherlibs/gal/gal.ent">
+<!ENTITY % gal1 SYSTEM "otherlibs/gal/gal1.ent">
 <!ENTITY % guppi SYSTEM "otherlibs/guppi/guppi.ent">
 <!ENTITY % libcapplet SYSTEM "otherlibs/libcapplet/libcapplet.ent">
 <!ENTITY % soup SYSTEM "otherlibs/soup/soup.ent">
-<!ENTITY % gtkhtml SYSTEM "otherlibs/gtkhtml/gtkhtml.ent">
+<!ENTITY % gtkhtml1 SYSTEM "otherlibs/gtkhtml/gtkhtml1.ent">
 <!ENTITY % libghttp SYSTEM "otherlibs/libghttp/libghttp.ent">
 %orbit;
@@ -190,8 +176,8 @@
 %gnome-vfs1;
 %libglade14;
-%gal;
+%gal1;
 %guppi;
 %libcapplet;
 %soup;
-%gtkhtml;
+%gtkhtml1;
 %libghttp;
