Index: general.ent
===================================================================
--- general.ent	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ general.ent	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -240,8 +240,44 @@
 <!-- Chapter 29 -->                
 <!ENTITY kdevelop-version             "3.0.3">
+
+<!-- Part X -->
+<!ENTITY gnome-version                "2.6">
+<!-- Chapter 30 -->
+<!-- Chapter 31 -->
+<!ENTITY libgnomeprint-version        "2.6.1">
+<!ENTITY libgnomeprintui-version      "2.6.1">
+<!ENTITY gal-version                  "1.99.11">
+<!ENTITY gtkhtml-version              "3.0.10">
+<!ENTITY libgtkhtml-version           "2.6.1">
+<!ENTITY yelp-version                 "2.6.1">
+<!ENTITY bug-buddy-version            "2.6.1">
+<!ENTITY gtksourceview-version        "1.0.1">
+<!ENTITY gedit-version                "2.6.1">
+<!ENTITY eog-version                  "2.6.1">
+<!ENTITY ggv-version                  "2.6.1">
+<!ENTITY file-roller-version          "2.6.1">
+<!ENTITY gconf-editor-version         "2.6.1">
+<!ENTITY gnome-utils-version          "2.6.2">
+<!ENTITY gnome-system-monitor-version "2.6.0">
+<!ENTITY gnome-media-version          "2.6.1">
+<!ENTITY nautilus-media-version       "0.8.0">
+<!ENTITY gnome-netstatus-version      "2.6.1">
+<!ENTITY gcalctool-version            "4.3.51">
+<!ENTITY gpdf-version                 "0.131">
+<!ENTITY gucharmap-version            "1.4.1">
+<!ENTITY nautilus-cd-burner-version   "2.6.1">
+<!ENTITY zenity-version               "2.6.2">
+<!ENTITY gnome-speech-version         "0.3.2">
+<!ENTITY at-spi-version               "1.4.2">
+<!ENTITY gnome-mag-version            "0.10.11">
+<!ENTITY gnopernicus-version          "0.8.4">
+<!ENTITY gok-version                  "0.10.2">
+<!ENTITY epiphany-version             "1.2.5">
+<!ENTITY gnomemeeting-version         "1.0.2">
+<!ENTITY gnome-games-version          "2.6.1">
+<!ENTITY gnome2-user-docs-version     "2.6.0.1">
+<!ENTITY gdm-version                  "2.6.0.2">
+<!-- Chapter 32 -->
                                    
-                                   
-<!ENTITY gnome-version                "2.6">
-
 <!-- Part XI -->
 <!-- Chapter 33 --> 
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/add.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,2 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
 <chapter id="gnome-add">
 <?dbhtml filename="add.html"?>
@@ -7,37 +14,37 @@
 as wanted basis.</para>
 
-&libgnomeprint;
-&libgnomeprintui;
-&gal;
-&gtkhtml;
-&libgtkhtml;
-&yelp;
-&bug-buddy;
-&gtksourceview;
-&gedit;
-&eog;
-&ggv;
-&file-roller;
-&gconf-editor;
-&gnome-utils;
-&gnome-system-monitor;
-&gnome-media;
-&nautilus-media;
-&gnome-netstatus;
-&gcalctool;
-&gpdf;
-&gucharmap;
-&nautilus-cd-burner;
-&zenity;
-&gnome-speech;
-&at-spi;
-&gnome-mag;
-&gnopernicus;
-&gok;
-&epiphany;
-&gnomemeeting;
-&gnome-games;
-&gnome2-user-docs;
-&gdm;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnomeprint.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnomeprintui.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gal.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtkhtml.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgtkhtml.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="yelp.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bug-buddy.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtksourceview.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gedit.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="eog.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ggv.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="file-roller.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gconf-editor.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-utils.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-system-monitor.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-media.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nautilus-media.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-netstatus.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcalctool.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gpdf.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gucharmap.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nautilus-cd-burner.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="zenity.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-speech.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="at-spi.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-mag.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnopernicus.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gok.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="epiphany.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnomemeeting.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-games.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome2-user-docs.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdm.xml"/>
 
 </chapter>
Index: gnome/add/at-spi.xml
===================================================================
--- gnome/add/at-spi.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/at-spi.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,94 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!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">
+
+]>
+
 <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;
+<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>
+
+<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>
+
+<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>
+
+<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>
 
 </sect1>
Index: gnome/add/bug-buddy.xml
===================================================================
--- gnome/add/bug-buddy.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/bug-buddy.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY bug-buddy-download-http "http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/2.6/bug-buddy-&bug-buddy-version;.tar.bz2">
+<!ENTITY bug-buddy-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/bug-buddy/2.6/bug-buddy-&bug-buddy-version;.tar.bz2">
+<!ENTITY bug-buddy-size "839 KB">
+<!ENTITY bug-buddy-buildsize "12 MB">
+<!ENTITY bug-buddy-time "0.07 SBU">
+
+]>
+
 <sect1 id="bug-buddy" xreflabel="bug-buddy-&bug-buddy-version;">
 <?dbhtml filename="bug-buddy.html"?>
 <title>bug-buddy-&bug-buddy-version;</title>
 
-&bug-buddy-intro;
-&bug-buddy-inst;
-&bug-buddy-exp;
-&bug-buddy-desc;
+<sect2>
+<title>Introduction to <application>bug-buddy</application></title>
+
+<para>The <application>bug-buddy</application> package contains a graphical bug reporting tool.
+This can extract debugging information from a core file or crashed
+application.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&bug-buddy-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&bug-buddy-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &bug-buddy-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&bug-buddy-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&bug-buddy-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>bug-buddy</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="gnome-desktop"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>bug-buddy</application></title>
+
+<para>Install <application>bug-buddy</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>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>bug-buddy</application> package contains
+<command>bug-buddy</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>bug-buddy</title>
+<para><command>bug-buddy</command> is a graphical bug reporting system.</para></sect3>
+
+
+</sect2>
 
 </sect1>
Index: gnome/add/eog.xml
===================================================================
--- gnome/add/eog.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/eog.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,99 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY eog-download-http "http://ftp.gnome.org/pub/GNOME/sources/eog/2.6/eog-&eog-version;.tar.bz2">
+<!ENTITY eog-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/eog/2.6/eog-&eog-version;.tar.bz2">
+<!ENTITY eog-size "843 KB">
+<!ENTITY eog-buildsize "29 MB">
+<!ENTITY eog-time "0.19 SBU">
+
+]>
+
 <sect1 id="eog" xreflabel="EOG-&eog-version;">
 <?dbhtml filename="eog.html"?>
 <title>EOG-&eog-version;</title>
 
