GNOME.org
 

[gnome-user-docs] system-admin-guide: XInclude surgery

commit 5808660f2a1419dd09dcae4bec28c2b610a942bc
Author: Shaun McCance <shaunm gnome org>
Date:   Wed Jun 18 14:21:36 2014 -0400

    system-admin-guide: XInclude surgery

 system-admin-guide/C/dconf-custom-defaults.page  |    9 ++----
 system-admin-guide/C/dconf-lockdown.page         |    9 ++----
 system-admin-guide/C/dconf-profile-gdm.xml       |   30 --------------------
 system-admin-guide/C/dconf-profile-user.xml      |   30 --------------------
 system-admin-guide/C/dconf-snippets.xml          |   32 ++++++++++++++++++++++
 system-admin-guide/C/dconf.page                  |    2 +-
 system-admin-guide/C/desktop-background.page     |   11 ++++---
 system-admin-guide/C/extensions-enable.page      |    7 ++---
 system-admin-guide/C/extensions-lockdown.page    |    7 ++---
 system-admin-guide/C/login-banner.page           |   11 +++----
 system-admin-guide/C/login-fingerprint.page      |   11 +++----
 system-admin-guide/C/login-logo.page             |    6 ++--
 system-admin-guide/C/login-userlist-disable.page |   11 +++----
 system-admin-guide/C/logout-automatic.page       |    9 ++----
 system-admin-guide/Makefile.am                   |    3 +-
 15 files changed, 73 insertions(+), 115 deletions(-)
---
diff --git a/system-admin-guide/C/dconf-custom-defaults.page b/system-admin-guide/C/dconf-custom-defaults.page
index a4fb27b..ddb160b 100644
--- a/system-admin-guide/C/dconf-custom-defaults.page
+++ b/system-admin-guide/C/dconf-custom-defaults.page
@@ -89,12 +89,9 @@ primary-color='000000'
 secondary-color='FFFFFF'</code>
       </listing>
     </item>
-    <item>
-      <p>Update the system databases:</p>
-      <screen its:translate="no">
-        <output style="prompt"># </output><input>dconf update</input>
-      </screen>
-    </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
 
   <note>
diff --git a/system-admin-guide/C/dconf-lockdown.page b/system-admin-guide/C/dconf-lockdown.page
index 32e1619..ed5d3f2 100644
--- a/system-admin-guide/C/dconf-lockdown.page
+++ b/system-admin-guide/C/dconf-lockdown.page
@@ -56,12 +56,9 @@
 /org/gnome/desktop/background/secondary-color
 </code>
     </item>
-    <item>
-      <p>Update the system databases:</p>
-      <screen its:translate="no">
-        <output style="prompt"># </output><input>dconf update</input>
-</screen>
-    </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
 
   <note>
diff --git a/system-admin-guide/C/dconf-snippets.xml b/system-admin-guide/C/dconf-snippets.xml
new file mode 100644
index 0000000..6262969
--- /dev/null
+++ b/system-admin-guide/C/dconf-snippets.xml
@@ -0,0 +1,32 @@
+<steps xmlns="http://projectmallard.org/1.0/";
+       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>
+    <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" xref="dconf">dconf</sys> database.</p>
+  </item>
+
+  <item xml:id="dconf-profile-gdm">
+    <p>Create the <file its:translate="no">gdm</file> profile if it does not
+    already exist:</p>
+    <listing its:translate="no">
+      <title><file>/etc/dconf/profile/gdm</file></title>
+      <code>user-db:user
+system-db:gdm</code>
+    </listing>
+    <p><input its:translate="no">gdm</input> is the name of a
+    <sys its:translate="no" xref="dconf">dconf</sys> database.</p>
+  </item>
+
+  <item xml:id="dconf-update">
+    <p>Update the system databases:</p>
+    <screen><output style="prompt"># </output><input>dconf update</input></screen>
+  </item>
+</steps>
diff --git a/system-admin-guide/C/dconf.page b/system-admin-guide/C/dconf.page
index 6054f3e..6db6e78 100644
--- a/system-admin-guide/C/dconf.page
+++ b/system-admin-guide/C/dconf.page
@@ -4,7 +4,7 @@
       id="dconf">
 
   <info>
