Index: gnome/core/gnome-screensaver.xml
===================================================================
--- gnome/core/gnome-screensaver.xml	(revision 63310febe3eee3c16da32781da60622b7374ade3)
+++ gnome/core/gnome-screensaver.xml	(revision 0b1bae8e74ad95e4a4be4725bae6732f0d275c6a)
@@ -5,7 +5,9 @@
   %general-entities;
 
-  <!ENTITY gnome-screensaver-download-http "&gnome-download-http;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.xz">
-  <!ENTITY gnome-screensaver-download-ftp  "&gnome-download-ftp;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.xz">
-  <!ENTITY gnome-screensaver-md5sum        "53fdcff388fadbc788571724874d5ab6">
+  <!ENTITY gnome-screensaver-download-http 
+           "&gnome-download-http;/gnome-screensaver/3.4/gnome-screensaver-&gnome-screensaver-version;.tar.xz">
+  <!ENTITY gnome-screensaver-download-ftp  
+           "&gnome-download-ftp;/gnome-screensaver/3.4/gnome-screensaver-&gnome-screensaver-version;.tar.xz">
+  <!ENTITY gnome-screensaver-md5sum        "d9349c92ea179e2948cb2ede9e751d5a">
   <!ENTITY gnome-screensaver-size          "553 KB">
   <!ENTITY gnome-screensaver-buildsize     "13 MB">
@@ -36,5 +38,5 @@
     convenient user switching.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -63,15 +65,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-desktop"/>,
-    <xref linkend="gnome-menus"/>, and
-    <xref linkend="linux-pam"/></para>
+    <para role="required">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="gnome-desktop"/> and
+      <xref linkend="linux-pam"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libgnomekbd"/>,
-    <xref linkend="libnotify"/>, and
-    <!--<xref linkend="xscreensaver"/>
-    (and <xref linkend="libxslt"/>),-->
-    <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>
-    <!--<xref linkend="xmlto"/>--></para>
+    <para role="optional">
+      <xref linkend="libgnomekbd"/>,
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -83,57 +84,14 @@
     <title>Installation of gnome-screensaver</title>
 
-    <!-- for 3.2, the script to import the hacks is not present
-    <note>
-      <para><emphasis>Optional Features</emphasis></para>
-
-      <para>If you have <application>XScreenSaver</application> installed and
-      wish to import any or all of the <quote>hacks</quote> into
-      <application>gnome-screensaver</application> themes, set the following
-      environment variable (modify it if <application>XScreenSaver</application>
-      is installed in a non-standard location):</para>
-
-<screen><userinput>XSAVERDIR=/usr/share/xscreensaver/config</userinput></screen>
-
-    <para>Also add the following parameter to the <command>configure</command>
-    script below:</para>
-
-<screen><userinput>            \-\-with-xscreensaverdir=$XSAVERDIR</userinput></screen>
-    </note> -->
-
     <para>Install <application>gnome-screensaver</application> by running the
     following commands:</para>
 
 <screen><userinput>sed -i 's|etc/pam\.d"|etc"|' data/Makefile.in &amp;&amp;
-./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR \
-            --libexecdir=$GNOME_PREFIX/lib/gnome-screensaver \
+./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/gnome-screensaver \
             --with-pam-prefix=/etc &amp;&amp;
 make</userinput></screen>
 
-    <!--
-    <para>If you have <application>XScreenSaver</application> installed and
-    wish to import any or all of the <quote>hacks</quote> into
-    <application>gnome-screensaver</application> themes, you'll need to
-    identify which <quote>hacks</quote> you wish to import. The commands
-    below will import all of them. If you want to import less than all of
-    them, modify the setting of the <envar>XSAVERLIST</envar> environment
-    variable below (listing the desired hacks by filename without the
-    extension, space delimited) and issue the following commands:</para>
-
-<screen><userinput>mkdir xscreensavers &amp;&amp;
-cd xscreensavers &amp;&amp;
-
-XSAVERLIST="*" &amp;&amp;
-
-for SAVERLIST in $(ls ${XSAVERDIR}/${XSAVERLIST}.xml); do
-    ../data/migrate-xscreensaver-config.sh $SAVERLIST
-done &amp;&amp;
-
-unset XSAVERDIR
-unset XSAVERLIST
-unset SAVERLIST
-
-cd ..</userinput></screen> -->
-
     <para>This package does not come with a test suite.</para>
 
@@ -141,26 +99,4 @@
 
 <screen role='root'><userinput>make install</userinput></screen>
