[gnome-user-docs] g-h: Split dim/lock topics, other edits, final

[Shaun McCance <shaunm src gnome org>]

commit 650e891c8b9de9c3c974781a4b5f6ecaccd72bd5
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Apr 4 15:52:06 2011 -0400

    g-h: Split dim/lock topics, other edits, final

 gnome-help/C/display-dimscreen.page   |   54 +++++++++++++++++++++++++++++++++
 gnome-help/C/display-lock.page        |   40 ++++++++++++++++++++++++
 gnome-help/C/look-dimscreen.page      |   34 --------------------
 gnome-help/C/prefs-display.page       |    2 +-
 gnome-help/C/session-screenlocks.page |   21 +++++--------
 gnome-help/Makefile.am                |    3 +-
 6 files changed, 105 insertions(+), 49 deletions(-)
---
diff --git a/gnome-help/C/display-dimscreen.page b/gnome-help/C/display-dimscreen.page
new file mode 100644
index 0000000..17c7e10
--- /dev/null
+++ b/gnome-help/C/display-dimscreen.page
@@ -0,0 +1,54 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      type="topic"
+      style="task"
+      id="display-dimscreen">
+
+  <info>
+    <link type="guide" xref="prefs-display"/>
+    <link type="seealso" xref="display-lock"/>
+    <desc>Dim the screen to save power or increase the brightness to
+    make it more readable in bright light.</desc>
+    <revision pkgversion="3.0" date="2011-04-04" status="final"/>
+    <credit type="author">
+      <name>GNOME Documentation Project</name>
+      <email>gnome-doc-list gnome org</email>
+    </credit>
+    <credit type="author">
+      <name>Natalia Ruz Leiva</name>
+      <email>nruz alumnos inf utfsm cl </email>
+    </credit>
+    <credit type="author">
+      <name>Shaun McCance</name>
+      <email>shaunm gnome org</email>
+    </credit>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info> 
+
+  <title>Set screen brightness</title>
+
+  <p>You can change the brightness of your screen to save power or
+  make the screen more readable in bright light. You can also have
+  the screen dim automatically when on battery power and have it
+  turn off automatically when not in use.</p>
+
+  <steps>
+    <title>Set the brightness</title>
+    <item><p>Click your name on the top bar and select <gui>System Settings</gui>.</p></item>
+    <item><p>Select <gui>Screen</gui>.</p></item>
+    <item><p>Adjust the <gui>Brightness</gui> slider to a comfortable value.</p>
+    <p>Many laptop keyboards have special keys on the keyboard to adjust the brightness.
+    These often usually located on the <key>F8</key> and <key>F9</key> keys. Hold
+    down the <key>Fn</key> key to use these keys.</p></item>
+  </steps>
+
+  <p>Select <gui>Dim screen to save power</gui> to have the brightness
+  automatically lowered when you're on battery power. The backlight of
+  your screen can take a lot of power and significantly reduce how
+  long your battery will last before it needs to be recharged.</p>
+
+  <p>The screen will automatically turn off after you haven't used it
+  for a while. This only affects the display, and doesn't turn off
+  your computer. You can adjust how long you have to be inactive
+  with the <gui>Turn off after</gui> drop-down list.</p>
+
+</page>
diff --git a/gnome-help/C/display-lock.page b/gnome-help/C/display-lock.page
new file mode 100644
index 0000000..f471ab9
--- /dev/null
+++ b/gnome-help/C/display-lock.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      type="topic"
+      style="task"
+      id="display-lock">
+
+  <info>
+    <link type="guide" xref="prefs-display"/>
+    <link type="seealso" xref="session-screenlocks"/>
+    <link type="seealso" xref="shell-exit#lock-screen"/>
+    <desc>Prevent other people from using your desktop when you
+    go away from your computer.</desc>
+    <revision pkgversion="3.0" date="2011-04-04" status="final"/>
+    <credit type="author">
+      <name>Shaun McCance</name>
+      <email>shaunm gnome org</email>
+    </credit>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info> 
+
+  <title>Automatically lock your screen</title>
+
+  <p>When you leave your computer, you should
+  <link xref="shell-exit#lock-screen">lock the screen</link> to prevent
+  other people from using your desktop and accessing your files. You will
+  still be logged in and all your applications will keep running,
+  but you will have to enter your password to use your computer again.
+  You can lock the screen manually, but you can also have the screen
+  lock automatically.</p>
+
+  <steps>
+    <item><p>Click your name on the top bar and select <gui>System Settings</gui>.</p></item>
+    <item><p>Select <gui>Screen</gui>.</p></item>
+    <item><p>Make sure <gui>Lock</gui> is switched on, then select a timeout
+    from the drop-down list below. The screen will automatically lock after
+    you have been inactive for this long. You can also select <gui>Screen
+    turns off</gui> to lock the screen after the screen is automatically
+    turned off, controlled with the <gui>Turn off after</gui> drop-down
+    list above.</p></item>
+  </steps>
+</page>
diff --git a/gnome-help/C/prefs-display.page b/gnome-help/C/prefs-display.page
index 618be32..0724b32 100644
--- a/gnome-help/C/prefs-display.page
+++ b/gnome-help/C/prefs-display.page
@@ -14,7 +14,7 @@
     <desc>
       <link xref="look-background">Background</link>,
       <link xref="look-resolution">size and rotation</link>,