-&eog-intro;
-&eog-inst;
-&eog-exp;
-&eog-desc;
+<sect2>
+<title>Introduction to <application><acronym>EOG</acronym></application></title>
+
+<para>The <application><acronym>EOG</acronym></application> package
+contains Eye of <application><acronym>GNOME</acronym></application>. This 
+is useful for viewing and cataloging image files.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&eog-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&eog-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &eog-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&eog-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&eog-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>EOG</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnomeprintui"/></para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libjpeg"/> and
+<ulink url="http://sourceforge.net/projects/libexif/">libexif</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>EOG</acronym></application></title>
+
+<para>Install <application><acronym>EOG</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 \
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<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>--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>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>EOG</acronym></application> package contains
+<command>eog</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>eog</title>
+<para><command>eog</command> is a fast and functional image viewer as well as an image
+cataloging program.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/epiphany.xml
===================================================================
--- gnome/add/epiphany.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/epiphany.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,101 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY epiphany-download-http "http://ftp.gnome.org/pub/GNOME/sources/epiphany/1.2/epiphany-&epiphany-version;.tar.bz2">
+<!ENTITY epiphany-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/epiphany/1.2/epiphany-&epiphany-version;.tar.bz2">
+<!ENTITY epiphany-size "2.5 MB">
+<!ENTITY epiphany-buildsize "95 MB">
+<!ENTITY epiphany-time "1.11 SBU">
+
+]>
+
 <sect1 id="epiphany" xreflabel="Epiphany-&epiphany-version;">
 <?dbhtml filename="epiphany.html"?>
 <title>Epiphany-&epiphany-version;</title>
 
-&epiphany-intro;
-&epiphany-inst;
-&epiphany-exp;
-&epiphany-desc;
+<sect2>
+<title>Introduction to <application>Epiphany</application></title>
+
+<para>
+<application>Epiphany</application> is a simple yet powerful
+<acronym>GNOME</acronym> web browser targeted at non-technical users.
+Its principles are simplicity and standards compliance.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&epiphany-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&epiphany-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &epiphany-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&epiphany-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&epiphany-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>Epiphany</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/>,
+<xref linkend="scrollkeeper"/> and
+<xref linkend="mozilla"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="nautilus"/> and
+<xref linkend="gtk-doc"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Epiphany</application></title>
+
+<para>Install <application>Epiphany</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Epiphany</application> package contains
+<command>epiphany</command> and
+<command>epiphany-bin</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>epiphany</title>
+<para><command>epiphany</command> is a <acronym>GNOME</acronym> web
+browser based on the Mozilla rendering engine.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/file-roller.xml
===================================================================
--- gnome/add/file-roller.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/file-roller.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,89 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY file-roller-download-http "http://ftp.gnome.org/pub/GNOME/sources/file-roller/2.6/file-roller-&file-roller-version;.tar.bz2">
+<!ENTITY file-roller-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.6/file-roller-&file-roller-version;.tar.bz2">
+<!ENTITY file-roller-size "1.3 MB">
+<!ENTITY file-roller-buildsize "33 MB">
+<!ENTITY file-roller-time "0.40 SBU">
+
+]>
+
 <sect1 id="file-roller" xreflabel="File Roller-&file-roller-version;">
 <?dbhtml filename="file-roller.html"?>
 <title>File Roller-&file-roller-version;</title>
 
-&file-roller-intro;
-&file-roller-inst;
-&file-roller-exp;
-&file-roller-desc;
+<sect2>
+<title>Introduction to <application>File Roller</application></title>
+
+<para>
+File Roller is an archive manager for <acronym>GNOME</acronym> with
+support for tar, bzip2, gzip, zip, jar, compress and lzop archives.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&file-roller-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&file-roller-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &file-roller-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &file-roller-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &file-roller-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>File Roller</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/> and
+<xref linkend="scrollkeeper"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>File Roller</application></title>
+
+<para>Install <application>File Roller</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>
+
+<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>
+                                                                                
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>File Roller</application> package contains <command>file-roller</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>file-roller</title>
+<para><command>file-roller</command> is an archiver
+for <acronym>GNOME</acronym>.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gal.xml
===================================================================
--- gnome/add/gal.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gal.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,9 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gal-download-http "http://ftp.gnome.org/pub/gnome/sources/gal/1.99/gal-&gal-version;.tar.bz2">
+<!ENTITY gal-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/gal/1.99/gal-&gal-version;.tar.bz2">
+<!ENTITY gal-size "1.1 KB">
+<!ENTITY gal-buildsize "142 MB">
+<!ENTITY gal-time "1.70 SBU">
+
+]>
+
 <sect1 id="gal" xreflabel="GAL-&gal-version;">
 <?dbhtml filename="gal.html"?>
 <title>GAL-&gal-version;</title>
 
-&gal-intro;
-&gal-inst;
-&gal-desc;
+<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>
+
+<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>
+
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>GAL</application> package contains library
+routines pulled  from the Evolution and Gnumeric projects and repackaged
+as a generic library.</para>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gcalctool.xml
===================================================================
--- gnome/add/gcalctool.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gcalctool.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gcalctool-download-http "http://ftp.gnome.org/pub/GNOME/sources/gcalctool/4.3/gcalctool-&gcalctool-version;.tar.bz2">
+<!ENTITY gcalctool-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gcalctool/4.3/gcalctool-&gcalctool-version;.tar.bz2">
+<!ENTITY gcalctool-size "823 KB">
+<!ENTITY gcalctool-buildsize "12 MB">
+<!ENTITY gcalctool-time "0.15 SBU">
+
+]>
+
 <sect1 id="gcalctool" xreflabel="gcalctool-&gcalctool-version;">
 <?dbhtml filename="gcalctool.html"?>
 <title>gcalctool-&gcalctool-version;</title>
 
-&gcalctool-intro;
-&gcalctool-inst;
-&gcalctool-exp;
-&gcalctool-desc;
+<sect2>
+<title>Introduction to <application>gcalctool</application></title>
+
+<para>
+<application>gcalctool</application> is a powerful graphical calculator
+with financial, logical and scientific modes. It uses a multiple
+precision package to do its arithmetic to give a high degree of
+accuracy.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gcalctool-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gcalctool-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gcalctool-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gcalctool-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gcalctool-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>gcalctool</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/> and
+<xref linkend="scrollkeeper"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>gcalctool</application></title>
+
+<para>Install <application>gcalctool</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>gcalctool</application> package contains
+<command>gcalctool</command> (a.k.a.
+<command>gnome-calculator</command>).</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gcalctool</title>
+<para><command>gcalctool</command> is a desktop calculator for
+<acronym>GNOME</acronym>.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gconf-editor.xml
===================================================================
--- gnome/add/gconf-editor.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gconf-editor.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,9 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!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">
+
+]>
+
 <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;
+<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>
+
+<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>
+
+<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>
 
 </sect1>
Index: gnome/add/gdm.xml
===================================================================
--- gnome/add/gdm.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gdm.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,11 +1,189 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!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">
+
+]>
+
 <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;
+<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>
+
+<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>
+
+<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>
+
+<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 the <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 containing:</para>
+<screen>id:3:initdefault:</screen>
+<para>is changed to:</para>
+<screen>id:5:initdefault:</screen>
+
+</sect3>
+
+</sect2>
+
+<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
+<application><acronym>GDM</acronym></application>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>
 
 </sect1>
