summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2018-03-11 19:51:37 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2018-03-11 19:51:37 +0100
commit859d1843c69f649c3e4c287be5107946365813e0 (patch)
tree2cb70577f03f2d1234d79bbe6541ca6b05993178
parentf74e502123eaa0a80fd3229d7ee181abdd3e010d (diff)
parentc3ee559644a470d828ba2c467ac4c7807acc41ae (diff)
Merge remote-tracking branch 'origin/doc/10970-screen-locker' into testing
Fix-committed: #10970
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn16
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/screen-locker.pngbin0 -> 10564 bytes
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.pngbin11271 -> 10224 bytes
-rw-r--r--wiki/src/lib/software-update-urgent.pngbin1117 -> 0 bytes
4 files changed, 15 insertions, 1 deletions
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
index cd86d79..c0d010c 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
@@ -4,7 +4,7 @@ The desktop environment used in Tails is [GNOME](https://www.gnome.org).
This page describes some important features of the desktop in the context of
Tails.
-[[!toc levels=2]]
+[[!toc levels=3]]
Top navigation bar
==================
@@ -190,6 +190,20 @@ manage your systems settings and your computer.
</div>
+### 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
+ password.
+
+- 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
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/screen-locker.png b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/screen-locker.png
new file mode 100644
index 0000000..b5ad236
--- /dev/null
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/screen-locker.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png
index 3609a4f..3a156c0 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png
Binary files differ
diff --git a/wiki/src/lib/software-update-urgent.png b/wiki/src/lib/software-update-urgent.png
deleted file mode 100644
index 6b1ca50..0000000
--- a/wiki/src/lib/software-update-urgent.png
+++ /dev/null
Binary files differ