[gnome-user-docs] Move more pages into the right places

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit b8105cd50f541ea486dd18990555f794b57c588e
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date:   Tue Jun 17 18:34:33 2014 -0400

    Move more pages into the right places
    
    and stub those that need heavy review

 system-admin-guide/C/dconf-lockdown.page           |    3 ++-
 ...ns.page => desktop-favourite-applications.page} |    6 +++---
 ...screen-locking.page => desktop-lockscreen.page} |    4 ++--
 ...ose-key.page => keyboard-compose-key.page.stub} |    4 ++--
 ...access.page => lockdown-command-line.page.stub} |    4 ++--
 system-admin-guide/Makefile.am                     |    6 ++----
 6 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/system-admin-guide/C/dconf-lockdown.page b/system-admin-guide/C/dconf-lockdown.page
index b0de9ad..32e1619 100644
--- a/system-admin-guide/C/dconf-lockdown.page
+++ b/system-admin-guide/C/dconf-lockdown.page
@@ -37,7 +37,8 @@
   <steps>
     <title>How to lock the default wallpaper</title>
     <item>
-      <p>First, <link xref="background">set a default wallpaper</link>.</p>
+      <p>First, <link xref="desktop-background">set a default
+      wallpaper</link>.</p>
     </item>
     <item>
       <p>Create a directory named
diff --git a/system-admin-guide/C/dconf-favorite-applications.page 
b/system-admin-guide/C/desktop-favourite-applications.page
similarity index 96%
rename from system-admin-guide/C/dconf-favorite-applications.page
rename to system-admin-guide/C/desktop-favourite-applications.page
index 25bfbf9..7099eaa 100644
--- a/system-admin-guide/C/dconf-favorite-applications.page
+++ b/system-admin-guide/C/desktop-favourite-applications.page
@@ -1,11 +1,11 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="dconf-favorite-applications">
+      id="desktop-favorite-applications">
 
   <info>
-    <link type="guide" xref="index#user"/>
-    <revision pkgversion="3.8" version="0.1" date="2013-04-28" status="draft"/>
+    <link type="guide" xref="appearance"/>
+    <revision pkgversion="3.8" date="2013-04-28" status="draft"/>
 
     <credit type="author">
       <name>Aruna Sankaranarayanan</name>
diff --git a/system-admin-guide/C/screen-locking.page b/system-admin-guide/C/desktop-lockscreen.page
similarity index 97%
rename from system-admin-guide/C/screen-locking.page
rename to system-admin-guide/C/desktop-lockscreen.page
index a01de10..e603c81 100644
--- a/system-admin-guide/C/screen-locking.page
+++ b/system-admin-guide/C/desktop-lockscreen.page
@@ -1,10 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="screen-locking">
+      id="desktop-lockscreen">
 
   <info>
-    <link type="guide" xref="index#user" />
+    <link type="guide" xref="appearance" />
     <link type="seealso" xref="dconf-profiles" />
     <link type="seealso" xref="dconf-lockdown" />
     <revision pkgversion="3.8" date="2013-08-08" status="review"/>
diff --git a/system-admin-guide/C/compose-key.page b/system-admin-guide/C/keyboard-compose-key.page.stub
similarity index 96%
rename from system-admin-guide/C/compose-key.page
rename to system-admin-guide/C/keyboard-compose-key.page.stub
index d3f7985..4dcd4dd 100644
--- a/system-admin-guide/C/compose-key.page
+++ b/system-admin-guide/C/keyboard-compose-key.page.stub
@@ -1,9 +1,9 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="topic" style="task"
-      id="compose-key">
+      id="keyboard-compose-key">
 
   <info>
-    <link type="guide" xref="index#user" />
+    <link type="guide" xref="setup" />
     <revision pkgversion="3.11" date="2014-01-29" status="draft"/>
 
     <credit type="author copyright">
diff --git a/system-admin-guide/C/command-line-access.page 
b/system-admin-guide/C/lockdown-command-line.page.stub
similarity index 97%
rename from system-admin-guide/C/command-line-access.page
rename to system-admin-guide/C/lockdown-command-line.page.stub
index c85bec9..12c7178 100644
--- a/system-admin-guide/C/command-line-access.page
+++ b/system-admin-guide/C/lockdown-command-line.page.stub
@@ -1,9 +1,9 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="topic" style="task"
-      id="command-line-access">
+      id="lockdown-command-line">
 
   <info>
-    <link type="guide" xref="index#user" />
+    <link type="guide" xref="software#management" />
     <revision pkgversion="3.11" date="2014-01-29" status="draft"/>
 
     <credit type="author copyright">
diff --git a/system-admin-guide/Makefile.am b/system-admin-guide/Makefile.am
index 0e75c63..0f569ff 100644
--- a/system-admin-guide/Makefile.am
+++ b/system-admin-guide/Makefile.am
@@ -8,8 +8,6 @@ HELP_MEDIA =
 
 HELP_FILES = \
        backgrounds-extra.page          \
-       command-line-access.page        \
-       compose-key.page                \
        dconf-custom-defaults.page      \
        dconf-keyfiles.page             \
        dconf-lockdown.page             \
@@ -17,8 +15,9 @@ HELP_FILES = \
        dconf-profiles.page             \
        dconf-profile-gdm.xml           \
        dconf-profile-user.xml          \
-       dconf-favorite-applications.page\
        desktop-background.page         \
+       desktop-favorite-applications.page\
+       desktop-lockscreen.page         \
        extensions-enable.page          \
        extensions-lockdown.page        \
        extensions.page                 \
@@ -41,7 +40,6 @@ HELP_FILES = \
        power-dim-screen.page           \
        printer-configuration.page      \
        processes.page                  \
-       screen-locking.page             \
        servers-list.page               \
        user-session.page               \
        vpn-list.page