Index: gnome/add/gedit.xml
===================================================================
--- gnome/add/gedit.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gedit.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,89 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gedit-download-http "http://ftp.gnome.org/pub/GNOME/sources/gedit/2.6/gedit-&gedit-version;.tar.bz2">
+<!ENTITY gedit-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gedit/2.6/gedit-&gedit-version;.tar.bz2">
+<!ENTITY gedit-size "2.1 MB">
+<!ENTITY gedit-buildsize "59 MB">
+<!ENTITY gedit-time "0.59 SBU">
+
+]>
+
 <sect1 id="gedit" xreflabel="gedit-&gedit-version;">
 <?dbhtml filename="gedit.html"?>
 <title>gedit-&gedit-version;</title>
 
-&gedit-intro;
-&gedit-inst;
-&gedit-exp;
-&gedit-desc;
+<sect2>
+<title>Introduction to <application>gedit</application></title>
+
+<para>The <application>gedit</application> package contains a lightweight UTF-8 text editor for the
+<application><acronym>GNOME</acronym></application>
+desktop.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gedit-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gedit-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gedit-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gedit-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gedit-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>gedit</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="eel"/> and
+<xref linkend="gtksourceview"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>gedit</application></title>
+
+<para>Install <application>gedit</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>
+
+<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>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>gedit</application> package contains
+<command>gedit</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gedit</title>
+<para><command>gedit</command> is a lightweight text editor.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/ggv.xml
===================================================================
--- gnome/add/ggv.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/ggv.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY ggv-download-http "http://ftp.gnome.org/pub/GNOME/sources/ggv/2.6/ggv-&ggv-version;.tar.bz2">
+<!ENTITY ggv-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/ggv/2.6/ggv-&ggv-version;.tar.bz2">
+<!ENTITY ggv-size "1.2 MB">
+<!ENTITY ggv-buildsize "31 MB">
+<!ENTITY ggv-time "0.10 SBU">
+
+]>
+
 <sect1 id="ggv" xreflabel="ggv-&ggv-version;">
 <?dbhtml filename="ggv.html"?>
 <title>ggv-&ggv-version;</title>
 
-&ggv-intro;
-&ggv-inst;
-&ggv-exp;
-&ggv-desc;
+<sect2>
+<title>Introduction to <application>ggv</application></title>
+
+<para>The <application>ggv</application> package contains a PostScript
+file viewer.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&ggv-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&ggv-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ggv-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &ggv-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &ggv-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>ggv</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/> and
+<xref linkend="espgs"/> or <xref linkend="gs"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="cups"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>ggv</application></title>
+
+<para>Install <application>ggv</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 \
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<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>--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>
+                                                                                
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>ggv</application> package contains <command>ggv</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ggv</title>
+<para><command>ggv</command> is a GNOME 2 based PostScript viewer.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gnome-games.xml
===================================================================
--- gnome/add/gnome-games.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnome-games.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,109 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!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">
+
+]>
+
 <sect1 id="gnome-games" xreflabel="GNOME Games-&gnome-games-version;">
 <?dbhtml filename="gnome-games.html"?>
 <title>GNOME Games-&gnome-games-version;</title>
 
-&gnome-games-intro;
-&gnome-games-inst;
-&gnome-games-exp;
-&gnome-games-desc;
+<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>
+
+<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 separate 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>
+
+<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><option>--disable-setgid</option>: This will prevent the setgid bit
+on the executables from being set. It provides system administrator's
+with the option to disable setgid binaries, though it also means that the functionality to
+save high game scores will be disabled.</para>
+
+</sect2>
+
+<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>
 
 </sect1>
Index: gnome/add/gnome-mag.xml
===================================================================
--- gnome/add/gnome-mag.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnome-mag.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,9 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gnome-mag-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-mag/0.10/gnome-mag-&gnome-mag-version;.tar.bz2">
+<!ENTITY gnome-mag-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-mag/0.10/gnome-mag-&gnome-mag-version;.tar.bz2">
+<!ENTITY gnome-mag-size "286 KB">
+<!ENTITY gnome-mag-buildsize "3.9 MB">
+<!ENTITY gnome-mag-time "0.14 SBU">
+
+]>
+
 <sect1 id="gnome-mag" xreflabel="GNOME Magnifier-&gnome-mag-version;">
 <?dbhtml filename="gnome-mag.html"?>
 <title>GNOME Magnifier-&gnome-mag-version;</title>
 
-&gnome-mag-intro;
-&gnome-mag-inst;
-&gnome-mag-desc;
+<sect2>
+<title>Introduction to <application><acronym>GNOME</acronym> Magnifier</application></title>
+
+<para>
+The <application><acronym>GNOME</acronym> Magnifier</application>
+includes a screen magnifier, which allows you to zoom in on portions of
+the desktop. It is expressly designed for users with low vision who wish
+to use the <acronym>GNOME</acronym> desktop.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-mag-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-mag-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-mag-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-mag-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-mag-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GNOME</acronym> Magnifier</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="at-spi"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>GNOME</acronym> Magnifier</application></title>
+
+<para>Install <application><acronym>GNOME</acronym> Magnifier</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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GNOME</acronym> Magnifier</application>
+package contains
+<command>magnifier</command> and
+<filename class="libraryfile">libgnome-mag</filename>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>magnifier</title>
+<para><command>magnifier</command> is a screen zooming
+utility.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gnome-media.xml
===================================================================
--- gnome/add/gnome-media.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnome-media.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,119 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!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">
+
+]>
+
 <sect1 id="gnome-media" xreflabel="GNOME Media-&gnome-media-version;">
 <?dbhtml filename="gnome-media.html"?>
 <title>GNOME Media-&gnome-media-version;</title>
 
-&gnome-media-intro;
-&gnome-media-inst;
-&gnome-media-exp;
-&gnome-media-desc;
+<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>
+
+<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>
+
+<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>
+
+<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>
 
 </sect1>
Index: gnome/add/gnome-netstatus.xml
===================================================================
--- gnome/add/gnome-netstatus.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnome-netstatus.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,100 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gnome-netstatus-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.6/gnome-netstatus-&gnome-netstatus-version;.tar.bz2">
+<!ENTITY gnome-netstatus-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.6/gnome-netstatus-&gnome-netstatus-version;.tar.bz2">
+<!ENTITY gnome-netstatus-size "418 KB">
+<!ENTITY gnome-netstatus-buildsize "6.1 MB">
+<!ENTITY gnome-netstatus-time "0.12 SBU">
+
+]>
+
 <sect1 id="gnome-netstatus" xreflabel="GNOME Netstatus-&gnome-netstatus-version;">
 <?dbhtml filename="gnome-netstatus.html"?>
 <title>GNOME Netstatus-&gnome-netstatus-version;</title>
 
