Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
+++ gnome/core/gnome-menus.xml	(revision 0e285e4dda3a2c0462ba0618645e2d26a2571315)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gnome-menus-download-http "&gnome-download-http;/gnome-menus/&gnome-old-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
-  <!ENTITY gnome-menus-download-ftp  "&gnome-download-ftp;/gnome-menus/&gnome-old-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
-  <!ENTITY gnome-menus-md5sum        "e2b97b01b33b9744baf26982a8ad588a">
-  <!ENTITY gnome-menus-size          "437 KB">
+  <!ENTITY gnome-menus-download-http "&gnome-download-http;/gnome-menus/&gnome-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
+  <!ENTITY gnome-menus-download-ftp  "&gnome-download-ftp;/gnome-menus/&gnome-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
+  <!ENTITY gnome-menus-md5sum        "23a7375dd20238184f2fcccc4d83846b">
+  <!ENTITY gnome-menus-size          "429 KB">
   <!ENTITY gnome-menus-buildsize     "8 MB">
-  <!ENTITY gnome-menus-time          "0.2 SBU">
+  <!ENTITY gnome-menus-time          "0.1 SBU">
 ]>
 
@@ -129,5 +129,7 @@
         with colons, if desired):</para>
 
-<screen><literal>export XDG_CONFIG_DIRS=&gnome-etc-dir;/xdg:/etc/xdg</literal></screen>
+<screen role='root'><userinput>cat &gt;&gt; /etc/skel/.bash_profile &lt;&lt; "EOF"
+<literal>export XDG_CONFIG_DIRS=&gnome-etc-dir;/xdg:/etc/xdg</literal>
+EOF</userinput></screen>
 
       </sect4>
@@ -142,5 +144,7 @@
         with colons, if desired):</para>
 
-<screen><literal>export XDG_DATA_DIRS=$GNOME_PREFIX/share:/usr/share</literal></screen>
+<screen role='root'><userinput>cat &gt;&gt; /etc/skel/.bash_profile &lt;&lt; "EOF"
+<literal>export XDG_DATA_DIRS=$GNOME_PREFIX/share:/usr/share</literal>
+EOF</userinput></screen>
 
       </sect4>
@@ -157,8 +161,10 @@
         profile, or in individual user's profiles as shown below:</para>
 
-<screen><literal>export PYTHONPATH=$PYTHONPATH:$(pkg-config --variable=prefix \
+<screen role='root'><userinput>cat &gt;&gt; /etc/skel/.bash_profile &lt;&lt; "EOF"
+<literal>export PYTHONPATH=$PYTHONPATH:$(pkg-config --variable=prefix \
        ORBit-2.0)/lib/python&python-majorver;/site-packages:$(pkg-config \
        --variable=prefix \
-       ORBit-2.0)/lib/python&python-majorver;/site-packages/GMenuSimpleEditor</literal></screen>
+       ORBit-2.0)/lib/python&python-majorver;/site-packages/GMenuSimpleEditor</literal>
+EOF</userinput></screen>
 
       </sect4>
@@ -172,16 +178,15 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gmenu-simple-editor and gnome-menu-spec-test</seg>
-        <seg>libgnome-menu.{so,a}</seg>
-        <seg>&gnome-etc-dir;/xdg and the following subdirectories of
-        <envar>$GNOME_PREFIX</envar>/:
-        include/gnome-menus,
-        lib/python&python-majorver;/site-packages/GMenuSimpleEditor,
-        share/{desktop-directories, gnome-menus}</seg>
+        <seg>gmenu-simple-editor</seg>
+        <seg>libgnome-menu.{so,a} and gmenu.{so,a}</seg>
+        <seg>&gnome-etc-dir;/xdg/menus,
+        <envar>$GNOME_PREFIX</envar>/{include/gnome-menus,
+        share/{desktop-directories,gnome-menus/{examples,glade}},
+        lib/python&python-majorver;/site-packages/GMenuSimpleEditor}</seg>
       </seglistitem>
     </segmentedlist>
@@ -203,15 +208,4 @@
       </varlistentry>
 
-      <varlistentry id="gnome-menu-spec-test">
-        <term><command>gnome-menu-spec-test</command></term>
-        <listitem>
-          <para>is used to test GNOME's implementation of
-          the Desktop Menu Specification.</para>
-          <indexterm zone="gnome-menus gnome-menu-spec-test">
-            <primary sortas="b-gnome-menu-spec-test">gnome-menu-spec-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libgnome-menu">
         <term><filename class='libraryfile'>libgnome-menu.{so,a}</filename></term>
@@ -225,4 +219,14 @@
       </varlistentry>
 
+      <varlistentry id="gmenu">
+        <term><filename class='libraryfile'>gmenu.{so,a}</filename></term>
+        <listitem>
+          <para>is a <application>Python</application> library.</para>
+          <indexterm zone="gnome-menus gmenu">
+            <primary sortas="c-gmenu">gmenu.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