-    <link type="guide" xref="index#user"/>
+    <link type="guide" xref="index#user" group="#last"/>
     <revision pkgversion="3.8" date="2013-08-08" status="incomplete"/>
     <revision pkgversion="3.14" date="2014-06-17" status="incomplete"/>
 
diff --git a/system-admin-guide/C/desktop-background.page b/system-admin-guide/C/desktop-background.page
index 925b050..e581186 100644
--- a/system-admin-guide/C/desktop-background.page
+++ b/system-admin-guide/C/desktop-background.page
@@ -40,6 +40,9 @@
 
   <steps>
     <title>Set the default background</title>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-profile-user'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
     <item>
       <p>Create a <sys>local</sys> keyfile for machine-wide settings in
       <file>/etc/dconf/db/local.d/<var>01-background</var></file>:
@@ -66,11 +69,9 @@ secondary-color='FFFFFF'</code>
 /org/gnome/desktop/background/primary-color
 /org/gnome/desktop/background/secondary-color</code>
     </item>
-    <item>
-      <p>Update the system databases:</p>
-<screen>
-<output># </output><input>dconf update</input></screen>
-    </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
 
 </page>
diff --git a/system-admin-guide/C/extensions-enable.page b/system-admin-guide/C/extensions-enable.page
index a2507ad..728d47e 100644
--- a/system-admin-guide/C/extensions-enable.page
+++ b/system-admin-guide/C/extensions-enable.page
@@ -55,10 +55,9 @@ enabled-extensions=['<input>myextension1 myname example com</input>', '<input>my
       (<code>myextension1 myname example com</code> and
       <code>myextension2 myname example com</code>).</p>
     </item>
-    <item>
-      <p>Update the system databases:</p>
-      <screen its:translate="no"><output style="prompt"># </output><input>dconf update</input></screen>
-    </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
 
 </page>
diff --git a/system-admin-guide/C/extensions-lockdown.page b/system-admin-guide/C/extensions-lockdown.page
index 92b7152..95be38b 100644
--- a/system-admin-guide/C/extensions-lockdown.page
+++ b/system-admin-guide/C/extensions-lockdown.page
@@ -76,10 +76,9 @@ development-tools=false
 </code>
 </listing>
     </item>
-    <item>
-      <p>Update the system databases:</p>
-      <screen its:translate="no"><output style="prompt"># </output><input>dconf update</input></screen>
-    </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
   
   <p>After locking down the <code>org.gnome.shell.enabled-extensions</code> and
diff --git a/system-admin-guide/C/login-banner.page b/system-admin-guide/C/login-banner.page
index c37c00b..effdfff 100644
--- a/system-admin-guide/C/login-banner.page
+++ b/system-admin-guide/C/login-banner.page
@@ -52,8 +52,8 @@
 
   <steps>
     <title>Display a text banner on the login screen:</title>
-    <include href="dconf-profile-gdm.xml"
-      xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:page/mal:steps/mal:item)"
+    <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> keyfile for machine-wide settings in
     <file its:translate="no">/etc/dconf/db/gdm.d/01-banner-message</file>:</p>
@@ -62,10 +62,9 @@ banner-message-enable=true
 banner-message-text='<input its:translate="yes">Type the banner message here.</input>'
 </code>
     </item>
-    <item>
-      <p>Update the system databases:</p>
-      <screen><output># </output><input>dconf update</input></screen>
-    </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
 
   <note>
