[gnome-user-docs] Update the Log Out & Power Off instructions

[Alexandre Franke <afranke src gnome org>]

commit bc4e429dca06c5046f6854aa109d683fb90197c1
Author: Alexandre Franke <alexandre franke gmail com>
Date:   Mon Sep 24 12:04:21 2012 +0200

    Update the Log Out & Power Off instructions
    
    Merge power-off into shell-exit.
    Update to match the new user menu.

 gnome-help/C/power-off.page  |   46 ------------------------------------------
 gnome-help/C/shell-exit.page |   24 +++++++++++++++++----
 2 files changed, 19 insertions(+), 51 deletions(-)
---
diff --git a/gnome-help/C/shell-exit.page b/gnome-help/C/shell-exit.page
index 564ccb1..b9e5232 100644
--- a/gnome-help/C/shell-exit.page
+++ b/gnome-help/C/shell-exit.page
@@ -6,6 +6,7 @@
 
     <link type="guide" xref="index" group="shell-exit" />
     <link type="guide" xref="shell-overview#desktop" />
+    <link type="guide" xref="power" />
     <link type="seealso" xref="power-hibernate"/>
 
     <desc>Learn how to leave your user account, by logging out, switching users,
@@ -22,6 +23,10 @@
       <name>Andre Klapper</name>
       <email>ak-47 gmx net</email>
     </credit>
+    <credit type="author">
+      <name>Alexandre Franke</name>
+      <email>afranke gnome org</email>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
@@ -45,6 +50,11 @@
  left it when you log back in.</p>
   <p>To <gui>Log Out</gui> or <gui>Switch User</gui>, click your name on the
  top bar and select the appropriate option.</p>
+
+<note>
+  <p>The <gui>Log Out</gui> and <gui>Switch User</gui> entries only appear in
+  the menu if you have more than one user account on your system.</p>
+</note>
 </section>
 
 <section id="lock-screen">
@@ -59,7 +69,7 @@
  amount of time.</p>
 
   <p>To lock your screen, click your name on the top bar and select
- <gui>Lock Screen</gui>.</p>
+  <gui>Lock</gui>.</p>
 
   <p>When your screen is locked, other users can log in to their own accounts
  by clicking <gui>Switch User</gui> on the password screen. You can switch
@@ -91,15 +101,19 @@
 <title>Power off or restart</title>
 
   <p>If you want to power off your computer entirely, or do a full restart,
- first log out by clicking your name on the top bar and selecting
- <gui>Log Out</gui>. You will be returned to the login screen. On the
- login screen, click the power icon on the top bar and select either
- <gui>Restart</gui> or <gui>Power Off</gui>.</p>
+  click your name on the top bar and select <gui>Power Off</gui>. A dialog will
+  open offering you to either <gui>Restart</gui> or <gui>Power Off</gui>.</p>
 
   <p>If there are other users logged in, you may not be allowed to
  power off or restart the computer, because this will end their sessions.
  If you are an administrative user, you may be asked for your password
  to power off.</p>
 
+<note style="tip">
+  <p>You may want to power off your computer if you wish to move it and do not
+  have a battery, if your battery is low or does not hold charge well. A powered
+  off computer also uses <link xref="power-batterylife">less energy</link> than
+  one which is suspended.</p>
+</note>
 </section>
 </page>