-
-     <!-- in 3.2, gnome-screensaver.html is commented out in the doc/Makefile
-    <para>If you have <application>xmlto</application> installed, still as the
-    <systemitem class='username'>root</systemitem> user issuing the following
-    commands:</para>
-
-<screen role='root'><userinput>GNOMEDOCDIR="$GNOME_PREFIX/share/doc/gnome-screensaver-&gnome-screensaver-version;" &amp;&amp;
-
-install -v -m644 -D doc/gnome-screensaver.html \
-                    ${GNOMEDOCDIR}/gnome-screensaver.html &amp;&amp;
-unset GNOMEDOCDIR</userinput></screen>-->
-
-    <!--
-    <para>If you identified some, or all,
-    <application>XScreenSaver</application> hacks to be imported into
-    <application>gnome-screensaver</application>, install them by issuing the
-    following commands as the <systemitem class='username'>root</systemitem>
-    user:</para>
-
-<screen role='root'><userinput>install -v -m755 -d $GNOME_PREFIX/share/applications/screensavers/xscreensaver &amp;&amp;
-install -v -m644 xscreensavers/*.desktop \
-        $GNOME_PREFIX/share/applications/screensavers/xscreensaver</userinput></screen>-->
 
   </sect2>
@@ -173,15 +109,15 @@
     configuration file is not displayed.</para>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/gnome-screensaver</parameter>:
+    href="../../xincludes/gnome-sysconfdir.xml"/> -->
+
+    <para><parameter>--libexecdir=/usr/lib/gnome-screensaver</parameter>:
     This parameter causes the libexec files to be installed in the preferred
     location of <filename
-    class="directory">$GNOME_PREFIX/lib/gnome-screensaver</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+    class="directory">/usr/lib/gnome-screensaver</filename> instead of
+    <filename class="directory">/usr/libexec</filename>.</para>
 
     <para><parameter>--with-pam-prefix=/etc</parameter>: This parameter is
@@ -190,8 +126,4 @@
     installed in the correct location.</para>
 
-<!--<para><option>\-\-with-xscreensaverdir=$XSAVERDIR</option>: This parameter
-    will use the xscreensaver hack configs found in
-    <envar>$XSAVERDIR</envar>.</para>-->
-
   </sect2>
 
@@ -202,6 +134,5 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/pam.d/gnome-screensaver</filename>,
-      <filename>$GNOME_SYSCONFDIR/gdm/custom.conf</filename></para>
+      <para><filename>/etc/pam.d/gnome-screensaver</filename></para>
 
       <indexterm zone="gnome-screensaver gnome-screensaver-config">
@@ -209,8 +140,4 @@
         /etc/pam.d/gnome-screensaver</primary>
       </indexterm>
-      <indexterm zone="gnome-screensaver gnome-screensaver-config">
-        <primary sortas="etc-gnome-&gnome-version;&gnome-minor-version;gdm-custom.conf">
-        $GNOME_SYSCONFDIR/gdm/custom.conf</primary>
-      </indexterm>
 
     </sect3>
@@ -220,20 +147,7 @@
 
       <sect4>
-        <title>General Configuration</title>
-
-        <para>Most of the <application>gnome-screensaver</application>
-        configuration parameters can be modified using the
-        <guimenuitem>Screensaver</guimenuitem> menu item from the
-        <guimenu>Desktop</guimenu>&mdash;<guisubmenu>Preferences</guisubmenu>
-        drop-down menu.<!-- Some of the fine-tuning parameters are only available
-        using <xref linkend="gconf-editor"/>.--></para>
-
-      </sect4>
-
-      <sect4>
         <title>Linux-PAM Configuration</title>
 
-        <para>The
-        just-installed <filename>gnome-screensaver</filename> configuration
+        <para>The default <filename>gnome-screensaver</filename> configuration
         file does not work with a BLFS system. Replace the existing file with
         one that can be used on a BLFS system by issuing the following command
@@ -241,11 +155,14 @@
 
 <screen role="root"><userinput>cat &gt; /etc/pam.d/gnome-screensaver &lt;&lt; "EOF"
-<literal># File: /etc/pam.d/gnome-screensaver
-
-auth         required      pam_unix.so
-account      required      pam_unix.so
-session      required      pam_unix.so
-password     required      pam_unix.so</literal>
-
+<literal># Begin /etc/pam.d/gnome-screensaver
+
+auth     include        system-auth
+auth     optional       pam_gnome_keyring.so
+
+account  include        system-account
+password include        system-password
+session  include        system-session
+
+# End /etc/pam.d/gnome-screensaver</literal>
 EOF
 chmod -v 644 /etc/pam.d/gnome-screensaver</userinput></screen>
@@ -262,12 +179,13 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>gnome-screensaver, gnome-screensaver-command,
-        gnome-screensaver-dialog</seg>
-        <seg>None</seg>
-        <seg>None</seg>
+        <seg>
+          gnome-screensaver and gnome-screensaver-command
+        </seg>
+        <seg>
+          /usr/lib/gnome-screensaver
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -289,4 +207,15 @@
       </varlistentry>
 
+      <varlistentry id="gnome-screensaver-command">
+        <term><command>gnome-screensaver-command</command></term>
+        <listitem>
+          <para>is a tool for controlling an already
+          running instance of gnome-screensaver.</para>
+          <indexterm zone="gnome-screensaver gnome-screensaver-command">
+            <primary sortas="b-gnome-screensaver-command">gnome-screensaver-command</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
