Merge pull request #595 from freedomofpress/2.10.0

Add upgrade guide for 2.10.0

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.9.0
+    git tag -v 2.10.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.9.0
+    git checkout 2.10.0
 
-.. important:: If you see the warning ``refname '2.9.0' is ambiguous`` in the
+.. important:: If you see the warning ``refname '2.10.0' is ambiguous`` in the
                output, we recommend that you contact us immediately at
                [email protected] (`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.9.0
+      git tag -v 2.10.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.9.0
+      git checkout 2.10.0
 
    .. important::
-      If you see the warning ``refname '2.9.0' is ambiguous`` in the
+      If you see the warning ``refname '2.10.0' is ambiguous`` in the
       output, we recommend that you contact us immediately at
       [email protected]
       (`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.9.0
+      git tag -v 2.10.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.9.0
+      git checkout 2.10.0
 
 
    .. important::
-      If you see the warning ``refname '2.9.0' is ambiguous`` in the
+      If you see the warning ``refname '2.10.0' is ambiguous`` in the
       output, we recommend that you contact us immediately at
       [email protected] (`GPG encrypted <https://securedrop.org/sites/default/files/fpf-email.asc>`__).
 

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.9.0
+  git tag -v 2.10.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.9.0
+    git checkout 2.10.0
 
-.. important:: If you do see the warning "refname '2.9.0' is ambiguous" in the
+.. important:: If you do see the warning "refname '2.10.0' is ambiguous" in the
   output, we recommend that you contact us immediately at [email protected]
   (`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.9.0"
+version = "2.10.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

@@ -151,12 +151,11 @@ Get Started
    :maxdepth: 2
    :hidden:
 
+   upgrade/2.9.0_to_2.10.0.rst
    upgrade/2.8.0_to_2.9.0.rst
    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
 
 Get Involved
 ^^^^^^^^^^^^

docs/upgrade/2.8.0_to_2.9.0.rst

@@ -1,5 +1,3 @@
-.. _latest_upgrade_guide:
-
 Upgrade from 2.8.0 to 2.9.0
 ===========================