diff --git a/system-admin-guide/C/login-fingerprint.page b/system-admin-guide/C/login-fingerprint.page
index 3a8d320..2fd601f 100644
--- a/system-admin-guide/C/login-fingerprint.page
+++ b/system-admin-guide/C/login-fingerprint.page
@@ -36,8 +36,8 @@
 
   <steps>
     <title>Disable login using a fingerprint reader:</title>
-    <include href="dconf-profile-user.xml"
-      xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:page/mal:steps/mal:item)"
+    <include href="dconf-snippets.xml"
+      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
@@ -55,10 +55,9 @@ enable-fingerprint-authentication="false"</code>
         <code># List the keys used to configure login
 /org/gnome/login-screen/enable-fingerprint-authentication</code>
     </item>
-    <item>
-      <p>Update the system databases:</p>
-<screen><output># </output><input>dconf update</input></screen>
-    </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
 
 </page>
diff --git a/system-admin-guide/C/login-logo.page b/system-admin-guide/C/login-logo.page
index e8d53d4..b7ba5ea 100644
--- a/system-admin-guide/C/login-logo.page
+++ b/system-admin-guide/C/login-logo.page
@@ -57,9 +57,9 @@ logo='<var>/usr/share/pixmaps/logo/greeter-logo.png</var>'
   <p>Replace <var>/usr/share/pixmaps/logo/greeter-logo.png</var>
   with the path to the image file you want to use as the greeter logo.
   </p></item>
-  <item><p>Update the system databases:</p>
-  <screen><output># </output><input>dconf update</input></screen>
-  </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
 </steps>
 
   <section id="login-logo-not-update">
diff --git a/system-admin-guide/C/login-userlist-disable.page 
b/system-admin-guide/C/login-userlist-disable.page
index 995bf04..f21fb4c 100644
--- a/system-admin-guide/C/login-userlist-disable.page
+++ b/system-admin-guide/C/login-userlist-disable.page
@@ -35,8 +35,8 @@
   password at the prompt to log in.</p>
   <steps>
     <title>Set the org.gnome.login-screen.disable-user-list key</title>
-    <include href="dconf-profile-gdm.xml"
-      xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:page/mal:steps/mal:item)"
+    <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> keyfile for machine-wide settings in
@@ -46,10 +46,9 @@
 disable-user-list=true
 </code>
     </item>
-    <item>
-      <p>Update the system databases:</p>
-      <screen><output># </output><input>dconf update</input></screen>
-    </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
 
 </page>
diff --git a/system-admin-guide/C/logout-automatic.page b/system-admin-guide/C/logout-automatic.page
index 7bc9bc0..d4f6518 100644
--- a/system-admin-guide/C/logout-automatic.page
+++ b/system-admin-guide/C/logout-automatic.page
@@ -63,12 +63,9 @@ sleep-inactive-ac-type='logout'
 </code>
 </listing>
     </item>
-    <item>
-      <p>Update the system databases:</p>
-      <screen its:translate="no">
-        <output style="prompt"># </output><input>dconf update</input>
-      </screen>
-    </item>
+    <include href="dconf-snippets.xml"
+      xpointer="xpointer(/*/*[ xml:id='dconf-update'])"
+      xmlns="http://www.w3.org/2001/XInclude"/>
   </steps>
 
   <!-- There will shortly be a way to get key descriptions using gsettings, we
diff --git a/system-admin-guide/Makefile.am b/system-admin-guide/Makefile.am
index ca89e95..536d1b7 100644
--- a/system-admin-guide/Makefile.am
+++ b/system-admin-guide/Makefile.am
@@ -8,8 +8,7 @@ HELP_FILES = \
        dconf-lockdown.page             \
        dconf-nfs-home.page             \
        dconf-profiles.page             \
-       dconf-profile-gdm.xml           \
-       dconf-profile-user.xml          \
+       dconf-snippets.xml              \
        desktop-background.page         \
        desktop-favorite-applications.page\
        desktop-lockscreen.page         \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]