-&gnome-netstatus-intro;
-&gnome-netstatus-inst;
-&gnome-netstatus-exp;
-&gnome-netstatus-desc;
+<sect2>
+<title>Introduction to <application><acronym>GNOME</acronym> Netstatus</application></title>
+
+<para>
+The <application><acronym>GNOME</acronym> Netstatus</application>
+package contains a panel applet that monitors network interfaces. It provides
+indicators for ingoing and outgoing data, packets received and
+transmitted, and information about the network interface such as
+<acronym>IP</acronym> information and Ethernet address.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-netstatus-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-netstatus-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-netstatus-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-netstatus-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-netstatus-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GNOME</acronym> Netstatus</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="gnome-panel"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>GNOME</acronym> Netstatus</application></title>
+
+<para>Install <application><acronym>GNOME</acronym> Netstatus</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>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GNOME</acronym> Netstatus</application>
+package contains <command>gnome-netstatus-applet</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gnome-netstatus-applet</title>
+<para><command>gnome-netstatus-applet</command> displays information
+about a network interface on your panel.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gnome-speech.xml
===================================================================
--- gnome/add/gnome-speech.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnome-speech.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,9 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gnome-speech-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-speech/0.3/gnome-speech-&gnome-speech-version;.tar.bz2">
+<!ENTITY gnome-speech-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-speech/0.3/gnome-speech-&gnome-speech-version;.tar.bz2">
+<!ENTITY gnome-speech-size "220 KB">
+<!ENTITY gnome-speech-buildsize "4.5 MB">
+<!ENTITY gnome-speech-time "0.10 SBU">
+
+]>
+
 <sect1 id="gnome-speech" xreflabel="GNOME Speech-&gnome-speech-version;">
 <?dbhtml filename="gnome-speech.html"?>
 <title>GNOME Speech-&gnome-speech-version;</title>
 
-&gnome-speech-intro;
-&gnome-speech-inst;
-&gnome-speech-desc;
+<sect2>
+<title>Introduction to <application><acronym>GNOME</acronym> Speech</application></title>
+
+<para>
+The <application><acronym>GNOME</acronym> Speech</application> gives a
+simple general <acronym>API</acronym> for producing text-to-speech
+output. Multiple backends are supported by the
+<application><acronym>GNOME</acronym> Speech</application> library, but
+currently only the Festival backend is enabled in this package; the other
+backends require either Java or proprietary software.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-speech-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-speech-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-speech-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-speech-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-speech-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GNOME</acronym> Speech</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libbonobo"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="gtk-doc"/>,
+<xref linkend="j2sdk"/>,
+<ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink>,
+<ulink url="http://freetts.sourceforge.net/">FreeTTS</ulink>,
+<ulink url="http://www.ibm.com/software/voice/viavoice/">ViaVoice</ulink>,
+<ulink url="http://www.scansoft.com/">Eloquence</ulink>,
+<ulink url="http://www.fonix.com/">DECTalk</ulink> and
+<ulink url="http://www.cepstral.com/">Theta</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>GNOME</acronym> Speech</application></title>
+
+<para>Install <application><acronym>GNOME</acronym> Speech</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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GNOME</acronym> Speech</application>
+package contains
+<command>festival-synthesis-driver</command>,
+<command>test-speech</command> and
+<filename class="libraryfile">libgnomespeech</filename>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgnomespeech</title>
+<para><filename class="libraryfile">libgnomespeech</filename> provides 
+the <acronym>API</acronym> for programs to convert text into
+speech.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gnome-system-monitor.xml
===================================================================
--- gnome/add/gnome-system-monitor.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnome-system-monitor.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gnome-system-monitor-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.6/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
+<!ENTITY gnome-system-monitor-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.6/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
+<!ENTITY gnome-system-monitor-size "584 KB">
+<!ENTITY gnome-system-monitor-buildsize "9.7 MB">
+<!ENTITY gnome-system-monitor-time "0.12 SBU">
+
+]>
+
 <sect1 id="gnome-system-monitor" xreflabel="GNOME System Monitor-&gnome-system-monitor-version;">
 <?dbhtml filename="gnome-system-monitor.html"?>
 <title>GNOME System Monitor-&gnome-system-monitor-version;</title>
 
-&gnome-system-monitor-intro;
-&gnome-system-monitor-inst;
-&gnome-system-monitor-exp;
-&gnome-system-monitor-desc;
+<sect2>
+<title>Introduction to <application><acronym>GNOME</acronym> System Monitor</application></title>
+
+<para>The <application><acronym>GNOME</acronym> System Monitor</application> package contains procman, GNOME's
+replacement for gtop.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-system-monitor-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-system-monitor-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-system-monitor-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-system-monitor-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-system-monitor-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GNOME</acronym> System Monitor</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/>,
+<xref linkend="libwnck"/> and
+<xref linkend="libgtop"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>GNOME</acronym> System Monitor</application></title>
+
+<para>Install <application><acronym>GNOME</acronym> System Monitor</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>
+
+<note><para><command>make install</command> will need path access to <filename
+class="directory">$GNOME_PREFIX/bin</filename>. If your
+preinstallation changes were made only to the user account, you will
+need to adjust root's path prior to running <command>make
+install</command>.</para></note>
+
+</sect2>
+
+<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>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GNOME</acronym> System Monitor</application> package contains <command>gnome-system-monitor</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gnome-system-monitor</title>
+<para><command>gnome-system-monitor</command> displays the process tree and hardware meters.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gnome-utils.xml
===================================================================
--- gnome/add/gnome-utils.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnome-utils.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gnome-utils-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-utils/2.6/gnome-utils-&gnome-utils-version;.tar.bz2">
+<!ENTITY gnome-utils-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-utils/2.6/gnome-utils-&gnome-utils-version;.tar.bz2">
+<!ENTITY gnome-utils-size "1.6 MB">
+<!ENTITY gnome-utils-buildsize "30.3 MB">
+<!ENTITY gnome-utils-time "0.40 SBU">
+
+]>
+
 <sect1 id="gnome-utils" xreflabel="GNOME Utilities-&gnome-utils-version;">
 <?dbhtml filename="gnome-utils.html"?>
 <title>GNOME Utilities-&gnome-utils-version;</title>
 
