en/index: proposed changes (see esd-translators@ 2021-08-02).

diff --git a/en/index.html b/en/index.html
index 8c87ac513ff0151be526c41eed2ff4651436f358..02697cc43a0677668536f946b59fb25798c3c047 100644 (file)
--- a/en/index.html
+++ b/en/index.html
@@ -142,9 +142,6 @@ href="https://u.fsf.org/ys">fsf.org</a>.</p>
 
 <p>Most GNU/Linux operating systems come with GnuPG installed on them, so if you're running one of these systems, you don't have to download it. If you're running macOS or Windows, steps to download GnuPG are below. Before configuring your encryption setup with this guide, though, you'll need a desktop email program installed on your computer. Many GNU/Linux distributions have one installed already, such as Icedove, which may be under the alternate name "Thunderbird." Programs like these are another way to access the same email accounts you can access in a browser (like Gmail), but provide extra features.</p>
 
-<p>If you already have an email program, you can skip to <a
-href="#section2">Step 2</a>.</p>
-
 </div><!-- End .section-intro -->
 
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
@@ -200,7 +197,7 @@ page</a>.</dd>
 
 <h3><em>Step 1.b</em> Get your terminal ready and install GnuPG</h3>
 
-<p>If you are using a GNU/Linux machine, you should already have GnuPG installed, and you can skip to <a href="#section2">Step 2</a>.</p>
+<p>If you are using a GNU/Linux machine, you should already have GnuPG installed, and you can skip to <a href="#section2">Section 2</a>.</p>
 <p>If you are using a macOS or Windows machine, however, you need to first install the GnuPG program. Select your operating system below and follow the steps. For the rest of the steps in this guide, the steps are the same for all operating systems. </p>
 
 <!-- ~~~~~~~~~ MACOS ~~~~~~~~~ -->
@@ -226,8 +223,6 @@ When it is done, install the program by entering the following code in Terminal:
 <dl>
 <dt>Get GnuPG by downloading GPG4Win</dt>
 <dd><p><a href="https://www.gpg4win.org/">GPG4Win</a> is an email and file encryption software package that includes GnuPG. Download and install the latest version, choosing default options whenever asked. After it's installed, you can close any windows that it creates.</p>
-
-<p class="notes">To follow the rest of the steps in this guide, you'll use the program called "PowerShell", which is a program you'll see elsewhere referred to as a "terminal." This allows you to operate your computer using the command line.</p>
 </dd>
 </dl>
 
@@ -299,14 +294,20 @@ alt="Step 2.A: Set your passphrase" /></p>
 <h3><em>Step 2.a</em> Make a keypair</h3>
 
 <h4>Make your keypair</h4>
-<p>Open a terminal. You should be able to find it in your applications (some GNU/Linux systems respond to the the <kbd>ctrl + alt + t</kbd> shortcut). Use the following code to create your keypair in the terminal:</p>
 
-<p class="notes">We will use the command line in a terminal to create a keypair using the GnuPG program. A terminal should be installed on your GNU/Linux operating system, if you are using a macOS or Windows OS system, use the programs "Terminal" (macOS) or "PowerShell" (Windows) that were also used in section 1.</p>
+<p>We will use the command line in a terminal to create a keypair using the
+GnuPG program.</p>
 
-<p># <code>gpg --full-generate-key</code> to start the process.</p>
+<p class="notes">A terminal is installed by default on most GNU/Linux
+systems; if you are running macOS, use "Terminal" as in Step 1.B; if you
+are running Windows, use a program named "PowerShell". You can launch your
+terminal from the Applications menu, or (on some GNU/Linux systems) with
+the <kbd>Ctrl + Alt + T</kbd> shortcut.</p>
+
+<p># Enter <code>gpg --full-generate-key</code> to start the process.</p>
 <p># To answer what kind of key you would like to create, select the default option: <samp>1&nbsp;RSA&nbsp;and&nbsp;RSA</samp>.</p>
 <p># Enter the following keysize: <code>4096</code> for a strong key.</p>
