Merge remote-tracking branch 'cbrownstein/doc/17334-rescue-broken-tails' into...

Merge remote-tracking branch 'cbrownstein/doc/17334-rescue-broken-tails' into doc/17334-rescue-broken-tails

wiki/src/blueprint/monthly_report/report_2020_08.mdwn

@@ -7,18 +7,19 @@
 Releases
 ========
 
-* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ((emergency release)?).
+* [[Tails 4.10 was released on August 25|news/version_4.10]].
 
-* Tails VERSION+1 is [[scheduled for MONTH DAY|contribute/calendar]].
+* Tails 4.11 is [[scheduled for September 22|contribute/calendar]].
 
-The following changes were introduced in Tails VERSION:
+The following changes were introduced in Tails 4.10:
 
-XXX: Copy the "Changes" section of the release notes, and compact a bit:
+* Update Linux to 5.7.10. This should improve the support for newer hardware (graphics, Wi-Fi, etc.).
 
-* Remove lines about software upgrade (that's not Tails itself).
-* Remove screenshots.
-* Remove "New features" and "Upgrades and changes" headlines.
-* Remove line about Changelog.
+* Hide the welcome message when starting Thunderbird.
+
+* Fix support for USB Wi-Fi adapters with Atheros AR9271 hardware. (#17834)
+
+* Fix USB tethering from iPhone. (#17820)
 
 Code
 ====
@@ -41,11 +42,6 @@ Code
 
 - Upgraded Linux to 5.7.17-1 ([[!tails_ticket 17895]]).
 
-XXX: If you feel like it and developers, foundation team, and RMs don't do it themselves,
-     list important code work that is not covered already by the
-     Release section (for example, the changes being worked on for
-     the next version).
-
 Documentation and website
 =========================
 
@@ -223,26 +219,11 @@ Partners
 
 - We added Freiheitsfoo as [[partner|partners]].
 
-Outreach
-========
-
-Past events
------------
-
-Upcoming events
----------------
-
 On-going discussions
 ====================
 
-XXX: Link to the thread on <https://lists.autistici.org/list/tails-XXX.html>.
-
-Press and testimonials
-======================
-
-XXX: Copy content from [[!tails_gitweb wiki/src/press/media_appearances_2020.mdwn]]
-     This page is continuously updated by tails-press@boum.org, so if
-     it's empty there might be nothing special to report.
+- GitLab MR terminology update: WIP→ Draft : Link to the thread on <https://lists.autistici.org/list/tails-XXX.html>.
+- Reviewers: Link to the thread on <https://lists.autistici.org/thread/20200819.102500.4dd81e8c.en.html>. 
 
 Translations
 ============

wiki/src/doc/first_steps.index.mdwn

@@ -11,8 +11,8 @@
     - [[!traillink Warnings_about_the_Persistent_Storage|first_steps/persistence/warnings]]
     - [[!traillink Creating_and_configuring_the_Persistent_Storage|first_steps/persistence/configure]]
     - [[!traillink Unlocking_and_using_the_Persistent_Storage|first_steps/persistence/use]]
-    - [[!traillink Making_a_backup_of_your_Persistent_Storage|first_steps/persistence/copy]]
-    - [[!traillink Rescuing_your_Persistent_Storage|first_steps/persistence/rescue]]
+    - [[!traillink Making_a_backup_of_your_Persistent_Storage|first_steps/persistence/backup]]
+    - [[!traillink Rescuing_your_Persistent_Storage_from_a_broken_Tails|first_steps/persistence/rescue]]
     - [[!traillink Deleting_the_Persistent_Storage|first_steps/persistence/delete]]
   - [[!traillink Installing_additional_software|first_steps/additional_software]]
   - [[!traillink Reporting_an_error|first_steps/bug_reporting]]

wiki/src/doc/first_steps/persistence.mdwn

@@ -26,6 +26,6 @@ How to use the Persistent Storage
   - [[Warnings about the Persistent Storage|first_steps/persistence/warnings]]
   - [[Creating and configuring the Persistent Storage|first_steps/persistence/configure]]
   - [[Unlocking and using the Persistent Storage|first_steps/persistence/use]]
-  - [[Making a backup of your Persistent Storage|first_steps/persistence/copy]]
-  - [[Rescuing your Persistent Storage|first_steps/persistence/rescue]]
+  - [[Making a backup of your Persistent Storage|first_steps/persistence/backup]]
+  - [[Rescuing your Persistent Storage from a broken Tails|first_steps/persistence/rescue]]
   - [[Deleting the Persistent Storage|first_steps/persistence/delete]]

wiki/src/doc/first_steps/persistence/copy.mdwn → wiki/src/doc/first_steps/persistence/backup.mdwn

 [[!meta title="Making a backup of your Persistent Storage"]]
 
+<!-- XXX: These instructions should be kept in sync with doc/first_steps/persistence/rescue.mdwn -->
+
 These instructions explain how to back up your Persistent Storage to
 another Tails USB stick.
 
+<div class="tip">
+
+If your Tails is broken and you are trying to rescue your Persistent Storage,
+see our [[instructions on rescuing your Persistent
+Storage from a broken Tails|doc/first_steps/persistence/rescue]].
+
+</div>
+
 [[!toc]]
 
 Create a new Tails to store your backup

wiki/src/doc/first_steps/persistence/configure.mdwn

@@ -60,7 +60,7 @@ for more details.<p>
 
 <p>If you turn off a feature, it will be
 unavailable after restarting Tails but the
-[[corresponding files|doc/first_steps/persistence/copy#feature_files]]
+corresponding files
 are still saved in the Persistent Storage.</p>
 
 <p>To delete the files corresponding to a feature:</p>

wiki/src/doc/first_steps/persistence/rescue.mdwn

-[[!meta title="Rescuing your Persistent Storage"]]
+[[!meta title="Rescuing your Persistent Storage from a broken Tails"]]
 
-<!-- TODO: Explain when these instructions apply. -->
+<!-- XXX: These instructions should be kept in sync with doc/first_steps/persistence/backup.mdwn -->
+
+If your Tails becomes broken, for example, it no longer starts, you can follow
+these instructions to try to rescue your Persistent Storage.
+
+<div class="tip">
+
+It is advisable to keep a current backup of your Persistent Storage. To learn
+how to create a backup of your Persistent Storage, see our [[instructions on
+how to back up your Persistent Storage to another Tails USB
+stick|doc/first_steps/persistence/backup]].
+
+</div>
 
 1. Install Tails on a new USB stick on which you want to rescue your Persistent
    Storage. Make sure that this new USB stick is at least
@@ -21,6 +33,14 @@
    password|doc/first_steps/welcome_screen/administration_password]], and
    unlock the Persistent Storage.
 
+   <div class="caution">
+
+   Make sure that all applications are closed before continuing with these
+   instructions. Otherwise, the Persistent Storage might not be properly
+   rescued from your broken Tails.
+
+   </div>
+
 1. Choose
    <span class="menuchoice">
      <span class="guimenu">Applications</span>&nbsp;▸
@@ -66,5 +86,5 @@ total size is 32.30M  speedup is 1.00
 </pre>
 
 You can now eject the <span class="guilabel">TailsData</span> volume in the
-<span class="application">Files</span> browser and unplug your broken
-Tails.
+<span class="application">Files</span> browser and unplug the USB stick that
+has your broken Tails on it.

wiki/src/news/report_2019_09.mdwn

@@ -43,7 +43,7 @@ Documentation and website
 =========================
 
 - We rewrote completely the instructions to [[backup the persistent
-  volume|doc/first_steps/persistence/copy]].
+  volume|doc/first_steps/persistence/backup]].
 
 - We documented how to do right-click on Mac. ([[!tails_ticket 15718]])
 

wiki/src/news/report_2020_01.mdwn

@@ -97,7 +97,7 @@ Documentation and website
   to display progress (`status=progress`) and sync on-the-fly (`oflag=direct`).
 
 - We fixed the display of the output of `rsync` when doing a [[backup of the
-  persistent volume|doc/first_steps/persistence/copy]].
+  persistent volume|doc/first_steps/persistence/backup]].
 
 Hot topics on our help desk
 ===========================

wiki/src/news/version_4.0.mdwn

@@ -147,7 +147,7 @@ especially for non-English users:
   including USB sticks and SSDs.
 
 - [[How to backup your persistent
-  volume|doc/first_steps/persistence/copy]].
+  volume|doc/first_steps/persistence/backup]].
 
 ## Other changes