-&gnome-utils-intro;
-&gnome-utils-inst;
-&gnome-utils-exp;
-&gnome-utils-desc;
+<sect2>
+<title>Introduction to <application><acronym>GNOME</acronym> Utilities</application></title>
+
+<para>The <application><acronym>GNOME</acronym> Utilities</application> package contains a collection of small
+applications designed to make your life a little easier.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-utils-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-utils-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-utils-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-utils-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-utils-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GNOME</acronym> Utilities</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="gnome-panel"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="Linux_PAM"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>GNOME</acronym> Utilities</application></title>
+
+<para>Install <application><acronym>GNOME</acronym> Utilities</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 \
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<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>--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>--with-pam-prefix=/etc/pam.d</parameter>: This switch
+puts <application><acronym>PAM</acronym></application> files in
+<filename class="directory">/etc/pam.d</filename> instead of
+<filename class="directory">/etc/gnome</filename>.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GNOME</acronym> Utilities</application> package contains
+<command>gnome-system-log</command>,
+<command>gnome-search-tool</command>,
+<command>gnome-dictionary</command>,
+and <command>gfloppy</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gnome-system-log</title>
+<para><command>gnome-system-log</command> allows you to monitor and view system log files.</para></sect3>
+
+<sect3><title>gnome-search-tool</title>
+<para><command>gnome-search-tool</command> allows you to search for files on your system
+using simple and advanced search options.</para></sect3>
+
+<sect3><title>gnome-dictionary</title>
+<para><command>gnome-dictionary</command> allows you to look up definitions and spelling of
+words.</para></sect3>
+
+<sect3><title>gfloppy</title>
+<para><command>gfloppy</command> formats floppy disks under Linux.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gnome2-user-docs.xml
===================================================================
--- gnome/add/gnome2-user-docs.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnome2-user-docs.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!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">
+
+]>
+
 <sect1 id="gnome2-user-docs" xreflabel="GNOME2 User Docs-&gnome2-user-docs-version;">
 <?dbhtml filename="gnome2-user-docs.html"?>
 <title>GNOME2 User Docs-&gnome2-user-docs-version;</title>
 
-&gnome2-user-docs-intro;
-&gnome2-user-docs-inst;
-&gnome2-user-docs-exp;
-&gnome2-user-docs-desc;
+<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>
+
+<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>
+
+<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>
+
+<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>
 
 </sect1>
Index: gnome/add/gnomemeeting.xml
===================================================================
--- gnome/add/gnomemeeting.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnomemeeting.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gnomemeeting-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnomemeeting/1.0/gnomemeeting-&gnomemeeting-version;.tar.bz2">
+<!ENTITY gnomemeeting-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnomemeeting/1.0/gnomemeeting-&gnomemeeting-version;.tar.bz2">
+<!ENTITY gnomemeeting-size "2.9 MB">
+<!ENTITY gnomemeeting-buildsize "47 MB">
+<!ENTITY gnomemeeting-time "1.06 SBU">
+
+]>
+
 <sect1 id="gnomemeeting" xreflabel="GnomeMeeting-&gnomemeeting-version;">
 <?dbhtml filename="gnomemeeting.html"?>
 <title>GnomeMeeting-&gnomemeeting-version;</title>
 
-&gnomemeeting-intro;
-&gnomemeeting-inst;
-&gnomemeeting-exp;
-&gnomemeeting-desc;
+<sect2>
+<title>Introduction to <application>GnomeMeeting</application></title>
+
+<para>
+<application>GnomeMeeting</application> is an H.323 compatible
+videoconferencing and
+<acronym>VOIP</acronym>/<acronym>IP</acronym>-Telephony application that
+allows you to make audio and video calls to remote users with H.323
+hardware or software (such as Microsoft Netmeeting). It supports all
+modern videoconferencing features, such as registering to an
+<acronym>ILS</acronym> directory, gatekeeper support, making multi-user
+conference calls using an external <acronym>MCU</acronym>, using modern
+Quicknet telephony cards, and making PC-To-Phone calls.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnomemeeting-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnomemeeting-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnomemeeting-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnomemeeting-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnomemeeting-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>GnomeMeeting</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/>,
+<xref linkend="scrollkeeper"/>,
+<ulink url="http://sourceforge.net/projects/openh323">PWLib-1.6.5 (compiled with OpenLDAP support)</ulink> and
+<ulink url="http://sourceforge.net/projects/openh323">OpenH323-1.13.4</ulink>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="SDL"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>GnomeMeeting</application></title>
+
+<para>Install <application>GnomeMeeting</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>GnomeMeeting</application> package contains
+<command>gnomemeeting</command> and
+<command>gnomemeeting-config-tool</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gnomemeeting</title>
+<para><command>gnomemeeting</command> is a H.323 Voip, Telephony and
+Video Conferencing application which uses the H.323
+protocol.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gnopernicus.xml
===================================================================
--- gnome/add/gnopernicus.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gnopernicus.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gnopernicus-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnopernicus/0.8/gnopernicus-&gnopernicus-version;.tar.bz2">
+<!ENTITY gnopernicus-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnopernicus/0.8/gnopernicus-&gnopernicus-version;.tar.bz2">
+<!ENTITY gnopernicus-size "1.5 MB">
+<!ENTITY gnopernicus-buildsize "41 MB">
+<!ENTITY gnopernicus-time "0.69 SBU">
+
+]>
+
 <sect1 id="gnopernicus" xreflabel="Gnopernicus-&gnopernicus-version;">
 <?dbhtml filename="gnopernicus.html"?>
 <title>Gnopernicus-&gnopernicus-version;</title>
 
-&gnopernicus-intro;
-&gnopernicus-inst;
-&gnopernicus-exp;
-&gnopernicus-desc;
+<sect2>
+<title>Introduction to <application>Gnopernicus</application></title>
+
+<para>
+<application>Gnopernicus</application> enables users with limited vision,
+or no vision, to use the <acronym>GNOME</acronym> desktop and
+applications effectively. It provides a number of features, including
+magnification, focus tracking, braille output, and more.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnopernicus-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnopernicus-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnopernicus-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnopernicus-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnopernicus-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>Gnopernicus</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/>,
+<xref linkend="scrollkeeper"/>,
+<xref linkend="gnome-speech"/> and
+<xref linkend="at-spi"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="gtk-doc"/> and
+<ulink url="http://www.mielke.cc/brltty/">BRLTTY</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Gnopernicus</application></title>
+
+<para>Install <application>Gnopernicus</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Gnopernicus</application> package contains
+<command>brlmonitor</command>,
+<command>gnopernicus</command> and
+<command>srcore</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>brlmonitor</title>
+<para><command>brlmonitor</command> is a braille display
+simulator.</para></sect3>
+
+<sect3><title>gnopernicus</title>
+<para><command>gnopernicus</command> provides various functionality
+for users with limited vision.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gok.xml
===================================================================
--- gnome/add/gok.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gok.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,102 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gok-download-http "http://ftp.gnome.org/pub/GNOME/sources/gok/0.10/gok-&gok-version;.tar.bz2">
+<!ENTITY gok-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gok/0.10/gok-&gok-version;.tar.bz2">
+<!ENTITY gok-size "1.1 MB">
+<!ENTITY gok-buildsize "53 MB">
+<!ENTITY gok-time "1.01 SBU">
+
+]>
+
 <sect1 id="gok" xreflabel="GOK-&gok-version;">
 <?dbhtml filename="gok.html"?>
 <title>GOK-&gok-version;</title>
 
