[gnome-user-docs] Fix gdm procedures



commit 1a49f4822653a2689bf9f80897e0968e0194ad1d
Author: Petr Kovar <pkovar redhat com>
Date:   Wed Jan 28 19:11:22 2015 +0100

    Fix gdm procedures
    
    Should also fix #737723

 system-admin-guide/C/dconf-snippets.xml         |   11 ++++++-----
 system-admin-guide/C/lockdown-command-line.page |    5 ++++-
 system-admin-guide/C/login-logo.page            |    3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/system-admin-guide/C/dconf-snippets.xml b/system-admin-guide/C/dconf-snippets.xml
index a64fa95..a619417 100644
--- a/system-admin-guide/C/dconf-snippets.xml
+++ b/system-admin-guide/C/dconf-snippets.xml
@@ -8,8 +8,8 @@ To use a step in this file:
        xmlns:its="http://www.w3.org/2005/11/its";>
 
   <item xml:id="dconf-profile-user">
-    <p>Create the <file its:translate="no">user</file> profile if it does not
-    already exist:</p>
+    <p>Create the <file its:translate="no">user</file> profile which contains
+    the following lines:</p>
     <listing its:translate="no">
       <title><file>/etc/dconf/profile/user</file></title>
       <code>user-db:user
@@ -24,12 +24,13 @@ system-db:local</code>
   </item>
 
   <item xml:id="dconf-profile-gdm">
-    <p>Create the <file its:translate="no">gdm</file> profile if it does not
-    already exist:</p>
+    <p>Create the <file its:translate="no">gdm</file> profile which contains the
+    following lines:</p>
     <listing its:translate="no">
       <title><file>/etc/dconf/profile/gdm</file></title>
       <code>user-db:user
-system-db:gdm</code>
+system-db:gdm
+file-db:/$prefix/share/gdm/greeter-dconf-defaults</code>
     </listing>
     <p><input its:translate="no">gdm</input> is the name of a
     <sys its:translate="no" xref="dconf">dconf</sys> database.</p>
diff --git a/system-admin-guide/C/lockdown-command-line.page b/system-admin-guide/C/lockdown-command-line.page
index c4df0d4..a36c315 100644
--- a/system-admin-guide/C/lockdown-command-line.page
+++ b/system-admin-guide/C/lockdown-command-line.page
@@ -54,7 +54,7 @@
 
   <steps>
     <include href="dconf-snippets.xml"
-      xpointer="xpointer(/*/*[ xml:id='dconf-profile-gdm'])"
+      xpointer="xpointer(/*/*[ xml:id='dconf-profile-user'])"
       xmlns="http://www.w3.org/2001/XInclude"/>
     <item>
       <p>Create a <sys>local</sys> database for machine-wide settings in
@@ -74,6 +74,9 @@ disable-command-line=true</code>
     <include href="dconf-snippets.xml"
       xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
       xmlns="http://www.w3.org/2001/XInclude"/>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-logoutin'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
 </section>
 
diff --git a/system-admin-guide/C/login-logo.page b/system-admin-guide/C/login-logo.page
index b750f9e..1b9b003 100644
--- a/system-admin-guide/C/login-logo.page
+++ b/system-admin-guide/C/login-logo.page
@@ -62,6 +62,9 @@
   
   <steps>
   <title>Set the org.gnome.login-screen.logo key</title>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-profile-gdm'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   <item><p>Create a <sys>gdm</sys> database for machine-wide settings in
   <file>/etc/dconf/db/gdm.d/<var>01-logo</var></file>:</p>
   <code>[org/gnome/login-screen]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]