-<p># Choose the expiration date, we suggest <code>2y</code> (2 years).</p>
+<p># Choose the expiration date; we suggest <code>2y</code> (2 years).</p>
 <p>Follow the prompts to continue setting up with your personal details.</p>
 
 <h4>Set your passphrase</h4>
@@ -405,11 +406,10 @@ takes a few hours for them to match each other when a new key is uploaded.</p>
 
 <h4>Export your key to a file</h4>
 <p>Use the following command to export your secret key so you can import it into your email client at the next <a href="#section3">step</a>. To avoid getting your key compromised, store this in a safe place, and make sure that if it is transferred, it is done so in a trusted way. Exporting your keys can be done with the following commands:</p>
-
-<p><code>
-$ gpg --export-secret-keys -a [keyID] > my_secret_key.asc<br/>
-$ gpg --export -a [keyID] > my_public_key.asc
-</code></p>
+<p>
+<code>$ gpg --export-secret-keys -a [keyID] > my_secret_key.asc</code>
+<code>$ gpg --export -a [keyID] > my_public_key.asc</code>
+</p>
 
 <h4>Generate a revocation certificate</h4>
 <p>Just in case you lose your key, or it gets compromised, you want to generate a certificate  and choose to save it in a safe place on your computer for now (please refer to <a href="#step-6c"> step 6.C</a> for how to best store your revocation cerficate safely). This step is essential for your email self-defense, as you'll learn more about in <a href="#section5">Section 5</a>.</p> 
@@ -463,12 +463,12 @@ your key</a> as a file on your computer.</dd>
 <dd>
 <p>Use the following commands to transfer your keys. To avoid getting your key compromised, store it in a safe place, and make sure that if it is transferred, it is done so in a trusted way. Importing and exporting a key can be done with the following commands:</p>
 
-<p><code>
-$ gpg --export-secret-keys -a [keyID] > my_private_key.asc<br/>
-$ gpg --export -a [keyID] > my_public_key.asc<br/>
-$ gpg --import my_private_key.asc<br/>
-$ gpg --import my_public_key.asc
-</code></p>
+<p>
+<code>$ gpg --export-secret-keys -a [keyID] > my_private_key.asc</code>
+<code>$ gpg --export -a [keyID] > my_public_key.asc</code>
+<code>$ gpg --import my_private_key.asc</code>
+<code>$ gpg --import my_public_key.asc</code>
+</p>
 
 <p>Ensure that the keyID printed is the correct one, and if so, then go ahead and add ultimate trust for it:</p>
 
@@ -478,7 +478,7 @@ $ gpg --edit-key [your@email]
 
 <p>Because this is your key, you should choose <code>ultimate</code>. You shouldn't trust anyone else's key ultimately.</p>
 
-<p class="notes"> Refer to <a href="#step-2b">troubleshoot in step 2.B</a> for more information on permissions. When transferring keys, your permissions may get mixed, and errors may be prompted. These are easily avoided when your folders and files have the right permissions</p>
+<p class="notes"> Refer to <a href="#step-2b">Troubleshooting in Step 2.B</a> for more information on permissions. When transferring keys, your permissions may get mixed, and errors may be prompted. These are easily avoided when your folders and files have the right permissions</p>
 </dd>
 </dl>
 
@@ -522,7 +522,7 @@ alt="Step 3.A: Troubleshoot" /></p>
 
 <p># Open your email client and use "Tools" &rarr; <i>OpenPGP Key Manager</i></p>
 <p># Under "File" &rarr; <i>Import Secret Key(s) From File</i></p>
-<p># Select the file you saved under the name [my_secret_key.asc] in <a href="#step-2b">step 2.b</a> when you exported your key</p>
+<p># Select the file you saved under the name [my_secret_key.asc] in <a href="#step-2b">Step 2.B</a> when you exported your key</p>
 <p># Unlock with your passphrase</p>
 <p># You will receive a "OpenPGP keys successfully imported" window to confirm success</p>
 <p># Go to "Account settings" &rarr; "End-To-End Encryption," and make sure your key is imported and select <i>Treat this key as a Personal Key</i>.</p>