Merge pull request #148 from NiceandGently/master

improve help

12 files changed, 47 insertions, 40 deletions

diff --git a/help/C/index.docbook b/help/C/index.docbook
index 8a4a7ee..5c30895 100644
--- a/help/C/index.docbook
+++ b/help/C/index.docbook
@@ -5,13 +5,13 @@
   <!ENTITY GFDL  SYSTEM "fdl-appendix.xml">
   <!ENTITY app "MATE Power Manager">
   <!ENTITY application "<application>&app;</application>">
-  <!ENTITY appversion "2.27.3">
-  <!ENTITY manrevision "2.27.3">
+  <!ENTITY appversion "1.10.0">
+  <!ENTITY manrevision "1.10.0">
 ]>
 <!--
       (Do not remove this comment block.)
   Template Maintained by the MATE Documentation Project:
-	  http://developer.mate.org/projects/gdp
+	  http://www.mate-desktop.org/development/
   Template version: 2.0 beta
   Template last modified Feb 12, 2002
 -->
@@ -30,6 +30,10 @@
       </para>
     </abstract>
     <copyright>
+      <year>2015</year>
+      <holder>MATE Documentation Team</holder>
+    </copyright>
+    <copyright>
       <year>2006-2009</year>
       <holder>Richard Hughes ([email protected])</holder>
     </copyright>
@@ -47,6 +51,9 @@
      not specified, the publisher/author is the same for all versions of the
      document.  -->
     <publisher role="maintainer">
+      <publishername>MATE Documentation Team</publishername>
+    </publisher>
+    <publisher role="maintainer">
       <publishername>Richard Hughes</publishername>
     </publisher>
 
@@ -56,6 +63,16 @@
         any of this. -->
 
     <authorgroup>
+      <author role="maintainer"> 
+	<surname>MATE Documentation Team</surname>
+	<affiliation>
+	  <!-- <orgname>MATE Documentation
+	  Project</orgname> -->
+	  <!-- The email address of the author is optional and is commented out by default.
+	  <address> <email>[email protected]</email> </address>
+	  --> 
+	</affiliation>
+      </author>
       <author role="maintainer">
         <firstname>Richard</firstname>
         <surname>Hughes</surname>
@@ -88,16 +105,6 @@
       </revision>
     </revhistory>
 
-    <legalnotice>
-      <title>Feedback</title>
-      <para>
-        To report a bug or make a suggestion regarding the &app; application or
-        this manual, follow the directions in the 
-        <ulink url="http://www.mate.org/projects/mate-power-manager/"
-	  type="http">&application; Contact Page</ulink>.
-      </para>
-<!-- Translators may also add here feedback address for translations -->
-    </legalnotice>
   </articleinfo>
 
   <indexterm zone="index">
@@ -166,8 +173,8 @@
     </figure>
     <note>
       <para>
-        You can disable this notification by changing the MateConf key
-        <command>/apps/mate-power-manager/notify/discharging</command>.
+        You can disable this notification by changing the dconf key
+        <command>org.mate.power-manager notify-discharging</command>.
       </para>
     </note>
   </section>
@@ -186,8 +193,8 @@
     </figure>
     <note>
       <para>
-        You can disable this notification by changing the MateConf key
-        <command>/apps/mate-power-manager/notify/fully_charged</command>.
+        You can disable this notification by changing the dconf key
+        <command>org.mate.power-manager notify-fully-charged</command>.
       </para>
     </note>
     <note>
@@ -218,8 +225,8 @@
     </figure>
     <note>
       <para>
-        You can disable this notification by changing the MateConf key
-        <command>/apps/mate-power-manager/notify/low_power</command>.
+        You can disable this notification by changing the dconf key
+        <command>org.mate.power-manager notify-low-power</command>.
       </para>
     </note>
   </section>
@@ -262,8 +269,8 @@
     </figure>
     <note>
       <para>
