GNOME.org
 

[gnome-user-docs/gnome-3-26] Move dconf topics under setup

commit 98484f1406ec8eec47e08f3a3d4d23da1fc4a914
Author: Petr Kovar <pkovar redhat com>
Date:   Wed Nov 1 21:22:16 2017 +0100

    Move dconf topics under setup

 system-admin-guide/C/dconf-custom-defaults.page    |    4 ++--
 system-admin-guide/C/dconf-keyfiles.page           |    2 +-
 system-admin-guide/C/dconf-lockdown.page           |    1 +
 system-admin-guide/C/dconf-nfs-home.page           |    2 +-
 system-admin-guide/C/dconf-profiles.page           |    4 ++--
 system-admin-guide/C/dconf.page                    |    2 +-
 system-admin-guide/C/index.page                    |    2 +-
 system-admin-guide/C/lockdown-online-accounts.page |    2 +-
 system-admin-guide/C/overrides.page                |    2 +-
 system-admin-guide/C/setup.page                    |    1 +
 ...ubleshooting.page => troubleshooting.page.stub} |    0
 system-admin-guide/Makefile.am                     |    1 -
 12 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/system-admin-guide/C/dconf-custom-defaults.page b/system-admin-guide/C/dconf-custom-defaults.page
index 223af70..3d2fa1f 100644
--- a/system-admin-guide/C/dconf-custom-defaults.page
+++ b/system-admin-guide/C/dconf-custom-defaults.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="dconf-custom-default-values">
+      id="dconf-custom-defaults">
 
   <info>
-    <link type="guide" xref="sundry" />
+    <link type="guide" xref="setup" />
     <link type="seealso" xref="dconf-profiles" />
     <link type="seealso" xref="dconf-lockdown" />
     <link type="seealso" xref="dconf" />
diff --git a/system-admin-guide/C/dconf-keyfiles.page b/system-admin-guide/C/dconf-keyfiles.page
index 9345e12..94a6525 100644
--- a/system-admin-guide/C/dconf-keyfiles.page
+++ b/system-admin-guide/C/dconf-keyfiles.page
@@ -4,7 +4,7 @@
       id="dconf-keyfiles">
 
   <info>
-    <link type="guide" xref="sundry" />
+    <link type="guide" xref="setup" />
 <!--    <link type="seealso" xref="dconf-profiles" />-->
     <revision pkgversion="3.9" date="2013-08-06" status="stub"/>
 
diff --git a/system-admin-guide/C/dconf-lockdown.page b/system-admin-guide/C/dconf-lockdown.page
index b197a78..b7eb552 100644
--- a/system-admin-guide/C/dconf-lockdown.page
+++ b/system-admin-guide/C/dconf-lockdown.page
@@ -5,6 +5,7 @@
 
   <info>
     <link type="guide" xref="user-settings#lockdown" />
+    <link type="guide" xref="setup" />
 <!--    <link type="seealso" xref="dconf-profiles" />-->
     <revision version="0.1" date="2012-05-21" status="review"/>
     <revision pkgversion="3.8" date="2013-04-26" status="review"/>
diff --git a/system-admin-guide/C/dconf-nfs-home.page b/system-admin-guide/C/dconf-nfs-home.page
index de8ccf2..7bfbeba 100644
--- a/system-admin-guide/C/dconf-nfs-home.page
+++ b/system-admin-guide/C/dconf-nfs-home.page
@@ -4,7 +4,7 @@
       id="dconf-nfs-home">
 
   <info>
-    <link type="guide" xref="sundry" />
+    <link type="guide" xref="setup" />
     <link type="guide" xref="login#management" />
     <revision version="0.1" date="2013-03-19" status="draft"/>
     <revision pkgversion="3.8" date="2013-05-09" status="review"/>
diff --git a/system-admin-guide/C/dconf-profiles.page b/system-admin-guide/C/dconf-profiles.page
index 000888c..01a537a 100644
--- a/system-admin-guide/C/dconf-profiles.page
+++ b/system-admin-guide/C/dconf-profiles.page
@@ -3,8 +3,8 @@
       id="dconf-profiles">
 
   <info>
-    <link type="guide" xref="sundry" />
-    <link type="seealso" xref="dconf-custom-default-values" />
+    <link type="guide" xref="setup" />
+    <link type="seealso" xref="dconf-custom-defaults" />
     <link type="seealso" xref="dconf" />
     <revision version="0.1" date="2013-03-25" status="draft"/>
   
diff --git a/system-admin-guide/C/dconf.page b/system-admin-guide/C/dconf.page
index 5460953..420bce6 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="sundry" />
+    <link type="guide" xref="setup" />
     <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/index.page b/system-admin-guide/C/index.page
index ed3ecaa..f1c692f 100644
--- a/system-admin-guide/C/index.page
+++ b/system-admin-guide/C/index.page
@@ -7,7 +7,7 @@
     <revision pkgversion="3.10" date="2012-08-09" status="review"/>
     <revision pkgversion="3.14" date="2014-06-18" status="candidate"/>
 
-    <title type="link" role="trail">Sysadmin Guide</title>
+    <title type="link" role="trail">System Administration Guide</title>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
diff --git a/system-admin-guide/C/lockdown-online-accounts.page 
b/system-admin-guide/C/lockdown-online-accounts.page
index 6d7f776..5b7a80b 100644
--- a/system-admin-guide/C/lockdown-online-accounts.page
+++ b/system-admin-guide/C/lockdown-online-accounts.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="online-accounts">
+      id="lockdown-online-accounts">
 
   <info>
     <link type="guide" xref="user-settings#lockdown"/>
diff --git a/system-admin-guide/C/overrides.page b/system-admin-guide/C/overrides.page
index 6d5280b..9775bff 100644
--- a/system-admin-guide/C/overrides.page
+++ b/system-admin-guide/C/overrides.page
@@ -3,7 +3,7 @@
       id="overrides">
 
   <info>
-    <link type="guide" xref="sundry" />
+    <link type="guide" xref="setup" />
     <revision pkgversion="3.6" date="2012-05-21" status="stub"/>
 
     <credit type="author copyright">
diff --git a/system-admin-guide/C/setup.page b/system-admin-guide/C/setup.page
index 199baca..634e31f 100644
--- a/system-admin-guide/C/setup.page
+++ b/system-admin-guide/C/setup.page
@@ -9,4 +9,5 @@
   </info>
 
   <title>Setup</title>
+
 </page>
diff --git a/system-admin-guide/C/troubleshooting.page b/system-admin-guide/C/troubleshooting.page.stub
similarity index 100%
rename from system-admin-guide/C/troubleshooting.page
rename to system-admin-guide/C/troubleshooting.page.stub
diff --git a/system-admin-guide/Makefile.am b/system-admin-guide/Makefile.am
index 7f7dfe4..7111ad3 100644
--- a/system-admin-guide/Makefile.am
+++ b/system-admin-guide/Makefile.am
@@ -54,7 +54,6 @@ HELP_FILES = \
        setup.page \
        software.page \
        sundry.page \
-       troubleshooting.page \
        user-settings.page
 
 HELP_MEDIA =
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]