summaryrefslogtreecommitdiffstats
path: root/gnome2-user-guide/C
diff options
context:
space:
mode:
authorJoachim Noreiko <joachimn@src.gnome.org>2006-03-08 22:22:40 +0000
committerJoachim Noreiko <joachimn@src.gnome.org>2006-03-08 22:22:40 +0000
commitcaa220373df02a3db977ab41d387f8b45903eb88 (patch)
tree503aebd30afc6e4487d946f3a499469e669e5c78 /gnome2-user-guide/C
parentc2b35a486939eae5b731dc66804b48fd20ac3d4e (diff)
downloadgnome-user-docs-caa220373df02a3db977ab41d387f8b45903eb88.tar.gz
gnome-user-docs-caa220373df02a3db977ab41d387f8b45903eb88.tar.xz
gnome-user-docs-caa220373df02a3db977ab41d387f8b45903eb88.zip
added link in lock screen button to screensaver prefs
changed name to 'Lock Screen Button' to match interface.
Diffstat (limited to 'gnome2-user-guide/C')
-rw-r--r--gnome2-user-guide/C/ChangeLog8
-rw-r--r--gnome2-user-guide/C/gospanel.xml18
-rw-r--r--gnome2-user-guide/C/gosstartsession.xml6
3 files changed, 21 insertions, 11 deletions
diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 158a645..7241c70 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-08 Joachim Noreiko <jnoreiko@yahoo.com>
+
+ * gospanel.xml:
+ added link in lock screen button to screensaver prefs
+ changed name to 'Lock Screen Button' to match interface.
+ * gosstartsession.xml:
+ changed name to 'Lock Screen Button' to match interface.
+
2006-03-02 Joachim Noreiko <jnoreiko@yahoo.com>
* goscustdesk.xml:
diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index 1325413..aeba345 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -1305,8 +1305,10 @@ an application that does not respond to your commands. </para>
button, then click on a window from the application that you want to terminate.
If you do not want to terminate an application after you click on the <guibutton>Force Quit</guibutton> button, press <keycap>Esc</keycap>.</para>
</section>
- <section id="gospanel-21">
- <title>Lock Button</title>
+ <section id="panel-lock-screen">
+ <title>Lock Screen Button</title>
+ <!-- preserve id for backwards compatibility: 2.12 -->
+ <anchor id="gospanel-21"/>
<screenshot>
<mediaobject>
<imageobject>
@@ -1331,13 +1333,13 @@ If you do not want to terminate an application after you click on the <guibutton
<indexterm>
<primary>locking screen</primary>
</indexterm>
- <para>The <guibutton>Lock</guibutton>
+ <para>The <guibutton>Lock Screen</guibutton>
button locks your screen and activates your screensaver. To access your session
again, you must enter your password. To lock your screen correctly, you must
have a screensaver enabled.</para>
- <para>To add a <guibutton>Lock</guibutton> button to a panel, right-click
-on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Lock</guimenuitem></menuchoice>. </para>
- <para>Right-click on the <guibutton>Lock</guibutton> button to open a menu
+ <para>To add a <guibutton>Lock Screen</guibutton> button to a panel, right-click
+on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then choose <application>Lock Screen</application> from the Add to Panel dialog. See <xref linkend="panels-addobject"/> for more on this.</para>
+ <para>Right-click on the <guibutton>Lock Screen</guibutton> button to open a menu
of screensaver-related commands. <xref linkend="gosstartsession-TBL-83"/> describes
the commands that are available from the menu.</para>
<table frame="topbot" id="gosstartsession-TBL-83">
@@ -1375,7 +1377,7 @@ not lock the screen.</para>
</entry>
<entry valign="top">
<para>Locks the screen immediately. This command performs
-the same function as when you click on the <guibutton>Lock</guibutton> button.</para>
+the same function as when you click on the <guibutton>Lock Screen</guibutton> button.</para>
</entry>
</row>
<row>
@@ -1385,7 +1387,7 @@ the same function as when you click on the <guibutton>Lock</guibutton> button.</
</para>
</entry>
<entry valign="top">
- <para>Displays the screensaver preference tool.</para>
+ <para>Opens the <link linkend="prefs-screensaver">screensaver preference tool</link>, with which you can configure the type of screensaver that is displayed when you lock the screen.</para>
</entry>
</row>
</tbody>
diff --git a/gnome2-user-guide/C/gosstartsession.xml b/gnome2-user-guide/C/gosstartsession.xml
index 6955465..87ee3a3 100644
--- a/gnome2-user-guide/C/gosstartsession.xml
+++ b/gnome2-user-guide/C/gosstartsession.xml
@@ -149,9 +149,9 @@ one of the following actions:</para>
<para>Choose <menuchoice><guimenu>Desktop</guimenu><guimenuitem>Lock Screen</guimenuitem></menuchoice>.</para>
</listitem>
<listitem>
- <para>If the <guibutton>Lock</guibutton> button is present on a
-panel, click on the <guibutton>Lock</guibutton> button.</para>
- <note><para>The <guibutton>Lock</guibutton> is not present on the panels by default. To add it, see <xref linkend="panels-addobject"/>.</para></note>
+ <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>
</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>