-        You can disable this notification by changing the MateConf key
-        <command>/apps/mate-power-manager/notify/sleep_failed</command>.
+        You can disable this notification by changing the dconf key
+        <command>org.mate.power-manager notify-sleep-failed</command>.
       </para>
     </note>
   </section>
@@ -380,7 +387,7 @@
 
   <note>
     <para>
-      Some sliders or option boxes may be disabled if the MateConf policy keys are
+      Some sliders or option boxes may be disabled if the dconf policy keys are
       not writable.
       This allows administrators to lock-down the actions that a user can select.
     </para>
@@ -482,8 +489,8 @@
     <title>Screen Dim Brightness</title>
     <note>
       <para>
-        You can change the idle laptop panel brightness by changing the MateConf key
-        <command>/apps/mate-power-manager/backlight/idle_brightness</command>.
+        You can change the idle laptop panel brightness by changing the dconf key
+        <command>org.mate.power-manager idle-brightness</command>.
       </para>
     </note>
   </section>
@@ -499,13 +506,13 @@
     <para>
       There is a complex locking scheme available for power users that allows
       locking policy to change for the lid, suspend and hibernate actions.
-      To enable this complex mode, you will have to disable the MateConf key:
+      To enable this complex mode, you will have to disable the dconf key:
     </para>
 
     <itemizedlist>
       <listitem>
         <para>
-          <command>/apps/mate-power-manager/lock/use_screensaver_settings</command>
+          <command>org.mate.power-manager lock-use-screensaver</command>
         </para>
       </listitem>
     </itemizedlist>
@@ -517,17 +524,17 @@
     <itemizedlist>
       <listitem>
         <para>
-          <command>/apps/mate-power-manager/lock/blank_screen</command>
+          <command>org.mate.power-manager lock-blank-screen</command>
         </para>
       </listitem>
       <listitem>
         <para>
-          <command>/apps/mate-power-manager/lock/suspend</command>
+          <command>org.mate.power-manager lock-suspend</command>
         </para>
       </listitem>
       <listitem>
         <para>
-          <command>/apps/mate-power-manager/lock/hibernate</command>
+          <command>org.mate.power-manager lock-hibernate</command>
         </para>
       </listitem>
     </itemizedlist>
@@ -666,9 +673,9 @@
     </title>
     <para>
       You have to change the DPMS suspend mode &application; uses.
-      Open <command>mateconf-editor</command>, and then change the keys 
-      <literal>/apps/mate-power-manager/backlight/dpms_method_ac</literal> and
-      <literal>/apps/mate-power-manager/backlight/dpms_method_battery</literal>
+      Open <command>dconf-editor</command>, and then change the keys 
+      <literal>org.mate.power-manager dpms-method-ac</literal> and
+      <literal>org.mate.power-manager dpms-method-battery</literal>
       to one of the modes that work, e.g. standby, suspend or off.
     </para>
   </section>
@@ -681,12 +688,11 @@
     <para>
       You might be able to use the percentage charge for g-p-m to use as the
       policy data.
-      Open <command>mateconf-editor</command>, and then change the key 
-      <command>/apps/mate-power-manager/general/use_time_for_policy</command> to false.
+      Open <command>dconf-editor</command>, and then change the key 
+      <command>org.mate.power-manager use-time-for-policy</command> to false.
       You can do this easily by doing:
       <command>
-        mateconftool-2 --set --type bool
-        /apps/mate-power-manager/general/use_time_for_policy false
+        gsettings get org.mate.power-manager use-time-for-policy false
       </command>
     </para>
     <para>
@@ -747,22 +753,23 @@
 <section id="about">
   <title>About</title>
   <para>
-    &app; was written by Richard Hughes <email>[email protected]</email>.
+    &app; was written by Mate Development.
     To find more information about &app;, please visit the
-    <ulink url="http://www.mate.org/projects/mate-power-manager" type="http">
+    <ulink url="https://github.com/mate-desktop/mate-power-manager" type="http">
     &application; web page</ulink>.
