GNOME.org
 

Update to gosstartsession.xml

Hi guys,

I've attached a patch to
gnome-user-docs/trunk/gnome2-user-guide/C/gosstartsession.xml. The
following changes have been made:

      * Several small changes to correct typos, incorrect grammar and
        confusing wording.
      * Briefly documented new features such as user switching and the
        ability to leave messages when the screen is locked.
      * Clarified instructions on logging-in.
      * Completely rewrote the "Managing the Session" section to reflect
        the new Session capplet layout. Renamed the section to "Setting
        Programs to Start Automatically When You Log In". This change
        was performed in collaboration with Vignesh from the Ubuntu doc
        team.

With this patch applied, this section of the user guide should be
up-to-date for GNOME 2.24.

Thanks,

Phil

-- 
Phil Bull
https://launchpad.net/people/philbull

Index: gnome2-user-guide/C/gosstartsession.xml
===================================================================
--- gnome2-user-guide/C/gosstartsession.xml	(revision 1041)
+++ gnome2-user-guide/C/gosstartsession.xml	(working copy)
@@ -17,10 +17,10 @@
       <primary>sessions</primary>
       <secondary>starting</secondary>
     </indexterm>
-    <para>A <firstterm>session</firstterm> is the period of time you spend using GNOME. During a session, you use your applications, print, browse the web, and so on.</para>
+    <para>A <firstterm>session</firstterm> is the period of time you spend using GNOME, between logging in and logging out. During a session, you use your applications, print, browse the web, and so on.</para>
     <para>Logging in to GNOME begins your session. The login screen is your gateway to the GNOME Desktop: it is where you enter your username and password and select options such as the language you want GNOME to use for your session.</para>
     <tip><para>
-    Normally, logging out ends the session, but you can choose to save the state of your session and restore it next time you use GNOME: see <xref linkend="prefs-sessions"/>.</para></tip>
+    Normally, logging out ends the session, but you can choose to save the state of your session and restore it next time you use GNOME: see <xref linkend="gosstartsession-2"/>.</para></tip>
     
     <!--
     2.14 has moved all this out of the standard dialogs.
@@ -58,7 +58,9 @@
       <orderedlist>
         <listitem>
           <para>On the login screen, click on the <guilabel>Session</guilabel>
-icon. Choose the GNOME Desktop from the list of available desktop environments.</para>
+icon. Choose the GNOME Desktop from the list of available desktop environments. 
+Most users will not need to perform this step, as GNOME is usually the default 
+desktop environment already.</para>
         </listitem>
         <listitem>
           <para>Enter your username in the <guilabel>Username</guilabel> field
@@ -69,14 +71,19 @@
 on the login screen, then press <keycap>Return</keycap>.</para>
         </listitem>
       </orderedlist>
-      <para>When you log in successfully, you will see a splash informing you of the steps GNOME is taking to start up. When GNOME is ready, you will see the Desktop and you can begin using your computer.</para>
-      <para>The first time you log in, then the session manager starts a new
-session. If you have logged in before, then the session manager restores your
-previous session, if you saved the settings for the previous session when
-you logged out.</para>
+      <para>When you log in successfully, GNOME will take a short amount of time to start up. When it is ready, you will see the Desktop and you can begin using your computer.</para>
+      <para>The first time you log in, the session manager starts a new
+session. If you have logged in before and saved the settings for the previous 
+session when you logged out, then the session manager restores your
+previous session.</para>
       <para>If you want to shut down or restart the system before you log in, click
 on the <guilabel>System</guilabel> icon on the login screen. A dialog is displayed.
 Select the option that you require, then click <guibutton>OK</guibutton>.</para>
+      <para>Your system distributor or vendor may have altered the login screen 
+      so that it no longer has a <guilabel>System</guilabel> icon. In this case, 
+      the option to shut down the computer may be found by clicking the 
+      <guilabel>Other</guilabel> icon, or by clicking a separate 
+      <guibutton>Shut Down</guibutton> button.</para>
 <!--What about failsafe gnome?-->
     </sect2>
     <sect2 id="gosstartsession-86">
@@ -110,10 +117,17 @@
         </listitem>
       </orderedlist>
       <note>
-        <para>When you log in to a session in a different language, you choose
-the language for the user interface. You do not specify a keyboard layout
-for the session. To choose a keyboard layout, use the <ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application></ulink> applet.</para>
+        <para>When you log in to a session in a different language, you are changing 
+the language for the user interface but are not changing the keyboard layout. 
+To choose a different keyboard layout, use the 
+<ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application></ulink> applet.</para>
       </note>
