Merge pull request #547 from freedomofpress/270-to-280

Add 2.8.0/Tails 6 upgrade guide; bump version

docs/admin/installation/set_up_admin_tails.rst

@@ -139,7 +139,7 @@ signed with the release signing key:
 
     cd ~/Persistent/securedrop/
     git fetch --tags
-    git tag -v 2.7.0
+    git tag -v 2.8.0
 
 The output should include the following two lines:
 
@@ -160,9 +160,9 @@ screen of your workstation. If it does, you can check out the new release:
 
 .. code:: sh
 
-    git checkout 2.7.0
+    git checkout 2.8.0
 
-.. important:: If you see the warning ``refname '2.7.0' is ambiguous`` in the
+.. important:: If you see the warning ``refname '2.8.0' is ambiguous`` in the
                output, we recommend that you contact us immediately at
                securedrop@freedom.press (`GPG encrypted <https://securedrop.org/sites/default/files/fpf-email.asc>`__).
 

docs/admin/maintenance/backup_and_restore.rst

@@ -229,7 +229,7 @@ Migrating Using a V2+V3 or V3-Only Backup
 
       cd ~/Persistent/securedrop/
       git fetch --tags
-      git tag -v 2.7.0
+      git tag -v 2.8.0
 
    The output should include the following two lines:
 
@@ -250,10 +250,10 @@ Migrating Using a V2+V3 or V3-Only Backup
 
    .. code:: sh
 
-      git checkout 2.7.0
+      git checkout 2.8.0
 
    .. important::
-      If you see the warning ``refname '2.7.0' is ambiguous`` in the
+      If you see the warning ``refname '2.8.0' is ambiguous`` in the
       output, we recommend that you contact us immediately at
       securedrop@freedom.press
       (`GPG encrypted <https://securedrop.org/sites/default/files/fpf-email.asc>`__).
@@ -472,7 +472,7 @@ source accounts, and journalist accounts. To do so, follow the steps below:
 
       cd ~/Persistent/securedrop/
       git fetch --tags
-      git tag -v 2.7.0
+      git tag -v 2.8.0
 
    The output should include the following two lines:
 
@@ -491,11 +491,11 @@ source accounts, and journalist accounts. To do so, follow the steps below:
 
    .. code:: sh
 
-      git checkout 2.7.0
+      git checkout 2.8.0
 
 
    .. important::
-      If you see the warning ``refname '2.7.0' is ambiguous`` in the
+      If you see the warning ``refname '2.8.0' is ambiguous`` in the
       output, we recommend that you contact us immediately at
       securedrop@freedom.press (`GPG encrypted <https://securedrop.org/sites/default/files/fpf-email.asc>`__).
 

docs/admin/maintenance/update_tails_usbs.rst

@@ -43,11 +43,11 @@ The process for manually updating a Tails USB is:
 What you need
 ^^^^^^^^^^^^^
 
-  #. Your *Admin Workstation* computer
+  #. Your *Admin Workstation* computer to download the latest version of Tails
   #. A *primary Tails USB* stick (you may still have one; it was used to create the *Admin Workstation*, *Secure Viewing Station*, and *Journalist Workstation* Tails USBs during the initial SecureDrop install process)
   #. The Tails USB that you want to update
   #. A Backup USB to back up the data on your existing Tails USBs
-  #. An airgapped computer, such as the computer used for the *Secure Viewing Station*.
+  #. An airgapped computer, such as the computer used for the *Secure Viewing Station*, to perform the update
 
 .. _Step 1:
 
@@ -66,7 +66,8 @@ updating to supports automatic updates, boot into it on your *Admin Workstation*
 computer and follow the graphical updater prompts that guide you through the
 `update process`_.
 
-Alternatively, you can also download and :ref:`install the newest version of Tails from scratch <setup_install_tails>` (as you did when you first installed SecureDrop). This may be faster if your *primary Tails USB* has not been updated in a while.
+Alternatively, you can also download and :ref:`install the newest version of Tails from scratch <setup_install_tails>` (as you did when you first installed SecureDrop). This may be faster if your *primary Tails USB* has not been updated in a while,
+and is necessary for Tails releases that do not support automatic updates.
 
 .. _update process: https://tails.boum.org/doc/upgrade/index.en.html
 
@@ -86,7 +87,14 @@ In this step, use the up-to-date *primary Tails USB* to update your desired Tail
 
 Plug your *primary Tails USB* into the airgapped computer and boot into Tails.
 
-You can then perform the `manual update steps`_.
+You can then perform the `manual update steps`_. In the Tails Cloner, do **not** click the checkbox
+labeled "Clone the current persistent storage". This refers to the persistent storage of your
+*primary Tails USB*. If you leave the checkbox unchecked, the persistent storage of the USB
+drive you are updating will be preserved.
+
+While writing to the USB disk, Tails may appear to be frozen, or a dialog may appear warning
+that the application is unresponsive. In the latter case, click **Wait**
+(repatedly if needed) until the operation is complete.
 
 .. _manual update steps: https://tails.boum.org/upgrade/clone/index.en.html
 

docs/admin/maintenance/update_workstations.rst

@@ -24,7 +24,7 @@ update by running the following commands: ::
   git fetch --tags
   gpg --keyserver hkps://keys.openpgp.org --recv-key \
    "2359 E653 8C06 13E6 5295 5E6C 188E DD3B 7B22 E6A3"
-  git tag -v 2.7.0
+  git tag -v 2.8.0
 
 The output should include the following two lines: ::
 
@@ -37,9 +37,9 @@ on the screen of your workstation. A warning that the key is not certified
 is normal and expected. If the output includes the lines above, you can check
 out the new release: ::
 
-    git checkout 2.7.0
+    git checkout 2.8.0
 
-.. important:: If you do see the warning "refname '2.7.0' is ambiguous" in the
+.. important:: If you do see the warning "refname '2.8.0' is ambiguous" in the
   output, we recommend that you contact us immediately at securedrop@freedom.press
   (`GPG encrypted <https://securedrop.org/sites/default/files/fpf-email.asc>`__).
 

docs/conf.py

@@ -46,7 +46,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = "2.7.0"
+version = "2.8.0"
 # The full version, including alpha/beta/rc tags.
 # On the live site, this will be overridden to "stable" or "latest".
 release = os.environ.get("SECUREDROP_DOCS_RELEASE", version)

docs/index.rst

@@ -150,14 +150,12 @@ Get Started
    :maxdepth: 2
    :hidden:
 
+   upgrade/2.7.0_to_2.8.0.rst
    upgrade/2.6.1_to_2.7.0.rst
    upgrade/2.6.0_to_2.6.1.rst
    upgrade/2.5.2_to_2.6.0.rst
    upgrade/2.5.1_to_2.5.2.rst
    upgrade/2.5.0_to_2.5.1.rst
-   upgrade/2.4.2_to_2.5.0.rst
-   upgrade/2.4.1_to_2.4.2.rst
-   upgrade/2.4.0_to_2.4.1.rst
 
 Get Involved
 ^^^^^^^^^^^^