+    Origin power-manager was written by Richard Hughes <email>[email protected]</email>.
   </para>
   <para>
     To report a bug or make a suggestion regarding this application or
     this manual, follow the directions at the
-    <ulink url="http://www.mate.org/projects/mate-power-manager/bugs.html" type="http">
+    <ulink url="https://github.com/mate-desktop/mate-power-manager" type="http">
     &application; Bug Page</ulink>.
   </para>
   <para>This program is distributed under the terms of the GNU
     General Public license as published by the Free Software
     Foundation; either version 2 of the License, or (at your option)
     any later version. A copy of this license can be found at this
-    <ulink url="mate-power-manager:gpl" type="help">link</ulink>, or in the file
+    <ulink type="help" url="help:gpl">link</ulink>, or in the file
     COPYING included with the source code of this program.
   </para>
 </section>
diff --git a/help/ca/figures/gpm-prefs-ac.png b/help/ca/figures/gpm-prefs-ac.png
index bd143d0..ca1b653 100644
--- a/help/ca/figures/gpm-prefs-ac.png
+++ b/help/ca/figures/gpm-prefs-ac.png
diff --git a/help/ca/figures/gpm-prefs-battery.png b/help/ca/figures/gpm-prefs-battery.png
index 0f52528..4ee60c4 100644
--- a/help/ca/figures/gpm-prefs-battery.png
+++ b/help/ca/figures/gpm-prefs-battery.png
diff --git a/help/ca/figures/gpm-prefs-general.png b/help/ca/figures/gpm-prefs-general.png
index 794f4d7..90019ce 100644
--- a/help/ca/figures/gpm-prefs-general.png
+++ b/help/ca/figures/gpm-prefs-general.png
diff --git a/help/ca/figures/gs-prefs.png b/help/ca/figures/gs-prefs.png
index 1440b53..eccee92 100644
--- a/help/ca/figures/gs-prefs.png
+++ b/help/ca/figures/gs-prefs.png
diff --git a/help/de/figures/gpm-critical.png b/help/de/figures/gpm-critical.png
index b3e0b27..40035c7 100644
--- a/help/de/figures/gpm-critical.png
+++ b/help/de/figures/gpm-critical.png
diff --git a/help/de/figures/gpm-low.png b/help/de/figures/gpm-low.png
index e674155..af36263 100644
--- a/help/de/figures/gpm-low.png
+++ b/help/de/figures/gpm-low.png
diff --git a/help/de/figures/gpm-prefs-ac.png b/help/de/figures/gpm-prefs-ac.png
index 08b9199..e716e6a 100644
--- a/help/de/figures/gpm-prefs-ac.png
+++ b/help/de/figures/gpm-prefs-ac.png
diff --git a/help/de/figures/gpm-prefs-battery.png b/help/de/figures/gpm-prefs-battery.png
index 032d9a1..3ee89c8 100644
--- a/help/de/figures/gpm-prefs-battery.png
+++ b/help/de/figures/gpm-prefs-battery.png
diff --git a/help/de/figures/gpm-prefs-general.png b/help/de/figures/gpm-prefs-general.png
index 2abdc83..2a75705 100644
--- a/help/de/figures/gpm-prefs-general.png
+++ b/help/de/figures/gpm-prefs-general.png
diff --git a/help/de/figures/gs-prefs.png b/help/de/figures/gs-prefs.png
index 20167e7..bdc3cbf 100644
--- a/help/de/figures/gs-prefs.png
+++ b/help/de/figures/gs-prefs.png
diff --git a/help/eu/figures/gpm-prefs-ac.png b/help/eu/figures/gpm-prefs-ac.png
index d9d5945..128c42f 100644
--- a/help/eu/figures/gpm-prefs-ac.png
+++ b/help/eu/figures/gpm-prefs-ac.png