[gnome-user-docs] [g-h]renamed shell-session to shell-exit



commit 370030dfde539624261cd869f7a53b119f5debb4
Author: Tiffany Antopolski <tiffany antopolski com>
Date:   Tue Mar 15 19:23:31 2011 -0400

    [g-h]renamed shell-session to shell-exit

 .../C/{shell-session.page => shell-exit.page}      |   46 +++++++++++++-------
 gnome-help/Makefile.am                             |    4 +-
 2 files changed, 32 insertions(+), 18 deletions(-)
---
diff --git a/gnome-help/C/shell-session.page b/gnome-help/C/shell-exit.page
similarity index 66%
rename from gnome-help/C/shell-session.page
rename to gnome-help/C/shell-exit.page
index 6a4223f..ef01d40 100644
--- a/gnome-help/C/shell-session.page
+++ b/gnome-help/C/shell-exit.page
@@ -1,13 +1,13 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="guide"
-      id="shell-session">
+      id="shell-exit">
 
   <info>
 
     <link type="guide" xref="index#shell"/>
 
-    <desc>Lock, hibernate or shutdown?</desc>
-    <revision pkgversion="3.0" version="0.1" date="2011-02-24" status="review"/>
+    <desc>Lock screen, switch user, log out or suspend or shutdown?</desc>
+    <revision pkgversion="3.0" version="0.1" date="2011-02-24" status="candidate"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
@@ -16,7 +16,12 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Computer Shutdown Options</title>
+<title>Computer Shut Down Options</title>
+<note>
+ <p>
+  From the login screen, you can click on the bottom right hand corner to bring up the shut down option menu.  Select <gui>Suspend</gui>, <gui>Restart</gui> or <gui>Shut Down</gui>.
+ </p>
+</note>
 
 <section id = "logout"><title>Logout or Switch User</title>
 <steps>
@@ -27,7 +32,7 @@
  </item>
   <item>
   <p>
-    You can now select <gui> Logout </gui> or <gui> Switch User </gui> by clicking on the option of choice.
+    You can now select <gui>Logout</gui>or<gui>Switch User</gui> by clicking on the option of choice.
   </p>
   <terms>
    <item>
@@ -40,7 +45,7 @@
     </item>
     <item>
     <title>
-    Switch user
+    Switch Between Users
     </title>
     <p>
     Suspends your session, allowing another user to log in and use the computer.
@@ -50,7 +55,7 @@
  </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.
+    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>
@@ -66,7 +71,7 @@
  <list>
  <item>
   <p>
-  Press <keyseq><key> Ctrl </key><key> Alt </key><key> L </key></keyseq>, or
+  Press <keyseq><key>Ctrl</key><key>Alt</key><key>L</key></keyseq>, or
   </p>
  </item>
   <item>
@@ -90,27 +95,36 @@ If more than one user has an account on the computer and the screen is locked, o
 </section>
 
 <section id = "shut-down"><title>Shut Down Options</title>
-<p>To shutdown your computer: </p>
+
+<note>
+ <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>
+ </note>
+<p>To shutdown your computer:</p>
 <steps>
  <item>
   <p>
-    Click on your user name in the top right hand corner of the monitor.
+    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>
-    Select <gui> Shutdown </gui> by clicking on it.
-  </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:
+    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>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 3c17f00..057646c 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -133,10 +133,10 @@ DOC_PAGES = \
 	shell-apps-install.page \
 	shell-apps-open.page \
 	shell-apps-search.page \
-	shell-files.page \
+	shell-exit.page \
+        shell-files.page \
 	shell-notifications.page \
 	shell-prefs.page \
-	shell-session.page \
 	shell-session-status.page \
 	shell-windows-lost.page \
 	shell-windows.page \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]