Merge pull request #4673 from freedomofpress/docs-remove-obsolete-tai…

…ls-guide Remove obsolete and redundant Tails Guide
freedomofpress · Aug 20, 2019 · 97481eb · 97481eb
2 parents 7846e85 + 1c8beed
commit 97481eb
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 173 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -70,7 +70,6 @@ anonymous sources.
    what_makes_securedrop_unique
    logging
    ossec_alerts
-   tails_guide
    tails_printing_guide
    https_source_interface
    ssh_over_local_net

diff --git a/docs/onboarding.rst b/docs/onboarding.rst
@@ -51,6 +51,15 @@ To create a *Journalist Interface* Tails USB, just follow the same procedure you
 used to create a Tails USB with persistence for the *Admin Workstation*,
 as documented in the :doc:`Tails Setup Guide <set_up_tails>`.
 
+.. note::
+
+   As with your *Admin Workstation*, you can use a fresh copy of the blank
+   KeePassX template in the repository to initialize the password database
+   on the *Journalist Workstation*. You can safely edit this copy to remove
+   sections or fields that are not relevant for the journalist you are
+   onboarding. For example, the admin section of the password database should
+   never be filled in on a *Journalist Workstation*.
+
 Once you're done, boot into the new Journalist Tails USB on the
 *Journalist Workstation*. Enable persistence and set an admin
 passphrase before continuing with the next section.

diff --git a/docs/passphrases.rst b/docs/passphrases.rst
@@ -9,9 +9,10 @@ each role in a SecureDrop installation.
 
 .. note:: We encourage each end user to use KeePassX, an easy-to-use
           password manager included in Tails, to generate and retain
-          strong and unique passphrases. We have created a template
-          passphrase database that you can use to get started. For more
-          information, see the :doc:`tails_guide`.
+          strong and unique passphrases. The SecureDrop code repository includes
+          a template that you can use to initialize this database for an
+          *Admin Workstation* or a *Journalist Workstation*. For more
+          information, see the :ref:`KeePassX setup instructions <keepassx_setup>`.
 
 .. tip:: For best practices on managing passphrases, see
    :doc:`passphrase_best_practices`.
@@ -21,7 +22,7 @@ Admin
 
 The admin will be using the *Admin Workstation* with Tails to connect to
 the *Application Server* and the *Monitor Server* using Tor and SSH. The tasks
-performed by the admin will require the following set of credentials and 
+performed by the admin will require the following set of credentials and
 passphrases:
 
 -  A passphrase for the persistent volume on the Admin Live USB.

diff --git a/docs/set_up_admin_tails.rst b/docs/set_up_admin_tails.rst
@@ -143,6 +143,8 @@ output of that last command along with the fingerprint above.
    and you should **not** proceed with the installation. If this happens,
    please contact us at securedrop@freedom.press.
 
+.. _keepassx_setup:
+
 Create the Admin Passphrase Database
 ------------------------------------
 
@@ -174,7 +176,7 @@ To use the template:
          file used to protect the database.
 
 In case you wish to manually create a database, the suggested password fields in
-the admin template are:
+the template are:
 
 **Admin**:
 

diff --git a/docs/tails_guide.rst b/docs/tails_guide.rst
diff --git a/docs/tails_printing_guide.rst b/docs/tails_printing_guide.rst
@@ -38,8 +38,7 @@ attempting to use a new printer with Tails.
 
 .. note:: While, as of Tails 3, it's no longer necessary to have admin
    privileges in order to install or configure printers, we recommend that you
-   set an admin passphrase along with
-   :ref:`enabling persistence <enable_persistence_in_tails>`; this ensures that
+   set an admin passphrase and unlock your persistent volume; this ensures that
    the printer's installation and configuration settings persist after every
    reboot, so you don't have to reinstall it each time you start Tails.