-      <link xref="look-dimscreen">brightness</link>...
+      <link xref="display-dimscreen">brightness</link>...
     </desc>
   </info>
 
diff --git a/gnome-help/C/session-screenlocks.page b/gnome-help/C/session-screenlocks.page
index bc5c576..4f3e00d 100644
--- a/gnome-help/C/session-screenlocks.page
+++ b/gnome-help/C/session-screenlocks.page
@@ -3,12 +3,12 @@
       id="session-screenlocks">
 
   <info>
-    <link type="guide" xref="shell-exit"/>
     <link type="guide" xref="prefs-display"/>
     <link type="guide" xref="hardware-problems-graphics"/>
+    <link type="seealso" xref="shell-exit"/>
     
     <desc>Change how long to wait before locking the screen in the <gui>Screen</gui> settings.</desc>
-    <revision pkgversion="3.0" date="2011-04-03" status="candidate"/>
+    <revision pkgversion="3.0" date="2011-04-04" status="final"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
@@ -23,19 +23,14 @@
 
 <p>To wait for a longer period before automatically locking the screen:</p>
 
-<steps>
- <item>
-  <p>Click your name on the top bar and click <gui>System Settings</gui>.</p>
- </item>
- 
- <item>
-  <p>Open the <gui>Screen</gui> settings and change the <gui>Lock screen after</gui> option.</p>
- </item>
- 
-</steps>
+  <steps>
+    <item><p>Click your name on the top bar and select <gui>System Settings</gui>.</p></item>
+    <item><p>Select <gui>Screen</gui>.</p></item>
+    <item><p>Change the value in the <gui>Lock screen after</gui> drop-down list.</p></item>
+  </steps>
 
 <note style="tip">
- <p>If you don't ever want the screen to lock itself automatically, go to the <gui>Screen</gui> settings and switch <gui>Lock</gui> to <gui>OFF</gui>.</p>
+ <p>If you don't ever want the screen to lock itself automatically, switch <gui>Lock</gui> off.</p>
 </note>
 
 </page>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 9296c9a..a5f1c99 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -64,6 +64,8 @@ DOC_PAGES = \
 	disk-check.page \
 	disk-format.page \
 	disk-partitions.page \
+	display-dimscreen.page \
+	display-lock.page \
 	fallback-mode.page \
 	files-browse.page \
 	files-copy.page \
@@ -94,7 +96,6 @@ DOC_PAGES = \
 	keyboard-layouts.page \
 	keyboard-repeat-keys.page \
 	look-background.page \
-	look-dimscreen.page \
 	look-display-fuzzy.page \
 	look-resolution.page \
 	media.page \