summaryrefslogtreecommitdiffstats
path: root/gnome2-user-guide
diff options
context:
space:
mode:
authorJoachim Noreiko <joachimn@src.gnome.org>2006-03-08 22:30:15 +0000
committerJoachim Noreiko <joachimn@src.gnome.org>2006-03-08 22:30:15 +0000
commitc9e96bb5dcc3b3c4340760ce24c2dddec65bb54b (patch)
treeea5ffd0df4badeeb6e4f507f50e4b8ea02a4eb5a /gnome2-user-guide
parentcaa220373df02a3db977ab41d387f8b45903eb88 (diff)
downloadgnome-user-docs-c9e96bb5dcc3b3c4340760ce24c2dddec65bb54b.tar.gz
gnome-user-docs-c9e96bb5dcc3b3c4340760ce24c2dddec65bb54b.tar.xz
gnome-user-docs-c9e96bb5dcc3b3c4340760ce24c2dddec65bb54b.zip
more small updates to lock button
Diffstat (limited to 'gnome2-user-guide')
-rw-r--r--gnome2-user-guide/C/gospanel.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index aeba345..40f6907 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -1335,8 +1335,7 @@ If you do not want to terminate an application after you click on the <guibutton
</indexterm>
<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>
+again, you must enter your password.</para>
<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
@@ -1365,8 +1364,9 @@ the commands that are available from the menu.</para>
</para>
</entry>
<entry valign="top">
- <para>Activates the screensaver immediately, but does
-not lock the screen.</para>
+ <para>Activates the screensaver immediately.</para>
+ <para>This will also lock the screen if you have set <guilabel>Lock screen when screensaver is active</guilabel> in the
+<application>Screensaver</application> preference tool.</para>
</entry>
</row>
<row>
@@ -1387,7 +1387,7 @@ the same function as when you click on the <guibutton>Lock Screen</guibutton> bu
</para>
</entry>
<entry valign="top">
- <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>
+ <para>Opens the <link linkend="prefs-screensaver"><application>Screensaver</application> preference tool</link>, with which you can configure the type of screensaver that is displayed when you lock the screen.</para>
</entry>
</row>
</tbody>