Skip to content
Snippets Groups Projects
Commit 7490777c authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'cbrownstein/doc/16704-suspend-button' into doc/16704-suspend-button

parents 614a1763 b7cf8edd
Branches
No related tags found
No related merge requests found
......@@ -188,14 +188,14 @@ manage your settings, connect to a Wi-Fi network, and restart your computer.
From the system menu, you can choose which Wi-Fi network to connect to.
See also the documentation on [[connecting to the network|anonymous_internet/networkmanager]].
See also the documentation on [[connecting to a network|anonymous_internet/networkmanager]].
### System settings
Click on the [[!img lib/preferences-system.png alt="Settings" class="symbolic" link="no"]]
button to edit your system settings.
These settings won't saved when you restart Tails.
These settings will not be saved when you restart Tails.
<a id="screen-locker"></a>
......@@ -227,7 +227,7 @@ button to lock your screen with a password.
Click on the [[!img lib/media-playback-pause.png alt="Suspend" class="symbolic" link="no"]]
button to suspend your computer.
When suspended, your computer is not computing anymore but is still powered on,
While suspended, your computer is not computing anymore but is still powered on,
like if it was standing still but still alive.
To resume from suspend and go back to the Tails desktop, push the power button
......@@ -235,7 +235,7 @@ of your computer.
<div class="caution">
<p>If you remove your Tails USB stick while suspended, the computer won't
<p>If you remove your Tails USB stick while suspended, your computer will not
shut down immediately and will only shut down when resuming.</p>
<p>An attacker with physical access to your computer and capable of finding
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment