Rename files for consistency with new organization/content

freedomofpress · Sep 12, 2019 · 14bdc72 · 14bdc72
1 parent 948039b
commit 14bdc72
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/docs/checklists/pre_install_hardware.rst b/docs/checklists/pre_install_hardware.rst
@@ -3,7 +3,7 @@ Pre-Install Hardware Checklist
 
 This is the *minimum* hardware that must be acquired to install SecureDrop:
 
-.. include:: ../includes/pre-install-hardware.txt
+.. include:: ../includes/pre-install-hardware-required.txt
 
 Additionally, you may want to consider the following purchases:
 

diff --git a/docs/glossary.rst b/docs/glossary.rst
@@ -155,7 +155,7 @@ to transfer encrypted documents from the *Journalist Workstation* to the
 
 Please see the detailed security recommendations for the choice, configuration
 and use of your *Transfer Device* in the :doc:`journalist guide <journalist>`
-and in the :doc:`setup guide <set_up_transfer_device>`.
+and in the :doc:`setup guide <set_up_transfer_and_export_device>`.
 
 Export Device
 -------------
@@ -165,4 +165,4 @@ everyday workstation, or to another computer for additional processing.
 
 Please see the detailed security recommendations for the choice, configuration
 and use of your *Export Device* in the :doc:`journalist guide <journalist>`
-and in the :doc:`setup guide <set_up_transfer_device>` .
+and in the :doc:`setup guide <set_up_transfer_and_export_device>` .
diff --git a/docs/hardware.rst b/docs/hardware.rst
@@ -13,7 +13,7 @@ Hardware Overview
 
 For an installation of SecureDrop, you must acquire:
 
-.. include:: includes/pre-install-hardware.txt
+.. include:: includes/pre-install-hardware-required.txt
 
 Additionally, you may want to consider the following purchases:
 
@@ -198,7 +198,7 @@ DVD-Rs instead. We encourage you to evaluate these options in the context of
 your own threat model.
 
 Please find some notes regarding each of these methods below, and see our
-recommendations in the :doc:`setup guide <set_up_transfer_device>`
+recommendations in the :doc:`setup guide <set_up_transfer_and_export_device>`
 for additional background.
 
 USB drives
@@ -568,7 +568,7 @@ If you want to use a setup based on CD-Rs or DVD-Rs, we've found the CDR/DVD
 writers from Samsung and LG to work reasonably well; you can find some examples
 `here <https://www.newegg.com/External-CD-DVD-Blu-Ray-Drives/SubCategory/ID-420>`__.
 
-Please see our recommendations in the :doc:`setup guide <set_up_transfer_device>`
+Please see our recommendations in the :doc:`setup guide <set_up_transfer_and_export_device>`
 for additional background.
 
 Network Firewall

diff --git a/docs/includes/pre-install-hardware.txt → ...ncludes/pre-install-hardware-required.txt b/docs/includes/pre-install-hardware.txt → ...ncludes/pre-install-hardware-required.txt
diff --git a/docs/index.rst b/docs/index.rst
@@ -32,7 +32,7 @@ anonymous sources.
    before_you_begin
    set_up_tails
    set_up_svs
-   set_up_transfer_device
+   set_up_transfer_and_export_device
    generate_submission_key
    set_up_admin_tails
    network_firewall

diff --git a/docs/journalist.rst b/docs/journalist.rst
@@ -546,7 +546,7 @@ Moving Documents to Your Everyday Workstation
    risks, and consider other methods to export the document (e.g., print).
 
 If you must copy a file from your *Secure Viewing Station* to your everyday
-workstation in digital form, our :doc:`recommendation <set_up_transfer_device>`
+workstation in digital form, our :doc:`recommendation <set_up_transfer_and_export_device>`
 is that journalists are provided with an *Export Device*, typically a USB drive,
 which is encrypted using `VeraCrypt <https://www.veracrypt.fr/en/Home.html>`__.
 These instructions assume that you are following the recommended workflow.

diff --git a/docs/onboarding.rst b/docs/onboarding.rst
@@ -128,7 +128,7 @@ In small organizations, a team of journalists may want to share a single
 *Transfer Device* and a single *Export Device*. In larger organizations, you may
 want to provision a personal *Transfer Device* and *Export Device* for each
 journalist who may need to copy files off the *Secure Viewing Station*. Please
-see the :doc:`setup guide <set_up_transfer_device>` for more
+see the :doc:`setup guide <set_up_transfer_and_export_device>` for more
 information.
 
 Verify Journalist Setup

diff --git a/docs/passphrases.rst b/docs/passphrases.rst
@@ -90,7 +90,7 @@ persistent volume of the Admin Live USB.
 *Transfer Device* and *Export Device*
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As noted in the :doc:`setup guide <set_up_transfer_device>`,
+As noted in the :doc:`setup guide <set_up_transfer_and_export_device>`,
 we recommend using encrypted USB drives for transferring files to the
 *Secure Viewing Station*, and for exporting them from the *SVS* in situations
 where using a secure printer or a similar analog conversion is not an option.

diff --git a/docs/set_up_transfer_device.rst → docs/set_up_transfer_and_export_device.rst b/docs/set_up_transfer_device.rst → docs/set_up_transfer_and_export_device.rst