Commit 859d1843 authored by bertagaz's avatar bertagaz
Browse files

Merge remote-tracking branch 'origin/doc/10970-screen-locker' into testing

Fix-committed: #10970
parents f74e5021 c3ee5596
......@@ -4,7 +4,7 @@ The desktop environment used in Tails is [GNOME](
This page describes some important features of the desktop in the context of
[[!toc levels=2]]
[[!toc levels=3]]
Top navigation bar
......@@ -190,6 +190,20 @@ manage your systems settings and your computer.
### Locking your screen
Click on the <span class="button">[[!img lib/network-wireless-encrypted.png alt="" class="symbolic" link="no"]]</span>
button in the system menu to lock your screen with a password.
- If you set up an [[administration password|first_steps/startup_options/administration_password]]
when starting Tails, you can unlock your screen with your administration
- Otherwise, you can set up a password to unlock your screen when locking your
screen for the first time.
[[!img screen-locker.png alt="Set a password to unlock your screen" link="no"]]
<a id="activities"></a>
Activities overview
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment