[gnome-user-docs] Review dconf custom defaults page, bug 694523

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 89a5c820311cceb61445570a523b40ce4feb09af
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date:   Wed May 15 20:55:18 2013 +0100

    Review dconf custom defaults page, bug 694523
    
    Link add seealso to dconf-lockdown because that is the next logical step
    after setting defaults. Remove seealso to backgrounds-extra because that
    is only one example of how to use the defaults.
    
    Update revision status to review because the page is ready for review.
    
    Improve wording, markup and indentation. Don't mention site.d because
    this needs a page for itself or mention on a dconf landing page (TODO).
    Remove external link as all the notes from that link should be covered
    in the help and most already are.

 system-admin-guide/C/dconf-custom-defaults.page |  130 ++++++++++++-----------
 1 files changed, 66 insertions(+), 64 deletions(-)
---
diff --git a/system-admin-guide/C/dconf-custom-defaults.page b/system-admin-guide/C/dconf-custom-defaults.page
index a72c814..d5f0f82 100644
--- a/system-admin-guide/C/dconf-custom-defaults.page
+++ b/system-admin-guide/C/dconf-custom-defaults.page
@@ -5,9 +5,11 @@
 
   <info>
     <link type="guide" xref="index" group="user" />
-    <link type="seealso" xref="backgrounds-extra" />
     <link type="seealso" xref="dconf-profiles" />
+    <link type="seealso" xref="dconf-lockdown" />
+
     <revision pkgversion="3.6" version="0.1" date="2012-05-21" status="draft"/>
+    <revision pkgversion="3.8" date="2013-05-15" status="review"/>
 
     <credit type="author copyright">
       <name>Ryan Lortie</name>
@@ -29,77 +31,77 @@
       <email its:translate="no">jana svarova gmail com</email>
       <years>2013</years>
     </credit>
+    <credit type="copyright editor">
+      <name>Ekaterina Gerasimova</name>
+      <email its:translate="no">kittykat3756 gmail com</email>
+      <years>2013</years>
+    </credit>
 
-    <desc>Set system-wide default values using dconf's key file directories</desc>
+    <desc>Set system-wide default settings using <sys its:translate="no">dconf</sys> profiles.</desc>
 
   </info>
 
   <title>Custom default values for system settings</title>
 
-  <p>System-wide default values can be set using dconf's <em>key file
-  directories</em>. Key files contain <em>groups</em> and <em>key-value
-  pairs</em>.</p>
-
-  <p>To demonstrate how dconf key files can be used to set default values,
-  we'll look at how to use them to set a default wallpaper.</p>
-
-<comment><p>You don't have to use "local" as the profile name. You can even have
-different profiles for different users. This isn't mentioned because this
-functionality needs something like accountsservice integration to enforce this.
-gnome-control-center integration would be great too.</p></comment>
-
-<example>
-<list type="numbered">
-  <title>Set the default wallpaper</title>
-  <item><p>Create a directory named
-     <file>/etc/dconf/db/local.d/</file></p></item>
-  <item><p>From within the <file>profile</file> directory, create and edit a
-  file named <file>user</file>.</p>
-<code>
-user-db:user
-system-db:local
-</code></item>
-
-  <item><p>Navigate to the <file>/etc/dconf/db/local.d/</file> directory. If
-  this directory doesn't exist, you will need to create it.</p>
-  </item>
-  <item><p>In the <file>local.d</file> directory, create and edit a
-  key file named <file>00_default-wallpaper</file>.</p>
-<code>
-#this portion of the key file identifies the dconf group
+  <p>System-wide default settings can be set by providing a default for a key
+  in a <sys its:translate="no">dconf</sys> profile. These defaults can be
+  overridden by the user.</p>
+
+<section id="example">
+  <title>Set a default value</title>
+
+  <p>To set a default for a key, the <sys>user</sys> profile must exist and the
+  value for the key must be added to a <sys its:translate="no">dconf</sys>
+  database.</p>
+
+  <comment>
+    <cite date="2012-08-14">Jeremy Bicha</cite>
+    <p>You don't have to use "local" as the profile name. You can even have
+    different profiles for different users. This isn't mentioned because this
+    functionality needs something like accountsservice integration to enforce
+    this. gnome-control-center integration would be great too.</p>
+  </comment>
+
+  <steps>
+    <title>An example demonstrating how to set the default background</title>
+    <item>
+      <p>Create the <file its:translate="no">user</file> profile:</p>
+      <listing its:translate="no">
+        <title><file>/etc/dconf/profile/user</file></title>
+        <code>user-db:user
+system-db:local</code>
+      </listing>
+      <p><input its:translate="no">local</input> is the name of a
+      <sys its:translate="no">dconf</sys> database.</p>
+    </item>
+    <item>
+      <p>Create a <em>key file</em> for the
+      <input its:translate="no">local</input> database which contains the
+      default settings:</p>
+      <listing its:translate="no">
+        <title><file>/etc/dconf/db/local.d/01-background</file></title>
+<code># <span its:translate="yes">dconf path</span>
 [org/gnome/desktop/background]
-#these are the individual key-value pairs that are relevant to the key file group
-picture-uri='file:///usr/local/share/backgrounds/company-wallpaper.jpg'
+
+# <span its:translate="yes">dconf key names and their corresponding values</span>
+picture-uri='file:///usr/local/share/backgrounds/wallpaper.jpg'
 picture-options='scaled'
 primary-color='000000'
-secondary-color='000000'
-</code>
-</item>
-<item>
-<p>Update the system databases</p>
-<screen> <output style="prompt"># </output>
-<input>dconf update</input> </screen>
-</item>
-</list>
-</example>
-
-  <p>It is good to know that the <file>/etc/dconf/db/site.d/</file> file is
-  an alternative for site-wide settings.</p>
-
-<note>
-  <p>The first time you create a dconf user profile, you'll need to log out
-    and log in to apply the new profile.</p>
-</note>
-
-
-<note>
-  <p>
-  You can include multiple sets of groups and key-value pairs in each key
-  file, or you can use a separate key file for each group.</p>
-</note>
-
-  <p>For more in-depth information, see the
-  <link href="https://live.gnome.org/dconf/SystemAdministrators";>
-  gnome.org</link> website.</p>
+secondary-color='FFFFFF'</code>
+      </listing>
+    </item>
+    <item>
+      <p>Run <input its:translate="no">dconf update</input> to update the
+      <sys its:translate="no">dconf</sys> databases.</p>
+    </item>
+  </steps>
+
+  <note>
+    <p>When the <sys its:translate="no">user</sys> profile is created or
+    changed, the user will need to log out and log in again before the changes
+    will be applied.</p>
+  </note>
+
+</section>
 
 </page>