Index: gnome/add/epiphany.xml
===================================================================
--- gnome/add/epiphany.xml	(revision 294d670b9cb1fec90f92cfe6c1cc63b87909b580)
+++ gnome/add/epiphany.xml	(revision d938f86ed209e8ff54a522febd948f7290dbcbe5)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/1.8/epiphany-&epiphany-version;.tar.bz2">
-  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/1.8/epiphany-&epiphany-version;.tar.bz2">
-  <!ENTITY epiphany-md5sum        "317e18f1d415a37d3b9934c106edf34a">
-  <!ENTITY epiphany-size          "3.3 MB">
-  <!ENTITY epiphany-buildsize     "66.4 MB">
-  <!ENTITY epiphany-time          "1.0 SBU">
+  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
+  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
+  <!ENTITY epiphany-md5sum        "872ef8d5e95cdc359f93b5ded501d98d">
+  <!ENTITY epiphany-size          "3.5 MB">
+  <!ENTITY epiphany-buildsize     "74.9 MB">
+  <!ENTITY epiphany-time          "1.8 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">epiphany-&epiphany-version;.tar</keyword>
-      <keyword role="ftpdir">epiphany</keyword>
-    </keywordset>
   </sect1info>
 
@@ -65,13 +61,16 @@
     <para role="required"><xref linkend="gnome-desktop"/>,
     <xref linkend="libgnomeprintui"/>,
+    <xref linkend="startup-notification"/>,
+    <xref linkend="dbus"/>,
     <xref linkend="which"/>,
     <xref linkend="iso-codes"/>, and
-    <xref linkend="seamonkey"/> or
+    a mozilla.org Gecko layout engine
+    (<xref linkend="seamonkey"/> or
     <xref linkend="firefox"/> or
-    <xref linkend="thunderbird"/></para>
+    <xref linkend="thunderbird"/> or
+    <ulink url="http://www.mozilla.org/products/mozilla1.x/">Mozilla</ulink>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="startup-notification"/>,
-    <xref linkend="dbus"/>,
+    <para role="optional"><xref linkend="intltool"/>,
     <ulink url="&gnome-download-http;/gnome-python/">GNOME-Python</ulink>
     (requires <ulink url="http://www.pygtk.org/">PyGTK</ulink> and can use
@@ -91,7 +90,9 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
+            --localstatedir=/var/lib \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -101,4 +102,15 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+    <para>A <application>D-BUS</application> service script was installed in
+    the previous step. If the <envar>$GNOME_PREFIX</envar> is anything other
+    than <filename class='directory'>/usr</filename>, as the
+    <systemitem class="username">root</systemitem> user you should create a
+    symbolic link to this file in the default
+    <application>D-BUS</application> service script directory:</para>
+
+<screen role="root"><userinput>ln -v -s $(pkg-config --variable=prefix \
+    ORBit-2.0)/share/dbus-1/services/org.gnome.Epiphany.service \
+    /usr/share/dbus-1/services</userinput></screen>
 
     <para>If you have <application>GNOME-Python</application> installed, the
@@ -128,14 +140,4 @@
     <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-    <para><option>--enable-dbus</option>: Use this parameter if you have
-    <application>D-BUS</application> installed and wish to build
-    <application>D-BUS</application> support into the
-    <command>epiphany</command> program.</para>
-
-    <para><option>--enable-zeroconf</option>: Use this parameter if you wish
-    to enable Zeroconf bookmarks support. You must have built GNOME VFS with
-    <ulink url="http://www.porchdogsoft.com/products/howl/">Howl</ulink>
-    support for this option to work properly.</para>
-
   </sect2>
 
@@ -151,7 +153,7 @@
         <seg>epiphany</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/epiphany
-        and the following subdirectories of $GNOME_PREFIX/:
-        include/epiphany-1.8,
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        include/epiphany-2.14,
+        lib/epiphany,
         share/{,gnome/help/, gtk-doc/html/, omf/}epiphany</seg>
       </seglistitem>
Index: gnome/add/gucharmap.xml
===================================================================
--- gnome/add/gucharmap.xml	(revision 294d670b9cb1fec90f92cfe6c1cc63b87909b580)
+++ gnome/add/gucharmap.xml	(revision d938f86ed209e8ff54a522febd948f7290dbcbe5)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY gucharmap-download-http "&gnome-download-http;/gucharmap/1.4/gucharmap-&gucharmap-version;.tar.bz2">
-  <!ENTITY gucharmap-download-ftp  "&gnome-download-ftp;/gucharmap/1.4/gucharmap-&gucharmap-version;.tar.bz2">
-  <!ENTITY gucharmap-md5sum        "c9741329d08908a271864664c3f2e91c">
-  <!ENTITY gucharmap-size          "1.4 MB">
-  <!ENTITY gucharmap-buildsize     "25.1 MB">
+  <!ENTITY gucharmap-download-http "&gnome-download-http;/gucharmap/1.6/gucharmap-&gucharmap-version;.tar.bz2">
+  <!ENTITY gucharmap-download-ftp  "&gnome-download-ftp;/gucharmap/1.6/gucharmap-&gucharmap-version;.tar.bz2">
+  <!ENTITY gucharmap-md5sum        "8af03f350c988d1565922b10776bc725">
+  <!ENTITY gucharmap-size          "2.1 MB">
+  <!ENTITY gucharmap-buildsize     "27.9 MB">
   <!ENTITY gucharmap-time          "0.2 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gucharmap-&gucharmap-version;.tar</keyword>
-      <keyword role="ftpdir">gucharmap</keyword>
-    </keywordset>
   </sect1info>
 
@@ -65,9 +61,11 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/> and
-    <xref linkend="gnome-doc-utils"/></para>
+    <para role="required"><xref linkend="gtk2"/>,
+    <xref linkend="gnome-doc-utils"/>, and
+    <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libgnomeui"/></para>
+    <para role="optional"><xref linkend="libgnomeui"/> and
+    <xref linkend="intltool"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -85,5 +83,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
@@ -120,5 +118,5 @@
         <seg>The following subdirectories $GNOME_PREFIX/:
         include/gucharmap and
-        share/{gnome/help/, omf/}/gucharmap</seg>
+        share/{gnome/help/,omf/}/gucharmap</seg>
       </seglistitem>
     </segmentedlist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 294d670b9cb1fec90f92cfe6c1cc63b87909b580)
+++ introduction/welcome/changelog.xml	(revision d938f86ed209e8ff54a522febd948f7290dbcbe5)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated the Epiphany and gucharmap instructions to
+          conform with the GNOME-2.14.2 update.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated the GNOME2 additional libraries instructions
           to conform with the GNOME-2.14.2 update. This leaves the GNOME2
