Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision 3543105b300710a512456cfba56118229c8581b2)
+++ gnome/add/add.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -34,4 +34,6 @@
 &gnome-mag;
 &gnopernicus;
+&gok;
+&epiphany;
 
 &gnome-games;
Index: gnome/add/epiphany/epiphany-desc.xml
===================================================================
--- gnome/add/epiphany/epiphany-desc.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/epiphany/epiphany-desc.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,17 @@
+<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>
Index: gnome/add/epiphany/epiphany-exp.xml
===================================================================
--- gnome/add/epiphany/epiphany-exp.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/epiphany/epiphany-exp.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,13 @@
+<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>
Index: gnome/add/epiphany/epiphany-inst.xml
===================================================================
--- gnome/add/epiphany/epiphany-inst.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/epiphany/epiphany-inst.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,11 @@
+<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>
Index: gnome/add/epiphany/epiphany-intro.xml
===================================================================
--- gnome/add/epiphany/epiphany-intro.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/epiphany/epiphany-intro.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,37 @@
+<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>
Index: gnome/add/epiphany/epiphany.ent
===================================================================
--- gnome/add/epiphany/epiphany.ent	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/epiphany/epiphany.ent	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,11 @@
+<!ENTITY epiphany SYSTEM "../epiphany.xml">
+<!ENTITY epiphany-intro SYSTEM "epiphany-intro.xml">
+<!ENTITY epiphany-inst SYSTEM "epiphany-inst.xml">
+<!ENTITY epiphany-exp SYSTEM "epiphany-exp.xml">
+<!ENTITY epiphany-desc SYSTEM "epiphany-desc.xml">
+<!ENTITY epiphany-version "1.2.5">
+<!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">
Index: gnome/add/gnopernicus/gnopernicus-exp.xml
===================================================================
--- gnome/add/gnopernicus/gnopernicus-exp.xml	(revision 3543105b300710a512456cfba56118229c8581b2)
+++ gnome/add/gnopernicus/gnopernicus-exp.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -1,9 +1,4 @@
 <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
Index: gnome/add/gok.xml
===================================================================
--- gnome/add/gok.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/gok.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,10 @@
+<sect1 id="gok" xreflabel="GOK-&gok-version;">
+<?dbhtml filename="gok.html"?>
+<title>GOK-&gok-version;</title>
+
+&gok-intro;
+&gok-inst;
+&gok-exp;
+&gok-desc;
+
+</sect1>
Index: gnome/add/gok/gok-desc.xml
===================================================================
--- gnome/add/gok/gok-desc.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/gok/gok-desc.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,16 @@
+<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>
Index: gnome/add/gok/gok-exp.xml
===================================================================
--- gnome/add/gok/gok-exp.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/gok/gok-exp.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,13 @@
+<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>
Index: gnome/add/gok/gok-inst.xml
===================================================================
--- gnome/add/gok/gok-inst.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/gok/gok-inst.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,11 @@
+<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>
Index: gnome/add/gok/gok-intro.xml
===================================================================
--- gnome/add/gok/gok-intro.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/gok/gok-intro.xml	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,39 @@
+<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>
Index: gnome/add/gok/gok.ent
===================================================================
--- gnome/add/gok/gok.ent	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
+++ gnome/add/gok/gok.ent	(revision 2bd6f2ba33817ed811d36e4bb74460eb87e71bf4)
@@ -0,0 +1,11 @@
+<!ENTITY gok SYSTEM "../gok.xml">
+<!ENTITY gok-intro SYSTEM "gok-intro.xml">
+<!ENTITY gok-inst SYSTEM "gok-inst.xml">
+<!ENTITY gok-exp SYSTEM "gok-exp.xml">
+<!ENTITY gok-desc SYSTEM "gok-desc.xml">
+<!ENTITY gok-version "0.10.2">
+<!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">
