Index: gnome/add/gnome-keyring-manager.xml
===================================================================
--- gnome/add/gnome-keyring-manager.xml	(revision b1a35fa51ac6e2c0e30a76f56808f62f265dea88)
+++ gnome/add/gnome-keyring-manager.xml	(revision 1dc4739415743ae5ae22a2f38fba7b80f29d6127)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-keyring-manager-download-http "&gnome-download-http;/gnome-keyring-manager/&gnome-version;/gnome-keyring-manager-&gnome-keyring-manager-version;.tar.bz2">
   <!ENTITY gnome-keyring-manager-download-ftp  "&gnome-download-ftp;/gnome-keyring-manager/&gnome-version;/gnome-keyring-manager-&gnome-keyring-manager-version;.tar.bz2">
-  <!ENTITY gnome-keyring-manager-md5sum        "0a588c64839390e0c6e07250b509a86a">
-  <!ENTITY gnome-keyring-manager-size          "380 KB">
-  <!ENTITY gnome-keyring-manager-buildsize     "6.6 MB">
+  <!ENTITY gnome-keyring-manager-md5sum        "d4e38c7b7da99885fa898917e10d8aeb">
+  <!ENTITY gnome-keyring-manager-size          "391 KB">
+  <!ENTITY gnome-keyring-manager-buildsize     "6.7 MB">
   <!ENTITY gnome-keyring-manager-time          "0.1 SBU">
 ]>
@@ -20,8 +20,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-keyring-manager-&gnome-keyring-manager-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-keyring-manager</keyword>
-    </keywordset>
   </sect1info>
 
@@ -67,4 +63,7 @@
     <xref linkend="gnome-doc-utils"/></para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="intltool"/></para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gnome-keyring-manager"/></para>
@@ -78,7 +77,9 @@
     the following 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 \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -94,12 +95,15 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
 
-    <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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-mandir.xml"/>
 
   </sect2>
@@ -116,6 +120,6 @@
         <seg>gnome-keyring-manager</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnome-keyring-manager
-        and $GNOME_PREFIX/share/{,gnome/help/ ,omf/}gnome-keyring-manager</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/{,gnome/help/
+        ,omf/}gnome-keyring-manager</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/add/zenity.xml
===================================================================
--- gnome/add/zenity.xml	(revision b1a35fa51ac6e2c0e30a76f56808f62f265dea88)
+++ gnome/add/zenity.xml	(revision 1dc4739415743ae5ae22a2f38fba7b80f29d6127)
@@ -7,8 +7,8 @@
   <!ENTITY zenity-download-http "&gnome-download-http;/zenity/&gnome-version;/zenity-&zenity-version;.tar.bz2">
   <!ENTITY zenity-download-ftp  "&gnome-download-ftp;/zenity/&gnome-version;/zenity-&zenity-version;.tar.bz2">
-  <!ENTITY zenity-md5sum        "d8fbcf326e42b5dae70a570fad024947">
-  <!ENTITY zenity-size          "896 KB">
-  <!ENTITY zenity-buildsize     "7.4 MB">
-  <!ENTITY zenity-time          "less than 0.1 SBU">
+  <!ENTITY zenity-md5sum        "35fe28593effb339e0a6b152eb8050bf">
+  <!ENTITY zenity-size          "1.0 MB">
+  <!ENTITY zenity-buildsize     "8.4 MB">
+  <!ENTITY zenity-time          "0.1 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">zenity-&zenity-version;.tar</keyword>
-      <keyword role="ftpdir">zenity</keyword>
-    </keywordset>
   </sect1info>
 
@@ -68,4 +64,7 @@
     <xref linkend="gnome-doc-utils"/></para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="intltool"/></para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/zenity"/></para>
@@ -79,6 +78,8 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --localstatedir=/var/lib &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --localstatedir=/var/lib \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -94,8 +95,12 @@
     <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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-mandir.xml"/>
 
   </sect2>
@@ -112,5 +117,6 @@
         <seg>gdialog and zenity</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/{,gnome/help/, omf/}zenity</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/{,gnome/help/
+        ,omf/}zenity</seg>
       </seglistitem>
     </segmentedlist>
