[gnome-user-docs] g-h/shell-exit: More explanation, simpler instructions, final

[Shaun McCance <shaunm src gnome org>]

commit ef7479c047b5d8fca78b2f3b17f1042dbea5812c
Author: Shaun McCance <shaunm gnome org>
Date:   Tue Apr 5 13:15:55 2011 -0400

    g-h/shell-exit: More explanation, simpler instructions, final

 gnome-help/C/shell-exit.page |  172 +++++++++++++-----------------------------
 1 files changed, 53 insertions(+), 119 deletions(-)
---
diff --git a/gnome-help/C/shell-exit.page b/gnome-help/C/shell-exit.page
index 9273e70..42418e1 100644
--- a/gnome-help/C/shell-exit.page
+++ b/gnome-help/C/shell-exit.page
@@ -8,13 +8,13 @@
     <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 user and so on.</desc>
+    <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" version="0.1" date="2011-03-19" status="review"/>
+    <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>
+      <name>Shaun McCance</name>
+      <email>shaunm gnome org</email>
     </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
@@ -22,129 +22,63 @@
 
 <title>Log out, power off, switch users</title>
 
-<p>When you've finished using your computer, you can turn it off, send it to sleep (to save power), or leave it switched on and just log out.</p>
+<comment>
+  <cite date="2011-04-04">shaunm</cite>
+  <p>More links would be good.</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">
-<title>Log out or switch user</title>
-<steps>
- <item>
-  <p>
-    Click on your user name in the top right hand corner of the monitor.
-  </p>
- </item>
-  <item>
-  <p>
-    You can now select <gui>Logout</gui> or <gui>Switch User</gui> by clicking on the option of choice.
-  </p>
-  <terms>
-   <item>
-    <title>
-    Logout
-    </title>
-    <p>
-     Ends your session and logs you out.
-    </p>
-    </item>
-    <item>
-    <title>
-    Switch Between Users
-    </title>
-    <p>
-    Locks your screen, allowing another user to log in and use the computer.
-    </p>
-    </item>
-  </terms>
- </item>
-  <item>
-  <p>
-    A <gui>Log Out of the Session</gui> window will appear.  You have 60 seconds to confirm <gui>Logout</gui>, change your mind to <gui>Switch User</gui> or <gui>Cancel</gui>. It you do nothing, you will be automatically logged out at the end of 60 seconds.
-  </p>
-
- </item>
-
-
-</steps>
+<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
+your applications will continue running, and everything will be where you
+left it when you log back in.</p>
+<p>To log out or switch users, click your name on the top bar and select
+the appropriate option.</p>
 </section>
 
 <section id = "lock-screen">
 <title>Lock the screen</title>
- <p>
- To lock your screen:
- </p>
- <list>
- <item>
-  <p>
-  Press <keyseq><key>Ctrl</key><key>Alt</key><key>L</key></keyseq>, or
-  </p>
- </item>
-  <item>
-  <p>
-  Click on your user name in the top right hand corner of the monitor select <gui> Lock Screen</gui>.
-  </p>
- </item>
- </list>
-
- <p>
- This will prevent others from accessing your computer while you are away from it. All your applications remain open while the screen is locked.
- </p>
- <p>
- To unlock the screen just move the mouse or press a key. You will need to enter your password to login.
-</p>
-
-<p>
-If more than one user has an account on the computer and the screen is locked, others can choose to <gui>Switch User</gui> to login to their account. They will be unable to access your work, and you will be able to switch back to your locked session when they finish using the computer.
- </p>
+<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
+applications. When you return, simply enter your password to log back in.
+If you don't lock your screen, it will lock automatically after a certain
+amount of time.</p>
+
+<p>To lock your screen, click your name on the top bar and select
+<gui>Lock Screen</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
+back to your desktop when they are finished.</p>
 </section>
 
 <section id = "shut-down">
-<title>Shutting down, restarting, and sending the computer to sleep</title>
-
-<p>To shutdown your computer:</p>
-<steps>
- <item>
-  <p>
-    Click on your user name in the top right hand corner of the monitor and hold down the <key>Alt</key> key.
-  </p>
- </item>
- <item>
- <p>
-  Click on <gui>Power Off</gui>.
- </p>
- </item>
-
-    <item>
-  <p>
-    A <gui>Shut Down the Computer</gui> window will appear with the following shut down options:
-  </p>
-  <terms>
-  <item>
-    <title>Shutdown</title>
-    <p>Ends your session and turns off the computer.</p>
-  </item>
-<!--    
-  <p>To switch back and forth between users, simply repeat the above steps.</p>
--->
-  <item>
-    <title>Restart</title>
-    <p>Ends your session and restarts the computer.</p>
-  </item>
-  <item>
-    <title>Suspend</title>
-    <p>Suspends your session quickly, using minimal power while the computer stands by.</p>
-  </item>
-    <item>
-    <title>Hibernate</title>
-    <p>Suspends your session, using no power until the computer is restarted.</p>
-  </item>
-</terms>
-  </item>
-  <item>
-    <p>
-    You have 60 seconds to select your shut down option.  The computer will automatically shut down at the end of 60 seconds.
-    </p>
-  </item>
- </steps>
-
-<p>You can not <gui>Shut Down</gui> the computer if multiple users are logged in.  Attempting to do so will only log you out.  Only one user can be logged in when attempting to <gui>Shut Down</gui> the computer.</p>
+<info>
+  <link type="seealso" xref="power-suspendhibernate"/>
+</info>
+<title>Suspend, shut down, or restart.</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 most of your computer's functions. A very small amount of
+power is still used during suspend.</p>
+
+<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>
+
+<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>
+
+<note><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>
 </section>
 </page>