[gnome-user-docs] rename dual monitors page, update pages for Brightness and Lock rename

[Jeremy Bicha <jbicha src gnome org>]

commit eb461d3967cb97cc024b5bf0e44ed480d1edc6a7
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sat Mar 24 12:12:40 2012 -0400

    rename dual monitors page, update pages for Brightness and Lock rename

 gnome-help/C/display-dimscreen.page                |    2 +-
 ...nitors-dual.page => display-dual-monitors.page} |   18 +++++++++---------
 gnome-help/C/display-lock.page                     |    4 ++--
 ...nitors-dual.webm => display-dual-monitors.webm} |  Bin 604210 -> 604210 bytes
 gnome-help/C/power-whydim.page                     |    2 +-
 gnome-help/Makefile.am                             |    2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gnome-help/C/display-dimscreen.page b/gnome-help/C/display-dimscreen.page
index 6625530..17f55ca 100644
--- a/gnome-help/C/display-dimscreen.page
+++ b/gnome-help/C/display-dimscreen.page
@@ -41,7 +41,7 @@
   <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>Open <gui>Screen</gui>.</p></item>
+    <item><p>Open <gui>Brightness and Lock</gui>.</p></item>
     <item><p>Adjust the <gui>Brightness</gui> slider to a comfortable value.</p></item>
   </steps>
 
diff --git a/gnome-help/C/monitors-dual.page b/gnome-help/C/display-dual-monitors.page
similarity index 91%
rename from gnome-help/C/monitors-dual.page
rename to gnome-help/C/display-dual-monitors.page
index 4d59298..67c7654 100644
--- a/gnome-help/C/monitors-dual.page
+++ b/gnome-help/C/display-dual-monitors.page
@@ -1,6 +1,6 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="topic" style="task"
-      id="monitors-dual">
+      id="display-dual-monitors">
 
   <info>
     <desc>Set up dual monitors.</desc>
@@ -18,7 +18,7 @@
  
  <section id="video-demo">
    <title>Video Demo</title>
-    <media type="video" width="500" mime="video/webm" src="figures/monitors-dual.webm">
+    <media type="video" width="500" mime="video/webm" src="figures/display-dual-monitors.webm">
     <p>Demo</p>
     <tt:tt xmlns:tt="http://www.w3.org/ns/ttml";>
         <tt:body>
@@ -55,7 +55,7 @@
 
           <tt:div begin="29s" end="33s">
             <tt:p>When you are happy with your settings, click <gui>Apply</gui> and then click
-           <gui>Keep this configuration</gui>.
+           <gui>Keep This Configuration</gui>.
             </tt:p>
           </tt:div>
 
@@ -75,14 +75,14 @@
 
 
   <section id="steps">
-  <title>Steps to setup an external monitor</title>
+  <title>Set up an external monitor</title>
   <p>To set up an external monitor with your laptop, connect the monitor to your laptop.
      If your system doesn't recognize it immediately, or you would like to adjust
      the settings:
   </p>
 
   <steps>
-  <item><p>Type <input>displays</input> in the <link xref="shell-introduction#activities">Activities</link> overview to open the 
+  <item><p>Type <input>displays</input> in the <link xref="shell-introduction#activities">Activities</link> overview to open the
            <gui>Displays Settings</gui>.
   </p></item>
 
@@ -90,7 +90,7 @@
            then switch it <gui>ON/OFF</gui>.
   </p></item>
 
-  <item><p>The monitor with the <link xref="shell-introduction">top bar</link> is the main monitor. To change which monitor is 
+  <item><p>The monitor with the <link xref="shell-introduction">top bar</link> is the main monitor. To change which monitor is
            "main", click on the top bar and drag it over to the monitor you want to set as
            the "main" monitor.
   </p></item>
@@ -101,11 +101,11 @@
                     <gui>Mirror displays</gui> box.</p></note>
   </item>
 
-  <item><p>When you are happy with your settings, click <gui>Apply</gui> and then click 
-           <gui>Keep this configuration</gui>.
+  <item><p>When you are happy with your settings, click <gui>Apply</gui> and then click
+           <gui>Keep This Configuration</gui>.
   </p></item>
 
-  <item><p>To close the <gui>Displays Settings</gui> click on the <gui>x</gui> in the top 
+  <item><p>To close the <gui>Displays Settings</gui> click on the <gui>x</gui> in the top
            corner.
   </p></item>
   </steps>
diff --git a/gnome-help/C/display-lock.page b/gnome-help/C/display-lock.page
index d7cd0af..9a47c1d 100644
--- a/gnome-help/C/display-lock.page
+++ b/gnome-help/C/display-lock.page
@@ -29,12 +29,12 @@
 
   <steps>
     <item><p>Click your name on the top bar and select <gui>System Settings</gui>.</p></item>
-    <item><p>Open <gui>Screen</gui>.</p></item>
+    <item><p>Open <gui>Brightness and Lock</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
+    turned off, controlled with the <gui>Turn screen off when inactive for</gui> drop-down
     list above.</p></item>
   </steps>
 </page>
diff --git a/gnome-help/C/figures/monitors-dual.webm b/gnome-help/C/figures/display-dual-monitors.webm
similarity index 100%
rename from gnome-help/C/figures/monitors-dual.webm
rename to gnome-help/C/figures/display-dual-monitors.webm
diff --git a/gnome-help/C/power-whydim.page b/gnome-help/C/power-whydim.page
index b94f6ff..561a571 100644
--- a/gnome-help/C/power-whydim.page
+++ b/gnome-help/C/power-whydim.page
@@ -31,7 +31,7 @@ or rethinking how we cross-link them.</p></comment>
  </item>
  
  <item>
-  <p>Open <gui>Screen</gui> and uncheck <gui>Dim screen to save power</gui>.</p>
+  <p>Open <gui>Brightness and Lock</gui> and uncheck <gui>Dim screen to save power</gui>.</p>
  </item>
 </steps>
 
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 6b4229a..5ea25d9 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -110,6 +110,7 @@ HELP_FILES = \
 	disk-partitions.page \
 	disk.page \
 	display-dimscreen.page \
+	display-dual-monitors.page \
 	display-lock.page \
 	documents-collection-send.page \
 	documents-collections.page \
@@ -165,7 +166,6 @@ HELP_FILES = \
 	look-display-fuzzy.page \
 	look-resolution.page \
 	media.page \
-	monitors-dual.page \
 	more-help.page \
 	mouse-disabletouchpad.page \
 	mouse-doubleclick.page \