-&gok-intro;
-&gok-inst;
-&gok-exp;
-&gok-desc;
+<sect2>
+<title>Introduction to <application><acronym>GOK</acronym></application></title>
+
+<para>
+<application><acronym>GOK</acronym></application> is a dynamic onscreen
+keyboard. It features Direct Selection, Dwell Selection, Automatic
+Scanning and Inverse Scanning access methods and includes word
+completion.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gok-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gok-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gok-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gok-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gok-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GOK</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/>,
+<xref linkend="scrollkeeper"/>,
+<xref linkend="libwnck"/>,
+<xref linkend="at-spi"/> and
+<xref linkend="esound"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="gtk-doc"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>GOK</acronym></application></title>
+
+<para>Install <application><acronym>GOK</acronym></application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GOK</acronym></application> package contains
+<command>gok</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gok</title>
+<para><command>gok</command> is a dynamic onscreen keyboard
+utility.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gpdf.xml
===================================================================
--- gnome/add/gpdf.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gpdf.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,106 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gpdf-download-http "http://ftp.gnome.org/pub/GNOME/sources/gpdf/&gpdf-version;/gpdf-&gpdf-version;.tar.bz2">
+<!ENTITY gpdf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gpdf/&gpdf-version;/gpdf-&gpdf-version;.tar.bz2">
+<!ENTITY gpdf-size "1.1 MB">
+<!ENTITY gpdf-buildsize "48 MB">
+<!ENTITY gpdf-time "0.60 SBU">
+
+]>
+
 <sect1 id="gpdf" xreflabel="GPdf-&gpdf-version;">
 <?dbhtml filename="gpdf.html"?>
 <title>GPdf-&gpdf-version;</title>
 
-&gpdf-intro;
-&gpdf-inst;
-&gpdf-exp;
-&gpdf-desc;
+<sect2>
+<title>Introduction to <application>GPdf</application></title>
+
+<para>
+<application>GPdf</application> is a <acronym>PDF</acronym> viewer
+for <acronym>GNOME</acronym>. It is based on <application>Xpdf</application> and the
+<application><acronym>GNOME</acronym> Print</application> Preview
+widget.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gpdf-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gpdf-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gpdf-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gpdf-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gpdf-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>GPdf</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeprintui"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="pst-typesetting-tex"/> and
+<ulink url="http://packages.qa.debian.org/libp/libpaper.html">libpaper</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>GPdf</application></title>
+
+<para>Install <application>GPdf</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>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>GPdf</application> package contains
+<command>gpdf</command> and
+<command>gnome-pdf-viewer</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gpdf</title>
+<para><command>gpdf</command> is a <acronym>PDF</acronym> viewer for
+<acronym>GNOME</acronym>.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gtkhtml.xml
===================================================================
--- gnome/add/gtkhtml.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gtkhtml.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,9 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gtkhtml-download-http "http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.0/gtkhtml-&gtkhtml-version;.tar.bz2">
+<!ENTITY gtkhtml-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.0/gtkhtml-&gtkhtml-version;.tar.bz2">
+<!ENTITY gtkhtml-size "1.2 MB">
+<!ENTITY gtkhtml-buildsize "133 MB">
+<!ENTITY gtkhtml-time "1.84 SBU">
+
+]>
+
 <sect1 id="gtkhtml" xreflabel="GtkHTML-&gtkhtml-version;">
 <?dbhtml filename="gtkhtml.html"?>
 <title>GtkHTML-&gtkhtml-version;</title>
 
-&gtkhtml-intro;
-&gtkhtml-inst;
-&gtkhtml-desc;
+<sect2>
+<title>Introduction to <application>GtkHTML</application></title>
+
+<para>The <application>GtkHTML</application> package contains a
+lightweight <acronym>HTML</acronym> rendering/printing/editing engine.
+This is an <application>evolution</application> specific application at
+this time.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&gtkhtml-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&gtkhtml-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gtkhtml-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &gtkhtml-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &gtkhtml-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>GtkHTML</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="gal"/> and
+<xref linkend="libgnomeprintui"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libsoup"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>GtkHTML</application></title>
+
+<para>Install <application>GtkHTML</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 &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>GtkHTML</application> package contains <filename
+class="libraryfile">
+libgtkhtml-3.0</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgtkhtml-3.0 libraries</title>
+<para><filename class="libraryfile">libgtkhtml-3.0</filename> libraries provide the functions to
+render <acronym>HTML</acronym> within applications.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gtksourceview.xml
===================================================================
--- gnome/add/gtksourceview.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gtksourceview.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,9 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gtksourceview-download-http "http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.0/gtksourceview-&gtksourceview-version;.tar.bz2">
+<!ENTITY gtksourceview-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.0/gtksourceview-&gtksourceview-version;.tar.bz2">
+<!ENTITY gtksourceview-size "642 KB">
+<!ENTITY gtksourceview-buildsize "13 MB">
+<!ENTITY gtksourceview-time "0.10 SBU">
+
+]>
+
 <sect1 id="gtksourceview" xreflabel="gtksourceview-&gtksourceview-version;">
 <?dbhtml filename="gtksourceview.html"?>
 <title>gtksourceview-&gtksourceview-version;</title>
 
-&gtksourceview-intro;
-&gtksourceview-inst;
-&gtksourceview-desc;
+<sect2>
+<title>Introduction to <application>gtksourceview</application></title>
+
+<para>The <application>gtksourceview</application> package contains
+<filename>libgtksourceview</filename> libraries. This is useful for
+extending the gtk text functions to include syntax highlighting.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&gtksourceview-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&gtksourceview-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gtksourceview-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &gtksourceview-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &gtksourceview-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>gtksourceview</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>
+
+<sect2>
+<title>Installation of <application>gtksourceview</application></title>
+
+<para>Install <application>gtksourceview</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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>gtksourceview</application> package contains
+<filename>libgtksourceview</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgtksourceview libraries</title>
+<para><filename>libgtksourceview</filename> libraries contain function
+extensions for the GtkTextView widget.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/gucharmap.xml
===================================================================
--- gnome/add/gucharmap.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/gucharmap.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,100 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY gucharmap-download-http "http://ftp.gnome.org/pub/GNOME/sources/gucharmap/1.4/gucharmap-&gucharmap-version;.tar.bz2">
+<!ENTITY gucharmap-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gucharmap/1.4/gucharmap-&gucharmap-version;.tar.bz2">
+<!ENTITY gucharmap-size "1.5 MB">
+<!ENTITY gucharmap-buildsize "23 MB">
+<!ENTITY gucharmap-time "0.24 SBU">
+
+]>
+
 <sect1 id="gucharmap" xreflabel="gucharmap-&gucharmap-version;">
 <?dbhtml filename="gucharmap.html"?>
 <title>gucharmap-&gucharmap-version;</title>
 
