[gnome-user-docs/wip/system-admin-guide-20130514] Bug 694576 a new automatic-logout page created

[Jana Svarova <jsvarova src gnome org>]

commit b9c8d2f8e30227bd521cd233d5885c71684ab98c
Author: Jana Svarova <jsvarova redhat com>
Date:   Thu May 23 11:49:24 2013 +0200

    Bug 694576 a new automatic-logout page created
    
    Conflicts:
        system-admin-guide/C/automatic-logout.page

 system-admin-guide/C/automatic-logout.page |   77 ++++++++++++----------------
 1 files changed, 33 insertions(+), 44 deletions(-)
---
diff --git a/system-admin-guide/C/automatic-logout.page b/system-admin-guide/C/automatic-logout.page
index 2870f55..7c7ca69 100644
--- a/system-admin-guide/C/automatic-logout.page
+++ b/system-admin-guide/C/automatic-logout.page
@@ -11,65 +11,54 @@
       <email>jana svarova gmail com</email>
       <years>2013</years>
     </credit>
-  <desc>How to end user sessions after a period of idle, or forcibly.</desc>
+
+ <desc>How to end user sessions after a period of idle</desc>
 
 </info>
 
 <title>Automatic logout</title>
-  <p>GNOME can optionally force an automatic logout of users after being 
-  idle for a certain amount of time. This feature is exposed through 
-  GSettings.</p>
 
-  <p>GSettings is an <app>API</app> that allows you to access key/value pairs 
-  (e.g.: persistent application settings) without directly talking to the actual
-  <sys>backend</sys> that stores that data (config files, gconf, dconf).</p>
-  
-  <p>To configure an end of user sessions after X seconds of idle, 
-  key/value pairs need to be changed. Here are four examples explaining
-  how to set your battery or alternating current (AC) values.</p>
+  <p>To configure an end of a user session after a specified number of seconds
+  of idle, the following keys need to be changed:</p>
+<screen>
+org.gnome.settings-daemon.plugins.power.sleep-inactive-ac-timeout
+org.gnome.settings-daemon.plugins.power.sleep-inactive-ac-type
+org.gnome.settings-daemon.plugins.power.sleep-inactive-battery-timeout
+org.gnome.settings-daemon.plugins.power.sleep-inactive-battery-type
+</screen>
+  <p>As you can see from the list, the keys differ according to the power mode:
+  whether the computer is on battery (-battery-) or on ac power (-ac-).</p>
 
-<steps>
-<title>Sleep timeout when the computer is on battery:</title>
-  <item><p>Open the terminal.</p></item>
-  <item><p>Run the <code>gsettings set 
org.gnome.settings-daemon.plugins.power.sleep-battery-timeout=<var>number-of-seconds</var></code> 
-  command.</p></item>
-</steps>
- 
-  <p><var>number-of-seconds</var> is the amount of time in seconds the computer 
-  on battery power needs to be inactive before it goes to sleep.
-  A value of 0 means <em>never</em>.</p>
+  <p>Firstly, you can set what kind of automatic logout should
+  be used (<var>'hibernate'</var>, <var>'suspend'</var> or <var>'do nothing'</var>)
+  and, secondly, the number of seconds the user has been inactive to log them
+  out. See the examples below.</p>
 
 <steps>
-  <title>The type of sleeping that should be performed when the computer is 
-  inactive:</title>
+  <title>To suspend the computer after 5 minutes of idle:</title>
   <item><p>Open the terminal.</p></item>
-  <item><p>Run the <code>gsettings set 
org.gnome.settings-daemon.plugins.power.sleep-battery-type=<var>interactive</var></code> 
-  command.</p></item>
+  <item><p>Run the
+  <cmd>gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-ac-timeout 300</cmd>
+  command to set the number of seconds (5 minutes equals 300 seconds).</p></item>
 </steps>
 
-  <p>This command sets whether to <var>hibernate</var>, <var>suspend</var> or do nothing when the 
-  computer is inactive and on battery. The default settings is <var>suspend</var>.</p>
+<note>
+  <p>You do not need to specify the type of logout as <var>'suspend'</var> is
+  set by default.</p>
+</note>
 
-<steps>
-  <title>Sleep timeout when the computer is on AC:</title>
-  <item><p>Open the terminal.</p></item>
-  <item><p>Run the 
<code>org.gnome.settings-daemon.plugins.power.sleep-ac-timeout=<var>number-of-seconds</var></code> 
-  command.</p></item>
-</steps>
-
-  <p>Again, <var>number-of-seconds</var> is the amount of time in seconds the 
-  computer on AC power needs to be inactive before it goes to sleep. 
-  A value of 0 means <em>never</em>.</p>
+  <p>Whereas the first example concerned a computer on alternating current,
+  the second example deals with a computer on battery.</p>
 
 <steps>
-  <title>The type of sleeping that should be performed when the computer is 
-  inactive:</title>
+  <title>To hibernate the computer after 10 minutes of idle:</title>
   <item><p>Open the terminal.</p></item>
-  <item><p>Run the <code>org.gnome.settings-daemon.plugins.power.sleep-ac-type=<var>interactive</var></code> 
-  command.</p></item>
+  <item><p>Run the
+  <cmd>gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-battery-timeout 600</cmd>
+  command to set the number of seconds (10 minutes equals 600 seconds).</p></item>
+  <item><p>Run the
+  <cmd>gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-battery-type 'hibernate'</cmd>
+  command to set the type of logout.</p></item>
 </steps>
 
-  <p>This command sets whether to <var>hibernate</var>, <var>suspend</var> or do nothing when inactive 
-  and when on AC. The default settings is <var>suspend</var>.</p>
-
 </page>