Commit bf3ebbe2 authored by sajolida's avatar sajolida
Browse files

Apply style guide

parent 866a2e59
<div class="caution">
<p><strong>The use of a persistent volume in a system which is designed to provide
<p><strong>The use of the Persistent Storage in a system which is designed to provide
anonymity and leave no trace is a complicated issue.</strong><br/>
[[Read carefully the warning section.|persistence/warnings]]</p>
......
[[!meta title="Encrypted persistence"]]
[[!meta title="Encrypted Persistent Storage"]]
If you start Tails from a USB stick, you can create a
persistent volume in the free space left on the USB stick.
The files in the persistent
volume are saved encrypted and remain available across separate working sessions.
Persistent Storage in the free space left on the USB stick.
The files in the Persistent
Storage are saved encrypted and remain available across separate working sessions.
You can use this persistent volume to store any of the following:
You can use this Persistent Storage to store any of the following:
- Personal files
- Some settings
- Additional software
- Encryption keys
The persistent volume is an encrypted partition protected by a passphrase.
The Persistent Storage is an encrypted partition protected by a passphrase.
Once the persistent volume is created, you can choose to activate it or not
Once the Persistent Storage is created, you can choose to unlock it or not
each time you start Tails.
[[!inline pages="doc/first_steps/persistence.caution" raw="yes" sort="age"]]
How to use the persistent volume
How to use the Persistent Storage
=================================
- [[Warnings about persistence|first_steps/persistence/warnings]]
- [[Create & configure the persistent volume|first_steps/persistence/configure]]
- [[Enable & use the persistent volume|first_steps/persistence/use]]
- [[Manually copy your persistent data to a new USB stick|first_steps/persistence/copy]]
- [[Delete the persistent volume|first_steps/persistence/delete]]
- [[Warnings about the Persistent Storage|first_steps/persistence/warnings]]
- [[Create & configure the Persistent Storage|first_steps/persistence/configure]]
- [[Unlock & use the Persistent Storage|first_steps/persistence/use]]
- [[Manually copy the data of your Persistent Storage to a new USB stick|first_steps/persistence/copy]]
- [[Delete the Persistent Storage|first_steps/persistence/delete]]
[[!meta title="Create & configure the persistent volume"]]
[[!meta title="Create & configure the Persistent Storage"]]
[[!inline pages="doc/first_steps/persistence.caution" raw="yes" sort="age"]]
[[!toc levels=3]]
To start the persistent volume assistant, choose
To open the Persistent Storage settings, choose
<span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
<span class="guisubmenu">Tails</span>&nbsp;▸
......@@ -13,20 +13,20 @@ To start the persistent volume assistant, choose
<div class="note">
The error message <span class="emphasis">Error, Persistence partition is not
unlocked.</span> means that the persistent volume was not enabled from
unlocked.</span> means that the Persistent Storage was not unlocked in
the Welcome Screen. So you can not configure it
but you can delete it and create a new one.
</div>
When run for the first time, or after [[deleting the persistent
volume|delete]], the assistant proposes to create a new persistent volume on
When run for the first time, or after [[deleting the Persistent
Storage|delete]], the assistant proposes to create a new Persistent Storage on
the USB stick. Refer to our [[installation
instructions|install/clone#create-persistence]] for more guidance on
creating the persistent volume.
creating the Persistent Storage.
Persistence features
====================
Features of the Persistent Storage
==================================
<div class="note">
......@@ -51,10 +51,10 @@ for more details.
<div class="bug" id="deselect">
<p>If you deselect a feature that used to be activated, it will be
deactivated after restarting Tails but the
<p>If you turn off a feature, it will be
turned off after restarting Tails but the
[[corresponding files|doc/first_steps/persistence/copy#feature_files]]
will remain on the persistent volume.</p>
will remain in the Persistent Storage.</p>
<p>To delete the files corresponding to a feature:</p>
......@@ -94,7 +94,7 @@ will remain on the persistent volume.</p>
<div class="text"><h2>Personal Data</h2></div>
</div>
When this feature is activated, you can save your personal files and working
When this feature is turned on, you can save your personal files and working
documents in the <span class="filename">Persistent</span> folder.
To open the <span class="filename">Persistent</span> folder, choose
......@@ -109,9 +109,9 @@ To open the <span class="filename">Persistent</span> folder, choose
<div class="text"><h2>Browser Bookmarks</h2></div>
</div>
When this feature is activated, changes to the bookmarks in
When this feature is turned on, changes to the bookmarks in
[[<span class="application">Tor Browser</span>|doc/anonymous_internet/Tor_Browser]]
are saved in the persistent volume. This does not apply to the
are saved in the Persistent Storage. This does not apply to the
[[<span class="application">Unsafe Browser</span>|doc/anonymous_internet/unsafe_browser]].
<a id="network_connections"></a>
......@@ -121,9 +121,9 @@ are saved in the persistent volume. This does not apply to the
<div class="text"><h2>Network Connections</h2></div>
</div>
When this feature is activated, the
When this feature is turned on, the
[[configuration of the network devices and connections|doc/anonymous_internet/networkmanager]]
is saved in the persistent volume.
is saved in the Persistent Storage.
<a id="additional_software"></a>
......@@ -132,13 +132,13 @@ is saved in the persistent volume.
<div class="text"><h2>Additional Software</h2></div>
</div>
When this feature is enabled, a list of
When this feature is turned on, a list of
[[additional software|doc/first_steps/additional_software]] of
your choice is automatically installed every
time you start Tails.
The corresponding software packages are stored in the
persistent volume. They are automatically upgraded for security after
Persistent Storage. They are automatically upgraded for security after
a network connection is established.
<div class="caution">
......@@ -156,9 +156,9 @@ so [[be careful with what you install|additional_software#warning]].</p>
<div class="text"><h2>Printers</h2></div>
</div>
When this feature is activated, the
When this feature is turned on, the
[[configuration of the printers|doc/sensitive_documents/printing_and_scanning]]
is saved in the persistent volume.
is saved in the Persistent Storage.
<a id="thunderbird"></a>
......@@ -167,10 +167,10 @@ is saved in the persistent volume.
<div class="text"><h2>Thunderbird</h2></div>
</div>
When this feature is activated, the configuration and emails stored
When this feature is turned on, the configuration and emails stored
by the
[[<span class="application">Thunderbird</span> email client|doc/anonymous_internet/thunderbird]]
are saved in the persistent volume.
are saved in the Persistent Storage.
<a id="gnupg"></a>
......@@ -179,8 +179,8 @@ are saved in the persistent volume.
<div class="text"><h2>GnuPG</h2></div>
</div>
When this feature is activated, the OpenPGP keys that you create or import are
saved in the persistent volume.
When this feature is turned on, the OpenPGP keys that you create or import are
saved in the Persistent Storage.
<div class="caution">
......@@ -198,9 +198,9 @@ weaken the encryption defaults or render GnuPG unusable.
<div class="text"><h2>Bitcoin Client</h2></div>
</div>
When this feature is activated, the bitcoin wallet and preferences of
When this feature is turned on, the bitcoin wallet and preferences of
the [[*Electrum* bitcoin client|anonymous_internet/electrum]] are saved in the
persistent volume.
Persistent Storage.
<a id="pidgin"></a>
......@@ -209,9 +209,9 @@ persistent volume.
<div class="text"><h2>Pidgin</h2></div>
</div>
When this feature is activated, all the configuration files of the
When this feature is turned on, all the configuration files of the
[[<span class="application">Pidgin</span> Internet messenger|doc/anonymous_internet/pidgin]]
are saved in the persistent volume:
are saved in the Persistent Storage:
- The configuration of your accounts, buddies and chats.
- Your OTR encryption keys and keyring.
......@@ -228,8 +228,8 @@ is no need to manually edit or overwrite the configuration files.
<div class="text"><h2>SSH Client</h2></div>
</div>
When this feature is activated, all the files related to the secure-shell client
are saved in the persistent volume:
When this feature is turned on, all the files related to the secure-shell client
are saved in the Persistent Storage:
- The SSH keys that you create or import
- The public keys of the hosts you connect to
......@@ -252,7 +252,7 @@ encryption defaults or render SSH unusable.
<div class="text"><h2>Dotfiles</h2></div>
</div>
When this feature is activated, all the files in the <span
When this feature is turned on, all the files in the <span
class="filename">/live/persistence/TailsData_unlocked/dotfiles</span> folder
are linked in the <span class="filename">Home</span> folder. Files in
subfolders of <span class="filename">dotfiles</span> are also linked
......@@ -287,7 +287,7 @@ hidden configuration files in the root of your home directory, like
class="filename">~/.bashrc</span>.
As you can see in the previous example, empty folders are ignored. This feature
only links files, and not folders, from the persistent volume into the <span
only links files, and not folders, from the Persistent Storage into the <span
class="filename">Home</span> folder.
<a id="displays"></a>
......@@ -298,7 +298,7 @@ If you have more than one display (for example, two monitors or a
projector), you can save the configuration of your displays using the
<span class="guilabel">Dotfiles</span> feature.
1. Activate the <span class="guilabel">Dotfiles</span> feature and restart Tails.
1. Turn on the <span class="guilabel">Dotfiles</span> feature and restart Tails.
1. Open the <span class="application">Settings</span> utility.
......
[[!meta title="Make a backup of your persistent volume"]]
[[!meta title="Make a backup of your Persistent Storage"]]
These instructions explain how to back up your persistent volume to
These instructions explain how to back up your Persistent Storage to
another Tails USB stick.
[[!toc]]
......@@ -24,22 +24,22 @@ able to replace it immediately with your backup Tails.
1. Shutdown and unplug your current Tails USB stick.
1. Restart on your backup Tails and create a persistent volume on it.
1. Restart on your backup Tails and create a Persistent Storage on it.
For detailed instructions, see how to [[create & configure the
persistent volume|doc/first_steps/persistence/configure]].
Persistent Storage|doc/first_steps/persistence/configure]].
<div class="tip">
<p>We recommend using the same passphrase as your current Tails
so that the passphrase is easier to remember.</p>
</div>
1. When the persistent volume configuration shows a list of the possible
persistence features, click <span class="button">Save</span> and
1. When the Persistent Storage settings shows a list of possible
features, click <span class="button">Save</span> and
exit.
The backup process described below overrides the configuration of the
persistent volume. So, it does not matter which features are enabled
when you create the persistent volume.
Persistent Storage. So, it does not matter which features you turn on
when creating the Persistent Storage.
1. Shutdown and unplug your backup Tails USB stick.
......@@ -48,7 +48,7 @@ Create or update your backup
1. Start on your current Tails, set up an [[administration
password|doc/first_steps/welcome_screen/administration_password]], and
unlock the persistent volume.
unlock the Persistent Storage.
1. Choose
<span class="menuchoice">
......@@ -79,13 +79,13 @@ Create or update your backup
</span>
to open a terminal with administration rights.
1. Execute the following command to backup your persistent volume:
1. Execute the following command to backup your Persistent Storage:
<div class="caution">
<p>Make sure to execute this command <strong>from the Tails that you
want to back up</strong>: your current Tails. If you run this command from your
backup Tails instead, you will delete the persistent volume on your
backup Tails instead, you will delete the Persistent Storage on your
current Tails.</p>
</div>
......
[[!meta title="Delete the persistent volume"]]
[[!meta title="Delete the Persistent Storage"]]
<div class="caution">
<p>This technique is fast but might not prevent a strong attacker from
recovering files from the old persistent volume using advanced [[data
recovering files from the old Persistent Storage using advanced [[data
recovery techniques|encryption_and_privacy/secure_deletion#why]].</p>
<p>To securely delete the persistent volume, you have to [[securely
<p>To securely delete the Persistent Storage, you have to [[securely
delete the entire USB stick|encryption_and_privacy/secure_deletion#erase-device]],
which is a much slower operation.</p>
</div>
1. Start Tails from the USB stick on which you want to delete the
persistent volume.
Persistent Storage.
Do not enable the persistent volume in the Welcome Screen.
Keep the Persistent Storage locked in the Welcome Screen.
1. Choose
<span class="menuchoice">
......
[[!meta title="Enable & use the persistent volume"]]
[[!meta title="Unlock & use the Persistent Storage"]]
[[!inline pages="doc/first_steps/persistence.caution" raw="yes" sort="age"]]
[[!toc levels=1]]
Enable the persistent volume
============================
Unlock the Persistent Storage
=============================
When starting Tails, in the
<span class="guilabel">Encrypted Persistent Storage</span> section of
......@@ -14,8 +14,8 @@ the [[Welcome Screen|welcome_screen]], enter your passphrase and click
[[!img welcome_screen/persistence.png link="no" alt=""]]
Use the persistent volume
=========================
Use the Persistent Storage
==========================
To open the <span class="filename">Persistent</span> folder and access your
personal files and working documents, choose
......@@ -23,7 +23,7 @@ personal files and working documents, choose
<span class="guimenu">Places</span>&nbsp;▸
<span class="guimenuitem">Persistent</span></span>.
For advanced users, to access the internal content of the persistent volume
For advanced users, to access the internal content of the Persistent Storage
choose
<span class="menuchoice">
<span class="guimenu">Places</span>&nbsp;▸
......
[[!meta title="Warnings about persistence"]]
[[!meta title="Warnings about the Persistent Storage"]]
[[!toc levels=1]]
......@@ -7,11 +7,11 @@
Storing sensitive documents
===========================
**The persistent volume is not hidden.** An attacker in possession of
your USB stick can know that there is a persistent volume on it. Take into consideration
**The Persistent Storage is not hidden.** An attacker in possession of
your USB stick can know that there is a Persistent Storage on it. Take into consideration
that you can be forced or tricked to give out its passphrase.
Read also our instructions to [[securely delete the persistent volume|delete]].
Read also our instructions to [[securely delete the Persistent Storage|delete]].
<a id="overwriting_configurations"></a>
......@@ -19,7 +19,7 @@ Overwriting configurations
==========================
The programs included in Tails are carefully configured with security in
mind. If you use the persistence volume to overwrite the configuration
mind. If you use the Persistent Storage to overwrite the configuration
of the programs included in Tails, it can break this security or render
these programs unusable.
......@@ -35,10 +35,10 @@ configurations can break your anonymity.</strong>
Use to the minimum
==================
**Use the persistent volume only when necessary and to the minimum.** It is
always possible to start Tails without activating the persistent volume. All the
features of the persistent volume are optional and need to be explicitly
activated. Only the files and folders that you specify are saved.
**Use the Persistent Storage only when necessary and to the minimum.** It is
always possible to start Tails without unlocking the Persistent Storage. All the
features of the Persistent Storage are optional and need to be explicitly
turned on. Only the files and folders that you specify are saved.
<a id="open_other_systems"></a>
......
......@@ -16,12 +16,12 @@ There are several ways of shutting down Tails:
<div class="caution">
<p>This method might in rare occasions break the file system of your persistent
volume. <strong>Use this method only in case of emergency.</strong></p>
<p>This method might in rare occasions break the file system of your Persistent
Storage. <strong>Use this method only in case of emergency.</strong></p>
<p>If you cannot enable persistence after using this method, you should be able
to recover most of your data by doing a [[file system check on the persistent
volume|persistence/check_file_system]].</p>
to recover most of your data by doing a [[file system check on the Persistent
Storage|persistence/check_file_system]].</p>
</div>
......
......@@ -72,10 +72,10 @@ the Welcome Screen.
<a id="persistence"></a>
Encrypted persistence storage
=============================
Persistent Storage
==================
If an [[encrypted persistence storage|first_steps/persistence]] is detected on the USB stick, an
If a [[Persistent Storage|first_steps/persistence]] is detected on the USB stick, an
additional section appears in the Welcome Screen
below the **Language & Region**
section:
......@@ -129,7 +129,7 @@ Keyboard shortcuts
<tr><td><span class="keycap">Alt+L</span></td><td><span class="guilabel">Language</td></tr>
<tr><td><span class="keycap">Alt+K</span></td><td><span class="guilabel">Keyboard Layout</td></tr>
<tr><td><span class="keycap">Alt+F</span></td><td><span class="guilabel">Formats</td></tr>
<tr><td><span class="keycap">Alt+P</span></td><td><span class="guilabel">Encrypted Persistent Storage</td></tr>
<tr><td><span class="keycap">Alt+P</span></td><td><span class="guilabel">Persistent Storage</td></tr>
<tr><td><span class="keycap">Alt+A</span></td><td><span class="guilabel">Additional Settings</td></tr>
<tr><td><span class="keycap">Ctrl+Shift+A</span></td><td><span class="guilabel">Administration Password</td></tr>
<tr><td><span class="keycap">Ctrl+Shift+M</span></td><td><span class="guilabel">MAC Address Spoofing</td></tr>
......
......@@ -49,7 +49,7 @@ How to use bridges in Tails
You must have at hand at least one bridge address before
starting Tails. For example, you can write it down on a piece of paper
or store it in the [[persistent volume|doc/first_steps/persistence]].
or store it in the [[Persistent Storage|doc/first_steps/persistence]].
Tails allows you to use bridges of the following types:
......
<div class="next">
To learn how to save your working documents encrypted in your Tails USB stick, read
our documentation on [[persistence|first_steps/persistence]].
our documentation on the [[Persistent Storage|first_steps/persistence]].
</div>
......@@ -18,9 +18,8 @@ the Linux Foundation.
<div class="tip">
To reuse the configuration of the printers across separate working
sessions, you can activate the [[<span class="guilabel">Printers</span>
persistence
feature|doc/first_steps/persistence/configure/#printers]].
sessions, you can turn on the [[<span class="guilabel">Printers</span>doc/first_steps/persistence/configure#printers]]
feature of the Persistent Storage.
</div>
Scanning
......
......@@ -6,7 +6,7 @@ and you might have to do a **manual upgrade**. This page describes both techniqu
<div class="note">
<p>Your persistent storage will be preserved by both automatic and
<p>Your Persistent Storage will be preserved by both automatic and
manual upgrades.</p>
</div>
......
......@@ -36,7 +36,7 @@ To repair your Tails USB stick, please try doing a [[manual upgrade|upgrade#manu
<div class="note">
<p>The persistent storage on the USB stick will be preserved.</p>
<p>The Persistent Storage on the USB stick will be preserved.</p>
</div>
......
......@@ -11,6 +11,6 @@ To fix this problem, please try to do a [[manual upgrade|upgrade#manual]].
<div class="note">
<p>The persistent storage on the USB stick will be preserved.</p>
<p>The Persistent Storage on the USB stick will be preserved.</p>
</div>
......@@ -47,8 +47,8 @@
<span class="upgrade">upgrade, click on the <span class="button">Upgrade</span> button.</span>
<div class="note upgrade">
<p>The persistent storage of your Tails USB stick will be preserved.</p>
<p class="upgrade-clone">The persistent storage of the other Tails will not be copied.</p>
<p>The Persistent Storage of your Tails USB stick will be preserved.</p>
<p class="upgrade-clone">The Persistent Storage of the other Tails will not be copied.</p>
</div>
1. Read the warning message in the confirmation dialog. Click
......
......@@ -36,11 +36,11 @@ our instructions until the end. Otherwise, have a look at our
</div>
<h1 id="create-persistence">Create an encrypted persistent storage (optional)</h1>
<h1 id="create-persistence">Create a Persistent Storage (optional)</h1>
<div class="step-image">[[!img install/inc/infography/create-persistence.png link="no" alt=""]]</div>
You can optionally create an *encrypted persistent storage* in the
You can optionally create an encrypted Persistent Storage in the
remaining free space on your
<span class="clone">new</span>
Tails USB stick to store any of the following:
......@@ -50,15 +50,15 @@ Tails USB stick to store any of the following:
- Additional software
- Encryption keys
The data in the encrypted persistent storage:
The data in the Persistent Storage:
- Remains available across separate working sessions.
- Is encrypted using a passphrase of your choice.
<div class="caution">
<p>The encrypted persistent storage is not hidden. An attacker in possession of
the USB stick can know whether it has an encrypted persistent storage. Take into consideration
<p>The Persistent Storage is not hidden. An attacker in possession of
the USB stick can know whether it has a Persistent Storage. Take into consideration
that you can be forced or tricked to give out its passphrase.</p>
</div>
......@@ -66,7 +66,7 @@ that you can be forced or tricked to give out its passphrase.</p>
<div class="caution">
<p>It is possible to
open the encrypted persistent storage from other operating systems. But, doing
unlock the Persistent Storage from other operating systems. But, doing
so might compromise the security provided by Tails.</p>
<p>For example, image thumbnails might be created and saved by the other operating
......@@ -78,7 +78,7 @@ sensitive information or leave no trace.</p>
</div>
Create the persistent storage
Create the Persistent Storage
-----------------------------
1. Choose
......@@ -100,20 +100,20 @@ Passphrase</span> text boxes.
2. Wait for the creation to finish.
3. The assistant shows a list of the possible persistence features. Each
feature corresponds to a set of files or settings to be saved in the encrypted
persistent storage.
3. The assistant shows a list of the possible features. Each
feature corresponds to a set of files or settings to be saved in the
Persistent Storage.
We recommend you to only activate the <span class="guilabel">Personal
Data</span> persistence feature for the time being. You
can activate more features later on according to your needs.
We recommend you to only turn on the <span class="guilabel">Personal
Data</span> feature for the time being. You
can turn on more features later on according to your needs.
4. Click <span class="button">Save</span>.
<div class="step-image">[[!img install/inc/infography/restart-on-tails.png link="no" alt=""]]</div>
Restart and activate the persistent storage
-------------------------------------------
Restart and unlock the Persistent Storage
-----------------------------------------
1. Shut down the computer and restart on your
<span class="clone">new</span>
......@@ -126,8 +126,8 @@ Restart and activate the persistent storage
- Select your language and keyboard layout in the
<span class="guilabel">Language & Region</span> section.
- In the <span class="guilabel">Encrypted Persistent Storage</span> section,
enter your passphrase and click <span class="button">Unlock</span> to activate the encrypted
persistent storage for the current working session.
enter your passphrase and click <span class="button">Unlock</span> to unlock the
Persistent Storage for the current working session.
- Click <span class="button">Start Tails</span>.
1. After 15&ndash;30 seconds, the Tails desktop appears.
......@@ -141,7 +141,7 @@ Restart and activate the persistent storage
<div class="trophy" id="recommendations">
<div class="state-image">[[!img install/inc/infography/tails-usb-with-persistence.png link="no" alt="Tails USB stick with persistent storage"]]</div>
<div class="state-image">[[!img install/inc/infography/tails-usb-with-persistence.png link="no" alt="Tails USB stick with Persistent Storage"]]</div>
<p>You now have a complete Tails, congrats!</p>
......
......@@ -169,7 +169,7 @@ were solved, and known issues that have already been identified.</p>
<div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>