+      <tip>
+        <para>Your system distributor or vendor may have altered the login 
+        screen so that it no longer has a <guilabel>Language</guilabel> icon. 
+        In this case, the option to shut down the computer may be found by 
+        clicking the <guilabel>Other</guilabel> icon.</para>
+      </tip>
     </sect2>
   </sect1>
   <sect1 id="lock-screen">
@@ -140,7 +154,7 @@
     <indexterm>
       <primary>Lock button</primary>
     </indexterm>
-    <para>Locking your screen allows you to leave your computer unattended and prevent access to your applications and information. While your screen is locked, the <link linkend="prefs-screensaver">screensaver</link> runs.</para>
+    <para>Locking your screen prevents access to your applications and information, allowing you to leave your computer unattended. While your screen is locked, the <link linkend="prefs-screensaver">screensaver</link> runs.</para>
     
     <para>To lock the screen, perform
 one of the following actions:</para>
@@ -151,127 +165,115 @@
       <listitem>
         <para>If the <guibutton>Lock Screen</guibutton> button is present on a
 panel, click on the <guibutton>Lock Screen</guibutton> button.</para>
-        <note><para>The <guibutton>Lock Screen</guibutton> is not present on the panels by default. To add it, see <xref linkend="panels-addobject"/>.</para></note>
+        <note><para>The <guibutton>Lock Screen</guibutton> button is not present on the panels by default. To add it, see <xref linkend="panels-addobject"/>.</para></note>
       </listitem>
     </itemizedlist>
     <para>To unlock the screen, move your mouse or press any key, enter your password in the locked screen dialog, then press <keycap>Return</keycap>.</para>
+    <para>If another user wants to use the computer while it is locked, they can move the mouse or press a key and then click <guibutton>Switch User</guibutton>. The login screen will be displayed and they can log in using their user account. They will not be able to access any of your applications or information. When they log out, the screen will be locked again and you can access your session by unlocking the screen.</para>
+  <para>You can leave a message for a user who has locked their screen. Move the mouse or press any key and then click <guibutton>Leave Message</guibutton>. Type your message into the box and press <guibutton>Save</guibutton>. Your message will be displayed when the user unlocks their screen.</para>
+  </sect1>
 
-    <!--
-    <para>If you share your computer with others, the one can switch the user and start a new session; when finish and end his session, you can unlock your screen as above.</para> -->
-  
-  </sect1>
   <sect1 id="gosstartsession-2">
-    <title>Managing the Session</title>
+    <title>Setting Programs to Start Automatically When You Log In</title>
     <indexterm>
       <primary>preference tools</primary>
       <secondary>Sessions</secondary>
     </indexterm>
     <indexterm>
       <primary>sessions</primary>
-      <secondary>managing</secondary>
+      <secondary>startup</secondary>
     </indexterm>
-    <para>To configure the session management of the GNOME Desktop,
-use the <application>Sessions</application> preference tool. The <application>Sessions</application> preference tool recognizes the following types of application: </para>
-    <itemizedlist>
-      <listitem>
-        <indexterm>
-          <primary>startup applications</primary>
-          <secondary>session-managed</secondary>
-        </indexterm>
-        <para>Applications that are session-managed. When
-you save the settings for your session, the session manager saves all of the
-session-managed applications. If you log out, then log in again, the session
-manager automatically starts the session-managed applications. </para>
-      </listitem>
-      <listitem>
-        <para>Applications that are not session-managed. When you save the
-settings for your session, the session manager does not save any applications
-that are not session-managed. If you log out, then log in again, the session
-manager does not start non-session-managed applications. You must start the
-application manually. Alternatively, you can use the <application>Sessions</application> preference tool to specify non-session-managed applications
-that you want to automatically start. </para>
-      </listitem>
-    </itemizedlist>
-    <sect2 id="gosstartsession-9">
-      <title>Defining Session Behavior When You Log In and Log Out</title>
-      <indexterm>
-        <primary>sessions</primary>
-        <secondary>login behavior</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>sessions</primary>
-        <secondary>logout behavior</secondary>
-      </indexterm>
-      <para>To set how a session behaves when you log in
-and log out, use <application>Sessions</application> preference tool. Make
-the changes you require in the <guilabel>Session Options</guilabel> tabbed
-section. For example, you can select to display a splash screen when you log
-in. </para>
+  <para>You can choose for certain programs to be started automatically when 
+  you log in to a session. For example, you might want a web browser to be started 
+  as soon as you log in. Programs which start automatically when you log in are 
+  called <firstterm>startup programs</firstterm>. Startup programs are 
+  automatically saved and safely closed by the session manager when you log 
+  out, and are restarted when you log in.</para>
+  <para>The <application>Sessions</application> preference tool allows you to 
+  define which programs are started automatically when you log in. It has two 
+  tabs, the <guilabel>Startup Programs</guilabel> tab and the 
+  <guilabel>Options</guilabel> tab.</para>
+
+    <sect2 id="gosstartsession-21">
+        <!-- Preserve IDs for backwards compatibility -->
+        <anchor id="gosstartsession-6"/>
+        <anchor id="gosstartsession-10"/>
+      <title>Startup Programs Tab</title>
+      <para>You can use the Startup Programs tab to add, modify, and 
+      remove startup programs.</para>
+      <para>A list of startup programs is displayed on this tab. The list shows 
+      a short description of each program, along with a checkbox which denotes 
+      whether the startup program is enabled or not. Programs which are not 
+      enabled will not be started automatically when you log in.</para>
+
+      <sect3 id="gosstartsession-211">
+       <title>Enabling/Disabling Startup Programs</title>
+       <para>To enable a program to start up automatically, check the checkbox 
+       corresponding to that program.</para>
+       <para>To disable a program from starting automatically, uncheck the 
+       checkbox.</para>
+      </sect3>
+      <sect3 id="gosstartsession-212">
+       <title>Adding A New Startup Program</title>
+       <para>To add a new startup program, perform the following steps:</para>
+       <procedure>
+        <step>
+         <para>Click <guibutton>Add</guibutton>. This will open the 
+         <application>Add Startup Program</application> dialog box.</para>
+        </step>
+        <step>
+         <para>Use the <guilabel>Name</guilabel> text box to specify a name for 
+         the new startup program.</para>
+        </step>
+        <step>
+         <para>Use the <guilabel>Command</guilabel> text box to specify the 
+         command which will invoke the application. For example, the command 
+         <userinput>gedit</userinput> will start the <application>Gedit Text 
+         Editor</application>. If you do not know the exact command, click 
+         <guibutton>Browse</guibutton> to choose the path of the command.</para>
+        </step>
+        <step>
+         <para>Enter a description of the application in the 
+         <guilabel>Comments</guilabel> text box. You will see this as the 
+         description of the program in the list of startup programs.</para>
+        </step>
+        <step>
+         <para>Click <guibutton>Add</guibutton>. The application will be added 
+         to the list of startup programs with its checkbox in the checked 
+         (enabled) state.</para>
+        </step>
+       </procedure>
+      </sect3>
+      <sect3 id="gosstartsession-213">
+       <title>Removing A Startup Program</title>
+       <para>To remove a startup program, select it from the list of startup 
+       programs and click <guibutton>Remove</guibutton>.</para>
+      </sect3>
+      <sect3 id="gosstartsession-214">
+       <title>Editing A Startup Program</title>
+       <para>To edit an existing startup program, select it from the list of 
+       startup programs and click <guibutton>Edit</guibutton>. A dialog will 
+       appear which allows you to edit the properties of the program. See 
+       <xref linkend="gosstartsession-212"/> for more information on the 
+       options available in this dialog.</para>
+      </sect3>
     </sect2>
-    <sect2 id="gosstartsession-6">
-      <title>To Use Startup Applications</title>
-      <indexterm>
-        <primary>startup programs</primary>
-        <see>startup applications</see>
-      </indexterm>
-      <indexterm>
-        <primary>sessions</primary>
-        <secondary>using startup
-applications</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>startup applications</primary>
-        <secondary>non-session-managed</secondary>
-      </indexterm>
-      <para>You
-can configure your sessions to start with applications that are not session-managed.
-To configure non-session-managed startup applications, use the <application>Sessions</application> preference tool. Use the <guilabel>Startup Programs</guilabel> tabbed section to add, edit, and delete applications. If you save
-your settings and log out, the next time that you log in, the startup applications
-start automatically. </para>
+    
+    <sect2 id="gosstartsession-22">
+        <!-- Preserve IDs for backwards compatibility -->
+        <anchor id="gosstartsession-9"/>
+        <anchor id="gosgetstarted-74"/>
+      <title>Session Options Tab</title>
+      <para>The session manager can remember which applications you have 
+      running when you log out and can automatically restart them when you log 
+      in again. If you would like this to happen every time you log out, check 
+      <guilabel>Automatically remember running applications when 
+      logging out</guilabel>. If you would like this to happen only once, click 
+      <guibutton>Remember Currently Running Application</guibutton> before 
+      logging out.</para>
     </sect2>
-    <sect2 id="gosstartsession-10">
-      <title>To Browse Applications in the Current Session</title>
-      <indexterm>
-        <primary>sessions</primary>
-        <secondary>browsing applications</secondary>
-      </indexterm>
-      <para>To browse the applications in the current session, use the <application>Sessions</application> preference tool. The <guilabel>Current Session</guilabel>
-tabbed section lists the following:</para>
-      <itemizedlist>
-        <listitem>
-          <para>All GNOME applications that are currently running, that can
-connect to the session manager, and that can save the state of the application.</para>
-        </listitem>
-        <listitem>
-          <para>All preference tools that can connect to the session manager,
-and that can save the state of the tool.</para>
-        </listitem>
-      </itemizedlist>
-      <para>You can use the <guilabel>Current Session</guilabel> tabbed section
-to perform a limited number of actions on the session properties of an application
-or preference tool. For example, you can edit the startup order, and restart
-style of any GNOME application or preference tool that is in the list. </para>
-    </sect2>
-    <sect2 id="gosgetstarted-74">
-      <title>To Save Session Settings</title>
-      <indexterm>
-        <primary>sessions</primary>
-        <secondary>saving settings</secondary>
-      </indexterm>
-      <para>To save your session settings, perform the following steps: </para>
-      <orderedlist>
-        <listitem>
-          <para>Configure your session to automatically save settings when
-you end the session. To configure your session, use the <application>Sessions</application> preference tool. The <application>Sessions</application> preference
-tool starts. Select the <guilabel>Automatically save changes to session</guilabel>
-option on the <guilabel>Session Options</guilabel> tabbed section.</para>
-        </listitem>
-        <listitem>
-          <para>End your session. </para>
-        </listitem>
-      </orderedlist>
-    </sect2>
   </sect1>
+  
   <sect1 id="shutdown">
     <title>Ending a Session</title>
     <!-- preserve id for backwards compatibility: 2.12 -->
@@ -309,15 +311,19 @@
     <para>When you have finished using your computer, you can choose to do one of the following:</para>
     <itemizedlist>
       <listitem>
-        <para>Log out for another user to begin working with it. To log out of GNOME, choose <menuchoice><guimenu>System</guimenu><guimenuitem>Log Out <replaceable>username</replaceable></guimenuitem></menuchoice> <!-- Translators: your locale might only have a "Log Out" label in the menu if "Log Out username" is not valid. In this case, remove "<replaceable>username</replaceable>". -->.</para>
+        <para>Log out, leaving the computer ready for another user to begin working with it. To log out of GNOME, choose <menuchoice><guimenu>System</guimenu><guimenuitem>Log Out <replaceable>username</replaceable></guimenuitem></menuchoice> <!-- Translators: your locale might only have a "Log Out" label in the menu if "Log Out username" is not valid. In this case, remove "<replaceable>username</replaceable>". -->.</para>
       </listitem>
       <listitem>
-        <para>Shut down your computer and switch off the power. To shut down, choose <menuchoice><guimenu>System</guimenu><guimenuitem>Shut Down</guimenuitem></menuchoice>.</para>
+        <para>Shut down your computer and switch off the power. To shut down, choose <menuchoice><guimenu>System</guimenu><guimenuitem>Shut Down</guimenuitem></menuchoice> and click <guibutton>Shut Down</guibutton> on the dialog that appears.</para>
       </listitem>
       <listitem>
-        <para>Depending on your computer's configuration, you can also <firstterm>Hibernate</firstterm> your computer. During hibernation, less power is used, but the state of your computer is preserved: all the applications you have running and open documents.</para>
+        <para>Depending on your computer's configuration, you can also <firstterm>Hibernate</firstterm> your computer. During hibernation, less power is used, but all of the applications and documents that you have open are preserved and will still be open when you resume from hibernation. You can resume from hibernation by moving your mouse or pressing a key.</para>
       </listitem>
-    </itemizedlist>    
+    </itemizedlist>
+    
+    <note>
+        <para>Some vendors and distributors allow you to hibernate your computer in two ways, often called Hibernate and <firstterm>Suspend</firstterm>. Both of these will preserve your open files and applications, but one will switch off the power to your computer while the other will leave the computer running in a state that uses less power.</para>
+    </note>
        
     <para>When you end a session, applications with unsaved work will warn you. You can choose to save your work, or cancel the command to log out or shut down.</para>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]