Apply style guide

wiki/src/contribute.mdwn

@@ -166,7 +166,7 @@ using the usual communication channels.
   - Documentation: BitingBird, sajolida
   - *Onion Circuits* (Python): alan
   - *OpenPGP Applet* (Perl): nodens
-  - Persistence setup (Perl): intrigeri, kurono
+  - Persistent Storage (Perl): intrigeri, kurono
   - Sysadmin: [[contact|contribute/how/sysadmin/#contact]]
   - Welcome Screen (Python): alan, intrigeri
   - *Tails Installer* (Python): alan, kurono, u

wiki/src/contribute/build/website.mdwn

@@ -56,13 +56,13 @@ If you are in Tails, see the [[dedicated instructions|website#tails]].
 Build the website in Tails
 ==========================
 
-1. [[Create and configure|doc/first_steps/persistence/configure]] a persistent volume and activate the following features:
+1. [[Create and configure|doc/first_steps/persistence/configure]] a Persistent Storage and turn on the following features:
 
    - Personal Data
    - APT Packages
    - APT Lists
 
-2. Restart Tails, [[enable the persistence|doc/first_steps/persistence/use]], and [[set up an administration password|doc/first_steps/welcome_screen/administration_password]].
+2. Restart Tails, [[unlock the Persistent Storage|doc/first_steps/persistence/use]], and [[set up an administration password|doc/first_steps/welcome_screen/administration_password]].
 
 3. Update the list of available packages:
 

wiki/src/contribute/derivatives.mdwn

@@ -66,7 +66,7 @@ For example, derivatives could:
   Tails.
 - Document how to use specific applications in Tails.
 - Rely on the customizations mechanisms already available in Tails
-  (additional software packages and persistent storage).
+  (Additional Software and Persistent Storage features).
 - Help us build in Tails other mechanisms that derivatives might need to
   adapt Tails to their needs (for example to have persistent DConf
   settings or additional APT sources).

wiki/src/contribute/design.mdwn

@@ -273,12 +273,12 @@ Configuration files, temporary files, user home directories and
 similar files that most likely need to be modifiable during operation
 MUST only be saved temporarily in memory (e.g. by use of something
 like tmpfs or unionfs) unless the user explicitly enables some
-persistence feature.
+features of the Persistent Storage.
 
 It is tempting to use the possibility to write back data when running
 from USB in order to allow user settings to be persistent. If this is
 considered, this feature MUST be optional and offer the possibility
-to use strong encryption for the persistent storage.
+to use strong encryption for the Persistent Storage.
 
 ### 2.4.3 Virtual machines
 
@@ -1122,7 +1122,7 @@ disregard the preferred keyserver assigned to specific keys.
 - [[!tails_gitweb config/chroot_local-includes/etc/skel/.gnupg/dirmngr.conf]]
 - [[!tails_gitweb config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults]]
 
-### 3.6.17 Persistence feature
+### 3.6.17 Persistent Storage
 
 An opt-in data persistence feature is available in Tails 0.11 and
 newer. See [[contribute/design/persistence]] for details.
@@ -1255,7 +1255,7 @@ default configuration tells it to use the default of Tor's
 SOCKSPort:s, and sync the necessary parts of the Bitcoin blockchain
 (as a lightweight client) from the default server pool using SSL.
 
-There is also a persistence preset for the live user's `.electrum`
+There is also a feature of the Persistent Storage for the live user's `.electrum`
 configuration folder, which stores the Bitcoin wallet, application
 preferences and the cached Bitcoin blockchain.
 

wiki/src/contribute/design/UEFI.mdwn

@@ -58,7 +58,7 @@ detecting an encrypted Debian Live persistent volume). This is why we
 have decided, back when we were implementing persistence support and
 a graphical USB installer in 2012, to initialize Tails boot devices
 with a GPT. Since then, we have made great use of this feature in
-Tails Persistent Volume Assistant, Incremental Upgrader and the Welcome Screen.
+for the Persistent Storage, Upgrader, and Welcome Screen.
 
 Despite a few painful consequences we discovered along the way, all
 caused by buggy firmware implementations, we think that picking GPT at

wiki/src/contribute/design/additional_software_packages.mdwn

@@ -10,8 +10,8 @@ amnesic, new software packages for Debian can be installed in a working
 session but they are not reinstalled at next reboot.
 
 Additional Software Packages is a feature to remember a set of Debian Packages
-to be installed automatically from [[persistent
-storage|contribute/design/persistence]] each time Tails is started.
+to be installed automatically from the [[Persistent
+Storage|contribute/design/persistence]] each time Tails is started.
 
 Use cases
 =========
@@ -20,7 +20,7 @@ Alice is a geographer working for an NGO in an unstable country. They need
 to use Tails but needs the QGis SIG to work. It would make little sense
 to add such a specific software in Tails. But thanks to Additional
 Software Packages, Alice can have QGis installed every time when they boot
-Tails with persistent storage enabled.
+Tails with the Persistent Storage unlocked.
 
 Bob is a journalist and wants to publish videos made by other
 colleagues. Bob needs to convert these videos and is used to the open
@@ -40,7 +40,7 @@ Goals
 - Integrate this in:
   - The usual installation and removal process of a package (through
     Synaptic, another graphical tool, or APT on the command line).
-  - The persistent storage configuration.
+  - The Persistent Storage settings.
 
 - Ensure packages are installed even offline.
 
@@ -153,7 +153,7 @@ installed or removed.
 
 <img src="https://redmine.tails.boum.org/code/attachments/download/1925/asp-flow-installed.svg" height="auto" />
 
-#### With persistent storage unlocked:
+#### With the Persistent Storage unlocked:
 
 <img src="https://git.tails.boum.org/ux/plain/additional software/png/notification - add.png"/>
 
@@ -165,14 +165,14 @@ atomically to the `live-additional-software.conf` configuration file
 (this logic is handled by
 <https://git-tails.immerda.ch/pythonlib/plain/tailslib/additionalsoftware.py>)
 
-#### Without persistent storage
+#### Without a Persistent Storage
 
 <img src="https://git.tails.boum.org/ux/plain/additional software/png/notification - add without persistent storage.png"/>
 
 When *Add To Persistent Storage* is clicked,
 `/usr/bin/tails-persistence-setup` is started as
 `tails-persistence-setup` with a GUI to lead the user through the process
-of creating a persistent storage. The `AdditionalSoftware` preset is
+of creating a Persistent Storage. The `AdditionalSoftware` preset is
 automatically enabled. The new additional packages are then added to the
 `live-additional-software.conf` configuration file, which is in this
 case mounted to `/media/tails-persistence-setup/TailsData` instead of
@@ -182,18 +182,18 @@ case mounted to `/media/tails-persistence-setup/TailsData` instead of
 The systemd service
 [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/tails-synchronize-data-to-new-persistent-volume-on-shutdown.service]]
 is used to synchronize APT data (lists and cached packages) to the newly
-created persistent storage on Tails shutdown.
+created Persistent Storage on Tails shutdown.
 
-#### With persistent storage locked
+#### With the Persistent Storage locked
 
-No notification is displayed as people who have a persistent storage but
+No notification is displayed as people who have a Persistent Storage but
 don't unlock it, probably do this only sometimes and for a reason. They
-probably otherwise unlock their persistent storage most of the time. If
-they install packages with their persistent storage locked, they
-probably do it with their persistent storage unlock as well and would
+probably otherwise unlock their Persistent Storage most of the time. If
+they install packages with their Persistent Storage locked, they
+probably do it with their Persistent Storage unlocked as well and would
 learn about this feature when it's most relevant for them.
 
-#### When it's impossible to have persistent storage
+#### When it's impossible to have a Persistent Storage
 
 This happens when running from a DVD, virtual machine, or intermediary
 Tails.
@@ -223,7 +223,7 @@ The list of additional software can be opened from:
 - **Applications**&nbsp;▸ **System Tools**&nbsp;▸ **Additional Software**
 - **Applications**&nbsp;▸ **Tails**&nbsp;▸ **Additional Software**
 - a click on the gear button next to the **Additional
-Software** feature in the persistent storage settings
+Software** feature in the Persistent Storage settings
 
 This application is implemented in the following files:
 
@@ -231,9 +231,9 @@ This application is implemented in the following files:
 - [[!tails_gitweb config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in]]
 - [[!tails_gitweb config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui]]
 
-If there is no persistent storage or before any package is added, if the
-persistent storage is locked, or if it is impossible to have a persistent
-storage (for example, when running from a DVD or a virtual machine) the window
+If there is no Persistent Storage or before any package is added, if the
+Persistent Storage is locked, or if it is impossible to have a Persistent
+Storage (for example, when running from a DVD or a virtual machine) the window
 shows an explanation text with appropriate pointers:
 
 <img src="https://git.tails.boum.org/ux/plain/additional software/png/additional software - without persistent storage.png"/>

wiki/src/contribute/design/application_isolation.mdwn

@@ -117,7 +117,7 @@ Tor Browser
 As of Tails 1.3, the Tor Browser is somewhat confined with AppArmor.
 
 Given we cannot seriously allow the Tor Browser to read and write
-everywhere in the home and persistent directory, we had to allow it to
+everywhere in the home and *Persistent* folder, we had to allow it to
 read/write files from/to one specific directory, and make it so the
 user experience is not hurt too much.
 
@@ -139,10 +139,10 @@ store it entirely, so this problem is not specific to downloading to
 an amnesiac directory.
 
 Still, we thought it would be good to allow users to download large
-files from Tor Browser to their persistent volume, so we have
+files from Tor Browser to their Persistent Storage, so we have
 introduced a second downloads/uploads directory: `~/Persistent/Tor
 Browser/`, that is created whenever the "Personal data" (aka.
-`~/Persistent/`) persistence feature is activated. In that case, if
+`~/Persistent/`) feature is turned on. In that case, if
 persistence was activated read-write, another GTK bookmark pointing to
 that directory is created at login time.
 

wiki/src/contribute/design/installation_assistant.mdwn

@@ -13,7 +13,7 @@ this [[flowchart of the installation process as of
 
 The objective was to make this a linear process, to be follow step-by-step, and
 that would take the user from our homepage up to starting on a Tails USB stick
-with a persistent volume. But this process has to be adapted to the base
+with a Persistent Storage. But this process has to be adapted to the base
 operating system of the user or their technical expertise.
 
 We decided to optimize it for first time and less technical users, while still
@@ -151,7 +151,7 @@ Notes:
     2015).
   - DVD do not benefit from automatic upgrades, so people might be more
     quickly out-of-date.
-  - DVD does not allow creating a persistent volume, so people cannot
+  - DVD does not allow creating a Persistent Storage, so people cannot
     rely on long lasting cryptographic keys to secure their
     communication and might use weaker techniques.
   - For these same reasons we only provide a download and links to Ubuntu
@@ -162,7 +162,7 @@ Notes:
     2015).
   - VMs are less secure because the host operating system can monitor
     them.
-  - VMs make it harder to create a persistent volume, so people might
+  - VMs make it harder to create a Persistent Storage, so people might
     not rely on long lasting cryptographic keys to secure their
     communication and might use weaker techniques.
   - For these same reasons we only provide a download and then point to the

wiki/src/contribute/design/persistence.mdwn

@@ -58,31 +58,31 @@ wants to have persistent. This is the `~/Persistent/` directory.
 If a user needs software that is not included in Tails by default it can be
 quite annoying to fetch the APT information and download it (slow over
 Tor) every time. Therefore, APT packages lists and cache can easily be
-made persistent. It's also possible to store in persistence a list of
+made persistent. It's also possible to store in the Persistent Storage a list of
 additional software packages to be automatically reinstalled on boot.
 
 Persistence storage location
 ----------------------------
 
-The Tails persistent volume is a LUKS-encrypted GPT partition, labeled
+The Tails Persistent Storage is a LUKS-encrypted GPT partition, labeled
 `TailsData`, stored on a removable storage device.
 
 Specifications
 ==============
 
-Once a persistent volume is enabled, changes to persistent files are saved.
+Once a Persistent Storage is enabled, changes to persistent files are saved.
 
 Moreover:
 
-* Read-write access to a persistent data store is not the default: it
-  requires a voluntary user action such as choosing enabling
-  a *persistence* option in the boot menu.
-* The persistent data is stored using strong, well-known, Free
+* Read-write access to the Persistent Storage is not the default: it
+  requires a voluntary user action such as unlocking the Persistent
+  Storage in the Welcome Screen.
+* The Persistent Storage uses strong, well-known, Free
   Software, peer-reviewed encryption tools (`dm-crypt` and LUKS)
 * Fixed storage devices are be blacklisted by default from the search
-  for persistent volumes. Rationale: preventing the risk of using
-  a malicious persistent volume seems more important than supporting
-  the rare "I want to store my persistent volume on a fixed hard-disk"
+  for a Persistent Storage. Rationale: preventing the risk of using
+  a malicious Persistent Storage seems more important than supporting
+  the rare "I want to store my Persistent Storage on a fixed hard-disk"
   use-case.
 
 Current state of things
@@ -138,7 +138,7 @@ User interface
 
 A *Configure persistent storage* menu entry is the entry point to the
 *bootstrap persistent storage* UI. This UI allows the user to set up
-a persistent storage container in the free space left on the USB stick
+a Persistent Storage in the free space left on the USB stick
 by [[Tails Installer|installation]].
 
 Choosing persistence is something *activelly* opt-in, i.e. "I want
@@ -151,14 +151,14 @@ own [[contribute/Git]] (gbp-style) repository.
 
 #### Design
 
-Setting up a Tails persistent volume means:
+Setting up a Persistent Storage means:
 
 * detect the device Tails is running from
 * error out if not running from USB
 * error out unless Tails was installed using Tails Installer (i.e.
   unless it's running from a GPT partition labeled `Tails`)
 * error out if the device Tails is running from already has
-  a persistent volume
+  a Persistent Storage
 * ask the user an encryption passphrase (welcome bonus: pointing to
   the relevant documentation about choosing a *strong* passphrase)
 * create a LUKS-encrypted partition on the Tails USB stick
@@ -174,14 +174,15 @@ Setting up a Tails persistent volume means:
   system is booting for the first time or not, every first boot must
   change something on the Tails system partition. We don't
   want to do this, hence the `tails-persistence-setup` will be run
-  from the Applications menu by users who decide they want persistence.
+  from the Applications menu by users who decide they want a Persistent
+  Storage.
 
 * **Storage location**: To keep the GUI and documentation simple, we
-  only support setting up a persistent volume *on the USB stick Tails
+  only support setting up a Persistent Storage *on the USB stick Tails
   is running from*. **Note**: the underlying tools (live-boot backend,
   tails-greeter) will support storage on whatever relevant device,
   though; moreover, `tails-persistence-setup` actually knows how to
-  set up persistence on arbitrary devices, thanks to command-line
+  set up a Persistent Storage on arbitrary devices, thanks to command-line
   options. Therefore, brave and advanced users can prepare their store
   their persistent data wherever they want, but this is not something
   we will actively support and document beyond the bare minimum
@@ -215,13 +216,13 @@ Setting up a Tails persistent volume means:
 
 ### Configure which bits are persistent
 
-This is automatically run right after the persistent storage bootstrap
+This is automatically run right after the Persistent Storage bootstrap
 step. The user is enabled to change the configuration later.
-Persistence settings changes are taken into account at next boot.
+Changes to the Persistent Storage settings are taken into account at next boot.
 
 #### Design
 
-* either persistence is currently enabled in read-write mode, and thus
+* either the Persistent Storage is currently unlocked in read-write mode, and thus
   the persistence partition is already mounted; or the user is
   directly coming from bootstrap, and then we must mount the partition
   ourselves
@@ -248,7 +249,7 @@ Persistence settings changes are taken into account at next boot.
   custom* button allows to enter custom source, destination (and
   comma-separated list of options?)
 
-### Enable persistence at boot time
+### Unlock the Persistent Storage at boot time
 
 Choosing between various persistence modes is one of the reasons why
 we've written a graphical [[!tails_ticket 5528 desc="boot menu"]]:
@@ -256,14 +257,14 @@ the [[!tails_ticket 5496 desc="Welcome Screen"]] (aka. *tails-greeter*).
 
 #### Design
 
-* asks whether to enable persistence at all;
-* ask list of possibly valid persistent containers to `live-persist`
+* asks whether to unlock the Persistent Storage at all;
+* ask list of possibly valid Persistent Storages to `live-persist`
 * initial implementation (MVC -speak): the model (`live-persist` and
   tails-greeter code that runs it) supports enabling multiple
-  persistence containers, but the view (tails-greeter GUI) only
-  supports *one* persistence container
+  Persistent Storages, but the view (tails-greeter GUI) only
+  supports *one* Persistent Storage
 * ask LUKS passphrase, deals with errors
-* for a given persistent container, it's all or nothing: all bits of
+* for a given Persistent Storage, it's all or nothing: all bits of
   persistence configured in its `live.persist` are to be set up
 * runs `live-persist` to set up persistent data where it belong
 * pass information to the user session (at least
@@ -275,9 +276,10 @@ backend / tails-greeter interface
 
 ### Long story short
 
-0. The user chooses to toggle persistence on in `tails-greeter`.
+0. The user chooses to unlock the Persistent Storage in the Welcome
+   Screen, aka. `tails-greeter`.
 0. `tails-greeter` asks `live-boot` the list of possibly valid
-   persistent containers.
+   Persistent Storages.
 0. For each such volume, `tails-greeter` asks the user to enter the
    passphrase or to skip it, and tries to unlock. `tails-greeter`
    deals with error catching, retrying, etc. as appropriate.
@@ -298,7 +300,7 @@ as:
 well-behaved synchronously-called shell script, that is: with
 appropriate exit codes and `STDERR`.
 
-### Possibly valid persistent containers
+### Possibly valid Persistent Storages
 
 In our case, that is quite simple: it means removable LUKS encrypted
 filesystem, stored on GPT partitions labeled `Tails-persistence` (or
@@ -315,7 +317,7 @@ labeled with `live-rw` or `home-rw`, but if they're on encrypted
 device, then `live-boot` has to unlock the parent device them to see
 the label; also, in non-Tails usecases, any encrypted filesystem may
 contain a `*-rw` file, and must be unlocked to know too; so any
-encrypted device may be a valid persistent container that is worth
+encrypted device may be a valid Persistent Storage that is worth
 passing to `tails-greeter`; . `live-persist` will support non-Tails
 usecases on a best-effort basis, leaving room for improvement in case
 other developers want to add support for their preferred usecases.
@@ -332,7 +334,7 @@ Additional software packages
 ----------------------------
 
 The `tails-additional-software` script installs a list of
-additional software packages stored in persistence.
+additional software packages stored in the Persistent Storage.
 For details see [[additional_software_packages]].
 
 <a id="security"></a>
@@ -340,7 +342,7 @@ For details see [[additional_software_packages]].
 Security
 --------
 
-The root directory of the persistent volume filesystem root is created
+The root directory of the Persistent Storage is created
 by the persistence configuration assistant, owned by `root:root`, with
 permissions 0775:
 
@@ -358,17 +360,17 @@ by `tails-persistence-setup:tails-persistence-setup`, with permissions
 0600 and no ACLs. It refuses to read configuration files with
 different permissions.
 
-`live-persist` checks these permissions on the persistence root
-directory, on `persistence.conf` and on
+`live-persist` checks these permissions on the root directory of the
+Persistent Storage, on `persistence.conf` and on
 `live-additional-software.conf`. Then, `live-persist` disables every
-such file, and refuses to set up any persistence feature, if the
-persistent volume has wrong permissions. It also disables every such
+such file, and refuses to set up any feature of the Persistent Storage, if the
+Persistent Storage has wrong permissions. It also disables every such
 file that has wrong permissions itself.
 
-Migration from pre-0.21 persistent volumes
+Migration from pre-0.21 Persistent Storage
 ------------------------------------------
 
-Before Tails 0.21, the persistent volume and configuration file had
+Before Tails 0.21, the Persistent Storage and its configuration file had
 weaker permissions. An attacker who could run arbitrary code as the
 desktop `amnesia` user could tamper with the persistence
 configuration, and — with some minimal amount of imagination — give

wiki/src/contribute/glossary.mdwn

@@ -44,14 +44,14 @@ The words
   plenty of document formats, see
   [[MAT's website|https://0xacab.org/jvoisin/mat2]]
 * **monthly reports**: published in the [[news]] once a month
-* **persistence**: the opt-in feature that allows storing data and
+* **Persistent Storage**: the opt-in feature that allows storing data and
   configuration across Tails sessions in an encrypted partition, see
   [[contribute/design/persistence]]
 * **Release manager**: see the [[definition of this shifting
   role|contribute/working_together/roles/release_manager]]
 * **RM**: see Release Manager
-* **t-p-s**: `tails-persistence-setup`, AKA the [[Persistent Volume
-  Assistant|doc/first_steps/persistence/configure]].
+* **t-p-s**: `tails-persistence-setup`, AKA the [[Persistent Storage
+  settings|doc/first_steps/persistence/configure]].
 * **Trusted reproducer**: the person verifying reproducibility of released
   images
 * **TR**: see Trusted reproducer

wiki/src/contribute/how/documentation/release_notes.mdwn

@@ -35,9 +35,8 @@
       need to point people to, for example:
       - Known issues
       - Major changes that might confuse users
-    - Document manual steps that persistence users may need to go
-      through, taking into account that we support automatic updates
-      from the two last releases (not mentioning manual updates).
+    - Document manual steps that users with a Persistent Storage may need to go
+      through, taking into account that we support automatic updates (not mentioning manual updates).
       It may imply to refer to, or copy from, such instructions that
       were documented in the _previous_ release notes.
   - Write the draft

wiki/src/contribute/how/translate/with_Git.mdwn

@@ -77,8 +77,8 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad
 
 2. **Copy the source code from the main repository**
 
-   You first need to setup a [[persistent volume|doc/first_steps/persistence]]
-   to save the source code. Then navigate to the persistent folder, using the terminal:
+   You first need to setup a [[Persistent Storage|doc/first_steps/persistence]]
+   to save the source code. Then navigate to the *Persistent* folder, using the terminal:
 
        cd ~/Persistent
 

wiki/src/contribute/how/translate/with_translation_platform.mdwn

@@ -65,7 +65,7 @@ following order:
   suggested to you by the Weblate platform.
 - **Core pages:** lists most important components to be translated, as
   selected by the Tails translation team.
-- **Persistence:** lists components of the *Encrypted persistence*
+- **Persistence:** lists components of the *Persistent Storage*
   section of the Tails documentation.
 - **Install & upgrade:** lists components of the *Download and install
   Tails* section of the Tails website.

wiki/src/contribute/how/user_experience/recording.mdwn

@@ -102,7 +102,7 @@ You can use [*Kazam*](http://recordmydesktop.sourceforge.net/) from Tails:
      <p>The directory preferences is reset to <em>~/Videos</em> every time by <em>Kazam</em>.</p>
      </div>
 
-### To autosave the recordings in persistence
+### To autosave the recordings in the Persistent Storage
 
 1. Create a *Persistent/Videos* directory.
 
@@ -114,8 +114,8 @@ You can use [*Kazam*](http://recordmydesktop.sourceforge.net/) from Tails:
 
      <p class="pre command">sudo mount --bind ~/Persistent/Videos ~/Videos</p>
 
-   - Permanently, map the *Videos* directory to *Persistent/Videos* in your
-     persistence settings.
+   - Permanently, map the *Videos* directory to *Persistent/Videos* in
+     the configuration of your Persistent Storage.
 
      To do so, add the following line to your */live/persistence/TailsData_unlocked/persistence.conf*:
 

wiki/src/contribute/release_process.mdwn

@@ -1387,7 +1387,7 @@ Write the announcement for the release in
 
 - Update the `meta title` directive.
 - Update the `meta date` directive.
-- Document important config changes that persistence users have to do
+- Document important config changes that users of the Persistent Storage have to do
   themselves (e.g. the Pidgin proxy settings change in
   [[!tails_gitweb_commit 9925321]] breaks all existing persistent
   profiles).

wiki/src/contribute/roadmap.mdwn

@@ -29,7 +29,7 @@ Priorities for the next years
 ### Applications and features
 
 - **Mobile messaging applications**: research support for Signal, Wire, Telegram, etc. ([[!tails_ticket 14567]])
-- **Backups**: make it easier to backup the persistent volume ([[!tails_ticket 14605]], [[!tails_ticket 5301]], [[Blueprint|blueprint/backups]])
+- **Backups**: make it easier to backup the Persistent Storage ([[!tails_ticket 14605]], [[!tails_ticket 5301]], [[Blueprint|blueprint/backups]])
 - **Redesign the experience of connecting to the network and Tor** ([[!tails_ticket 10491]])
 - <strike>**Remove some less popular packages** ([[!tails_ticket 15291]])</strike> [DONE]
 

wiki/src/doc/about/features.mdwn

@@ -82,7 +82,7 @@ Additionally, you can install in Tails any other software available in
 Debian.
 
 Using the <span class="guilabel">Additional Software</span>
-persistence feature, additional software can even be installed
+feature, additional software can even be installed
 automatically every time you start Tails.
 
 [[See the corresponding documentation.|doc/first_steps/additional_software]]

wiki/src/doc/about/warning.mdwn

@@ -201,7 +201,7 @@ Tails doesn't encrypt your documents by default
 ===============================================
 
 The documents that you might save on storage devices will not be encrypted by
-default, except in the [[encrypted persistent volume|doc/first_steps/persistence]].
+default, except in the [[Persistent Storage|doc/first_steps/persistence]], which is entirely encrypted.
 But Tails provides you with tools to encrypt your documents, such as
 GnuPG, or encrypt your storage devices, such as LUKS.
 

wiki/src/doc/advanced_topics.index.mdwn

@@ -4,8 +4,8 @@
     - [[!traillink <span_class="application">VirtualBox</span>|advanced_topics/virtualization/virtualbox]]
     - [[!traillink <span_class="application">GNOME_Boxes</span>|advanced_topics/virtualization/boxes]]
     - [[!traillink <span_class="application">virt-manager</span>|advanced_topics/virtualization/virt-manager]]
-  - Encrypted persistence
-    - [[!traillink Change_the_passphrase_of_the_persistent_volume|advanced_topics/persistence/change_passphrase]]
-    - [[!traillink Check_the_file_system_of_the_persistent_volume|advanced_topics/persistence/check_file_system]]
+  - Persistent Storage
+    - [[!traillink Change_the_passphrase_of_the_Persistent_Storage|advanced_topics/persistence/change_passphrase]]
+    - [[!traillink Check_the_file_system_of_the_Persistent_Storage|advanced_topics/persistence/check_file_system]]
   - [[!traillink Accessing_resources_on_the_local_network|advanced_topics/lan]]
   - [[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]

wiki/src/doc/advanced_topics/persistence/change_passphrase.mdwn

-[[!meta title="Change the passphrase of the persistent volume"]]
+[[!meta title="Change the passphrase of the Persistent Storage"]]
 
   1. Start Tails and [[set up an administration password
      |doc/first_steps/welcome_screen/administration_password]].
 
-     Do not enable the persistent volume in the Welcome Screen.
+     Do not unlock the Persistent Storage in the Welcome Screen.
 
   1. Open <span class="application">Disks</span> from the menu
      <span class="menuchoice">
@@ -16,11 +16,11 @@
      detailed information about it is displayed in the right pane: its partitions,
      its brand, its size, etc.
 
-  1. Find which device contains the persistent volume. It should have
+  1. Find which device contains the Persistent Storage. It should have
      two partitions, one labeled <span class="guilabel">Tails</span>, and another
-     one labeled <span class="guilabel">TailsData</span> which corresponds to the persistent volume.
+     one labeled <span class="guilabel">TailsData</span> which corresponds to the Persistent Storage.
 
-  1. In the right pane, click on the persistent volume partition,
+  1. In the right pane, click on the Persistent Storage partition,
      labeled <span class="guilabel">TailsData</span>.
 
   1. Click on <span class="guimenu">[[!img lib/system-run.png alt="Disks context menu" class="symbolic" link="no"]]</span>
@@ -33,5 +33,5 @@
   1. In the confirmation dialog, enter your administration password and click
      <span class="guilabel">Authenticate</span>.
 
-  1. You now can restart Tails and try to enable the persistent volume
+  1. You now can restart Tails and try to unlock the Persistent Storage
      with its new passphrase.

wiki/src/doc/advanced_topics/persistence/check_file_system.mdwn

-[[!meta title="Check the file system of the persistent volume"]]
+[[!meta title="Check the file system of the Persistent Storage"]]
 
 In rare occasions, you might have to perform a file system check to repair a
-broken persistent volume.
+broken Persistent Storage.
 
-Unlock the persistent volume
-============================
+Unlock the Persistent Storage
+=============================
 
-1. Start Tails, with persistence disabled, and [[set up an administration
+1. When starting Tails, keep the Persistent Storage locked and [[set up an administration
    password|welcome_screen/administration_password]].
 
 1. Choose
@@ -23,8 +23,8 @@ Unlock the persistent volume