-&gucharmap-intro;
-&gucharmap-inst;
-&gucharmap-exp;
-&gucharmap-desc;
+<sect2>
+<title>Introduction to <application>gucharmap</application></title>
+
+<para>
+<application>gucharmap</application> is a Unicode character map and font
+viewer. It allows you to browse through all the available Unicode
+characters and categories for the installed fonts, and to examine their
+detailed properties. It is an easy way to find the character you might
+only know by its Unicode name or code point.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gucharmap-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gucharmap-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gucharmap-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gucharmap-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gucharmap-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>gucharmap</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="intltool"/>,
+<xref linkend="popt"/> and
+<xref linkend="GTK2"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libgnomeui"/> and
+<xref linkend="scrollkeeper"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>gucharmap</application></title>
+
+<para>Install <application>gucharmap</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>gucharmap</application> package contains
+<command>charmap</command>,
+<command>gnome-character-map</command>,
+<command>gucharmap</command> and
+<filename class="libraryfile">libgucharmap</filename>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gucharmap</title>
+<para><command>gucharmap</command> is a Unicode character map and font
+viewer.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/libgnomeprint.xml
===================================================================
--- gnome/add/libgnomeprint.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/libgnomeprint.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY libgnomeprint-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.6/libgnomeprint-&libgnomeprint-version;.tar.bz2">
+<!ENTITY libgnomeprint-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.6/libgnomeprint-&libgnomeprint-version;.tar.bz2">
+<!ENTITY libgnomeprint-size "684 KB">
+<!ENTITY libgnomeprint-buildsize "27 MB">
+<!ENTITY libgnomeprint-time "0.64 SBU">
+
+]>
+
 <sect1 id="libgnomeprint" xreflabel="libgnomeprint-&libgnomeprint-version;">
 <?dbhtml filename="libgnomeprint.html"?>
 <title>libgnomeprint-&libgnomeprint-version;</title>
 
-&libgnomeprint-intro;
-&libgnomeprint-inst;
-&libgnomeprint-exp;
-&libgnomeprint-desc;
+<sect2>
+<title>Introduction to <application>libgnomeprint</application></title>
+
+<para>The <application>libgnomeprint</application> package contains
+<filename class="libraryfile">libgnomeprint</filename> libraries.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libgnomeprint-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libgnomeprint-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libgnomeprint-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libgnomeprint-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libgnomeprint-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libgnomeprint</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="Pango"/>,
+<xref linkend="libart_lgpl"/>,
+<xref linkend="fontconfig"/> and
+<xref linkend="libxml2"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="cups"/>,
+<xref linkend="gtk-doc"/> and
+<ulink url="http://sources.redhat.com/docbook-tools/">docbook-utils</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>libgnomeprint</application></title>
+
+<para>Install <application>libgnomeprint</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<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><option>--disable-gtk-doc</option>: This switch prevents
+rebuilding the documentation during the <command>make</command> command.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libgnomeprint</application> package contains
+<filename class="libraryfile">libgnomeprint</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgnomeprint libraries</title>
+<para><filename class="libraryfile">libgnomeprint</filename> libraries
+implement the <application><acronym>GNOME</acronym></application> Printing Architecture.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/libgnomeprintui.xml
===================================================================
--- gnome/add/libgnomeprintui.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/libgnomeprintui.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY libgnomeprintui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.6/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
+<!ENTITY libgnomeprintui-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.6/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
+<!ENTITY libgnomeprintui-size "550 KB">
+<!ENTITY libgnomeprintui-buildsize "31 MB">
+<!ENTITY libgnomeprintui-time "0.29 SBU">
+
+]>
+
 <sect1 id="libgnomeprintui" xreflabel="libgnomeprintui-&libgnomeprintui-version;">
 <?dbhtml filename="libgnomeprintui.html"?>
 <title>libgnomeprintui-&libgnomeprintui-version;</title>
 
-&libgnomeprintui-intro;
-&libgnomeprintui-inst;
-&libgnomeprintui-exp;
-&libgnomeprintui-desc;
+<sect2>
+<title>Introduction to <application>libgnomeprintui</application></title>
+
+<para>The <application>libgnomeprintui</application> package contains
+the <filename class="libraryfile">libgnomeprintui</filename>
+libraries.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libgnomeprintui-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libgnomeprintui-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libgnomeprintui-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libgnomeprintui-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libgnomeprintui-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libgnomeprintui</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="libgnomeui"/>,
+<xref linkend="gnome-icon-theme"/> and
+<xref linkend="libgnomeprint"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="gtk-doc"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>libgnomeprintui</application></title>
+
+<para>Install <application>libgnomeprintui</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --disable-gtk-doc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>--disable-gtk-doc</option>: This switch prevents
+rebuilding the documentation during the <command>make</command> command.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libgnomeprintui</application> package contains
+<filename class="libraryfile">libgnomeprintui</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgnomeprintui libraries</title>
+<para><filename class="libraryfile">libgnomeprintui</filename> libraries are the
+<acronym>GUI</acronym> portion of the implementation
+of the <application><acronym>GNOME</acronym></application> Printing Architecture.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/libgtkhtml.xml
===================================================================
--- gnome/add/libgtkhtml.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/libgtkhtml.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,9 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY libgtkhtml-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.6/libgtkhtml-&libgtkhtml-version;.tar.bz2">
+<!ENTITY libgtkhtml-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.6/libgtkhtml-&libgtkhtml-version;.tar.bz2">
+<!ENTITY libgtkhtml-size "417 KB">
+<!ENTITY libgtkhtml-buildsize "147 MB">
+<!ENTITY libgtkhtml-time "1.40 SBU">
+
+]>
+
 <sect1 id="libgtkhtml" xreflabel="libgtkhtml-&libgtkhtml-version;">
 <?dbhtml filename="libgtkhtml.html"?>
 <title>libgtkhtml-&libgtkhtml-version;</title>
 
-&libgtkhtml-intro;
-&libgtkhtml-inst;
-&libgtkhtml-desc;
+<sect2>
+<title>Introduction to <application>libgtkhtml</application></title>
+
+<para>The <application>libgtkhtml</application> package contains
+<filename class="libraryfile">libgtkhtml-2</filename> libraries.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libgtkhtml-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libgtkhtml-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libgtkhtml-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libgtkhtml-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libgtkhtml-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libgtkhtml</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="gail"/> and <xref linkend="gnome-vfs"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>libgtkhtml</application></title>
+
+<para>Install <application>libgtkhtml</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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libgtkhtml</application> package contains
+<filename class="libraryfile">libgtkhtml-2</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgtkhtml-2 libraries</title>
+<para><filename class="libraryfile">libgtkhtml-2</filename> libraries provide the functions necessary to render
+and/or edit <acronym>HTML</acronym>.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/nautilus-cd-burner.xml
===================================================================
--- gnome/add/nautilus-cd-burner.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/nautilus-cd-burner.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,101 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY nautilus-cd-burner-download-http "http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.6/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
+<!ENTITY nautilus-cd-burner-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.6/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
+<!ENTITY nautilus-cd-burner-size "446 KB">
+<!ENTITY nautilus-cd-burner-buildsize "6.2 MB">
+<!ENTITY nautilus-cd-burner-time "0.14 SBU">
+
+]>
+
 <sect1 id="nautilus-cd-burner" xreflabel="Nautilus CD Burner-&nautilus-cd-burner-version;">
 <?dbhtml filename="nautilus-cd-burner.html"?>
 <title>Nautilus CD Burner-&nautilus-cd-burner-version;</title>
 
-&nautilus-cd-burner-intro;
-&nautilus-cd-burner-inst;
-&nautilus-cd-burner-exp;
-&nautilus-cd-burner-desc;
+<sect2>
+<title>Introduction to <application>Nautilus CD Burner</application></title>
+
+<para>
+The <application>Nautilus CD Burner</application> lets you write files to
+a CD burner easily with <acronym>GNOME</acronym>; by drag-and-dropping
+files using the <acronym>GNOME</acronym> file manager,
+<application>Nautilus</application>.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&nautilus-cd-burner-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&nautilus-cd-burner-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &nautilus-cd-burner-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&nautilus-cd-burner-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&nautilus-cd-burner-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>Nautilus CD Burner</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="nautilus"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Nautilus CD Burner</application></title>
+
+<para>Install <application>Nautilus CD Burner</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 &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<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>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Nautilus CD Burner</application> package contains
+<command>nautilus-cd-burner</command> and
+<command>mapping-daemon</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>nautilus-cd-burner</title>
+<para><command>nautilus-cd-burner</command> is an extension to Nautilus
+that lets you burn CDs easily.</para></sect3>
+
+<sect3><title>mapping-daemon</title>
+<para><command>mapping-daemon</command> is the central daemon which
+keeps track of file mappings.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/nautilus-media.xml
===================================================================
--- gnome/add/nautilus-media.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/nautilus-media.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY nautilus-media-download-http "http://ftp.gnome.org/pub/GNOME/sources/nautilus-media/0.8/nautilus-media-&nautilus-media-version;.tar.bz2">
+<!ENTITY nautilus-media-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus-media/0.8/nautilus-media-&nautilus-media-version;.tar.bz2">
+<!ENTITY nautilus-media-size "404 KB">
+<!ENTITY nautilus-media-buildsize "15 MB">
+<!ENTITY nautilus-media-time "0.22 SBU">
+
+]>
+
 <sect1 id="nautilus-media" xreflabel="Nautilus Media-&nautilus-media-version;">
 <?dbhtml filename="nautilus-media.html"?>
 <title>Nautilus Media-&nautilus-media-version;</title>
 
-&nautilus-media-intro;
-&nautilus-media-inst;
-&nautilus-media-exp;
-&nautilus-media-desc;
+<sect2>
+<title>Introduction to <application>Nautilus Media</application></title>
+
+<para>The <application>Nautilus Media</application> package contains GNOME's media applications
+used by <command>nautilus</command>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&nautilus-media-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&nautilus-media-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &nautilus-media-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&nautilus-media-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&nautilus-media-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>Nautilus Media</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="gstreamer"/> and
+<xref linkend="nautilus"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Nautilus Media</application></title>
+
+<para>Install <application>Nautilus 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>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Nautilus Media</application> package contains
+<command>nautilus-audio-view</command> and support libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>nautilus-audio-view</title>
+<para><command>nautilus-audio-view</command> displays a directory as audio tracks.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/yelp.xml
===================================================================
--- gnome/add/yelp.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/yelp.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY yelp-download-http "http://ftp.gnome.org/pub/GNOME/sources/yelp/2.6/yelp-&yelp-version;.tar.bz2">
+<!ENTITY yelp-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.6/yelp-&yelp-version;.tar.bz2">
+<!ENTITY yelp-size "504 KB">
+<!ENTITY yelp-buildsize "12 MB">
+<!ENTITY yelp-time "0.16 SBU">
+
+]>
+
 <sect1 id="yelp" xreflabel="Yelp-&yelp-version;">
 <?dbhtml filename="yelp.html"?>
 <title>Yelp-&yelp-version;</title>
 
-&yelp-intro;
-&yelp-inst;
-&yelp-exp;
-&yelp-desc;
+<sect2>
+<title>Introduction to <application>Yelp</application></title>
+
+<para>The <application>Yelp</application> package contains the help browser. This is useful for
+viewing help files.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&yelp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&yelp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &yelp-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&yelp-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&yelp-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>Yelp</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnomeui"/> and <xref linkend="libgtkhtml"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Yelp</application></title>
+
+<para>Install <application>Yelp</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 &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<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>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Yelp</application> package contains <command>yelp</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>yelp</title>
+<para><command>yelp</command> is the
+<application><acronym>GNOME</acronym></application> help browser.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/add/zenity.xml
===================================================================
--- gnome/add/zenity.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/add/zenity.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -1,10 +1,100 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY zenity-download-http "http://ftp.gnome.org/pub/GNOME/sources/zenity/2.6/zenity-&zenity-version;.tar.bz2">
+<!ENTITY zenity-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/zenity/2.6/zenity-&zenity-version;.tar.bz2">
+<!ENTITY zenity-size "610 KB">
+<!ENTITY zenity-buildsize "6.9 MB">
+<!ENTITY zenity-time "0.08 SBU">
+
+]>
+
 <sect1 id="zenity" xreflabel="Zenity-&zenity-version;">
 <?dbhtml filename="zenity.html"?>
 <title>Zenity-&zenity-version;</title>
 
-&zenity-intro;
-&zenity-inst;
-&zenity-exp;
-&zenity-desc;
+<sect2>
+<title>Introduction to <application>Zenity</application></title>
+
+<para>
+<application>Zenity</application> is a rewrite of
+<application>gdialog</application>, the <acronym>GNOME</acronym> port of
+<application>dialog</application> which allows you to display
+<application><acronym>GTK</acronym>+</application> dialog boxes from the
+command line and shell scripts.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&zenity-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&zenity-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &zenity-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&zenity-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&zenity-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>Zenity</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="intltool"/>,
+<xref linkend="popt"/>,
+<xref linkend="libgnomecanvas"/> and
+<xref linkend="scrollkeeper"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Zenity</application></title>
+
+<para>Install <application>Zenity</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>
+
+<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>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Zenity</application> package contains
+<command>gdialog</command> and
+<command>zenity</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gdialog</title>
+<para><command>gdialog</command> is a wrapper script which can be used
+with legacy scripts.</para></sect3>
+
+<sect3><title>zenity</title>
+<para><command>zenity</command> is a program that will display
+<application><acronym>GTK</acronym>+</application> dialogs, and return
+the user's input.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: gnome/gnome.xml
===================================================================
--- gnome/gnome.xml	(revision c117e5abfa19f8fad9706fd3d743f6bbeef88853)
+++ gnome/gnome.xml	(revision 9d2dc4e2f50f4592dfcf64bec27b0f2b0add6971)
@@ -5,5 +5,6 @@
 &gnome-intro;
 &gnome-core;
-&gnome-add;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome/add/add.xml"/>
+<!-- &gnome-add; -->
 &gnome-otherlibs;
 
