Add information about PamStack configuration option.

2008-12-10  Brian Cameron  <brian.cameron@sun.com>

        * Add information about PamStack configuration option.

svn path=/branches/gnome-2-20/; revision=6630

2 files changed, 28 insertions, 7 deletions

diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index 0d3ba628..16e0d5cd 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -1765,8 +1765,10 @@ PostSession/
       <para>
         GDM also supports per-display configuration for parameters in the
         &quot;gui&quot;, &quot;greeter&quot; sections of the configuration file
-        Also the security/PamStack key may be customized per-display.
-        Per-display configuration is specified by creating a file named
+        Also the <filename>security/PamStack</filename> and
+        <filename>daemon/LockScreen</filename> keys may be customized
+        per-display.  Per-display configuration is specified by creating a file
+        named
         <filename>&lt;etc&gt;/gdm/custom.conf&lt;display num&gt;</filename>.
         In this file the section and keys to use on this display can be 
         specified.  For example, configuration overrides for display
@@ -2311,6 +2313,21 @@ Greeter=/usr/lib/gdmgreeter
           </varlistentry>
 
           <varlistentry>
+            <term>PamStack</term>
+            <listitem>
+              <synopsis>PamStack=gdm</synopsis>
+              <para>
+                If using PAM, this specifies the PAM service name to use when
+                calling pam_start.  This option may be configured per-display
+                so that GDM can be configured to have a different PAM stack
+                on a given display.  Note that autologin sessions append
+                &quot;-autologin&quot; to this value, so by default autologin
+                sessions use the service name &quot;gdm-autologin&quot;.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
             <term>PostLoginScriptDir</term>
             <listitem>
               <synopsis>PostLoginScriptDir=&lt;etc&gt;/gdm/PostLogin</synopsis>
@@ -6637,20 +6654,20 @@ homogeneous=&quot;bool&quot;&gt;
 &lt;/item&gt;
 </screen>
 
-	<para>
+        <para>
           If no item node has &quot;background&quot; property set, then the
           background is not modified when greeter exits.
-	</para>
+        </para>
 
-	<para>
+        <para>
           To use a different background for login transition than the one 
-	  used for login, the theme should specify two item nodes (which
+          used for login, the theme should specify two item nodes (which
           could contain pixmaps or svg images, for example).  The item
           which corresponds to the greeter background should not have the
           &quot;background&quot; property while the item which corresponds
           to the transition background should have the &quot;background&quot;
           property.  For instance :
-	</para>
+        </para>
 <screen>
 &lt;?xml version="1.0" encoding=&quot;UTF-8&quot;?&gt;
 &lt;!DOCTYPE greeter SYSTEM &quot;greeter.dtd&quot;&gt;
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 4f01298e..20b1d423 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-10  Brian Cameron  <brian.cameron@sun.com>
+
+	* Add information about PamStack configuration option.
+
 2008-06-15  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de/de.po: Added German translation by