[gnome-user-docs] shell-exit: Changed shutdown steps, link changes; bug #647905

[Shaun McCance <shaunm src gnome org>]

commit 1f3a326ca041ef2904b484b91862e41003b19cf8
Author: Shaun McCance <shaunm gnome org>
Date:   Fri Apr 15 21:11:24 2011 -0400

    shell-exit: Changed shutdown steps, link changes; bug #647905

 gnome-help/C/power-batterylife.page   |    2 +-
 gnome-help/C/session-screenlocks.page |    1 -
 gnome-help/C/shell-exit.page          |   55 +++++++++++++++++++++-----------
 3 files changed, 37 insertions(+), 21 deletions(-)
---
diff --git a/gnome-help/C/power-batterylife.page b/gnome-help/C/power-batterylife.page
index fa9b8f4..c9a923f 100644
--- a/gnome-help/C/power-batterylife.page
+++ b/gnome-help/C/power-batterylife.page
@@ -32,7 +32,7 @@
 
  <list>
   <item>
-   <p><link xref="shell-exit#shut-down">Suspend your computer</link> when you are not using it. This significantly reduces the amount of power it uses, and it can be woken up very quickly.</p>
+   <p><link xref="shell-exit#suspend">Suspend your computer</link> when you are not using it. This significantly reduces the amount of power it uses, and it can be woken up very quickly.</p>
   </item>
   <item>
    <p>Turn off the computer when you will not be using it for longer periods. Some people worry that turning off a computer regularly may cause it to wear out faster, but modern computers are quite robust, so this shouldn't be an issue.</p>
diff --git a/gnome-help/C/session-screenlocks.page b/gnome-help/C/session-screenlocks.page
index 2a1967d..a437e42 100644
--- a/gnome-help/C/session-screenlocks.page
+++ b/gnome-help/C/session-screenlocks.page
@@ -5,7 +5,6 @@
   <info>
     <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-04" status="final"/>
diff --git a/gnome-help/C/shell-exit.page b/gnome-help/C/shell-exit.page
index c9fb5a5..7ac9dc0 100644
--- a/gnome-help/C/shell-exit.page
+++ b/gnome-help/C/shell-exit.page
@@ -6,13 +6,12 @@
 
     <link type="guide" xref="index" group="shell-exit" />
     <link type="guide" xref="shell-overview#desktop" />
-    <link type="seealso" xref="power-turnoffbutton" />
 
     <desc>Learn how to leave your user account, by logging out, switching users, and so on.</desc>
     <!-- Should this be a guide which links to other topics? -->
     
     <revision pkgversion="3.0" date="2011-04-04" status="final"/>
-    <revision pkgversion="3.0" version="3.0.1" date="2011-04-06" status="outdated"/>
+    <revision pkgversion="3.0" version="3.0.1" date="2011-04-15" status="incomplete"/>
     <credit type="author">
       <name>Shaun McCance</name>
       <email>shaunm gnome org</email>
@@ -25,13 +24,14 @@
 
 <comment>
   <cite date="2011-04-04">shaunm</cite>
-  <p>More links would be good.</p>
+  <p>More links would be good, especially in #logout. Could go final
+  as-is. Incomplete for now</p>
 </comment>
 
 <p>When you've finished using your computer, you can turn it off, suspend it (to save power),
 or leave it powered on and just log out.</p>
 
-<section id = "logout">
+<section id="logout">
 <title>Log out or switch users</title>
 <p>To let other users use your computer, you can either log out, or leave
 yourself logged in and just switch users. If you just switch users, all of
@@ -41,7 +41,10 @@ left it when you log back in.</p>
 the appropriate option.</p>
 </section>
 
-<section id = "lock-screen">
+<section id="lock-screen">
+<info>
+  <link type="seealso" xref="session-screenlocks"/>
+</info>
 <title>Lock the screen</title>
 <p>If you're leaving your computer for a short time, you should lock your
 screen to prevent other people from accessing your files and running
@@ -57,29 +60,43 @@ by clicking <gui>Switch User</gui> on the password screen. You can switch
 back to your desktop when they are finished.</p>
 </section>
 
-<section id = "shut-down">
+<section id="suspend">
 <info>
   <link type="seealso" xref="power-suspendhibernate"/>
 </info>
-<title>Suspend, shut down, or restart.</title>
+<title>Suspend</title>
 
-<p>To save power, turn off your computer when you aren't using it. By default,
-GNOME simply suspends your computer. This saves your state to your computer's
-memory and powers off most of your computer's functions. A very small amount of
-power is still used during suspend.</p>
+<p>To save power, suspend your computer when you aren't using it. If you use
+a laptop, GNOME suspends your computer automatically when you close your lid.
+This saves your state to your computer's memory and powers off most of your
+computer's functions. A very small amount of power is still used during suspend.</p>
+
+<p>To suspend your computer manaully, click your name on the top bar and select
+<gui>Suspend</gui>.</p>
+</section>
 
-<p>To suspend your computer, click your name on the top bar and select
-<gui>Suspend</gui>. Or, if you have a laptop, simply close the lid. Your
-computer will automatically suspend when the lid is closed.</p>
+<section id="shutdown">
+<info>
+  <link type="seealso" xref="power-turnoffbutton"/>
+</info>
+<title>Shut down or restart</title>
 
 <p>If you want to power off your computer entirely, or do a full restart,
-click your name on the top bar, then hold down the <key>Alt</key> key.
-The <gui>Suspend</gui> option will change to <gui>Power Off</gui>. Click
-this to choose to power off or restart.</p>
+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>Shut Down</gui>.</p>
 
-<note><p>If there are other users logged in, you may not be allowed to
+<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>
+to power off.</p>
+
+<note style="tip"><p>If you need to shut down or restart quickly, you
+can do it without logging out. Click your name on the top bar, then
+hold down the <key>Alt</key> key. The <gui>Suspend</gui> option will
+change to <gui>Power Off</gui>. Select this to shut down or
+restart.</p></note>
+
 </section>
 </page>