From 63fe86d589e79a0771196cff7c2a3fcf1e0b19b6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Th=C3=A9r=C3=A8se=20Godefroy?= <godef.th@free.fr>
Date: Thu, 12 Aug 2021 18:51:33 +0200
Subject: [PATCH] en: synchronize with enc up to 97b7b36.

---
 en/index.html | 61 +++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/en/index.html b/en/index.html
index 9ad7022..fc51eb0 100644
--- a/en/index.html
+++ b/en/index.html
@@ -20,7 +20,6 @@ href="../static/img/favicon.ico" />
 
 <!-- PLACE FUNDRAISER MODAL WINDOW HERE -->
 
-
 <!-- ~~~~~~~~~ GnuPG Header and introduction text ~~~~~~~~~ -->
 <header class="row" id="header"><div>
 
@@ -142,9 +141,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 ~~~~~~~~~ -->
@@ -198,10 +194,11 @@ page</a>.</dd>
 <div id="step-1b" class="step">
 <div class="main">
 
-<h3><em>Step 1.b</em> Get your terminal ready and install GnuPG</h3>
+<h3><em>Step 1.b</em> 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">Section 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">Step 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>
+<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 instructions. For the rest of this guide, the steps are the same for all operating systems. </p>
 
 <!-- ~~~~~~~~~ MACOS ~~~~~~~~~ -->
 <div class="troubleshooting">
@@ -210,10 +207,13 @@ page</a>.</dd>
 
 <dl>
 <dt>Use a third-party package manager to install GnuPG</dt>
-<dd>Your macOS comes with a program called "Terminal" pre-installed, which we'll use to set up your encryption with GnuPG, using the command line. However, the default macOS package manager makes it difficult to install GnuPG and other pieces of free software (like Emacs, GIMP, or Inkscape).<br/>
-To make things easier, we recommend setting up the third-party package manager "Homebrew" to install GnuPG. Copy the link on the home page of <a href="https://brew.sh/">Homebrew</a> and paste it in Terminal. Click "Enter" and wait for it to finalize.<br/>
-When it is done, install the program by entering the following code in Terminal:<br/>
-<code>brew install gnupg gnupg2</code>&#65279;. After installation is done, you can follow the steps of the rest of this guide.</dd>
+<dd>
+<p>The default macOS package manager makes it difficult to install GnuPG and other pieces of free software (like Emacs, GIMP, or Inkscape). To make things easier, we recommend setting up the third-party package manager "Homebrew" to install GnuPG. For this, we will use a program called "Terminal," which is pre-installed on macOS.</p>
+
+<p># Copy the first command on the home page of <a href="https://brew.sh/">Homebrew</a> by clicking on the clipboard icon, and paste it in Terminal. Click "Enter" and wait for the installation to finalize.</p>
+<p># Then install GnuPG by entering the following code in Terminal:<br/>
+<code>brew install gnupg gnupg2</code></p>
+</dd>
 </dl>
 
 </div><!-- /.troubleshooting -->
@@ -226,8 +226,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 +297,19 @@ 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">Whether on GNU/Linux, macOS or Windows, you can launch your
+terminal ("Terminal" in macOS, "PowerShell" in Windows) from the Applications
+menu (some GNU/Linux systems respond to 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>
@@ -333,8 +336,8 @@ song lyrics, quotes from books, and so on.</p>
 <dl>
 <dt>GnuPG is not installed</dt>
 <dd>
-GPG is not installed. You can check if this is the case with the command <code>gpg --version</code>&#65279;.
-If GnuPG is not installed, it would bring up the following result on most GNU/Linux operating systems, or something like it:
+You can check if this is the case with the command <code>gpg --version</code>&#65279;.
+If GnuPG is not installed, it will bring up the following result on most GNU/Linux operating systems, or something like it:
 <samp>Command 'gpg' not found, but can be installed with:
   sudo apt install gnupg</samp>. Follow that command and install the program.</dd>
 
@@ -343,7 +346,8 @@ If GnuPG is not installed, it would bring up the following result on most GNU/Li
 
 <dt>How can I see my key?</dt>
 <dd>
-Use the following command to see all keys: <code>gpg --list-keys</code>&#65279;. Yours should be listed in there, and later, so will Edward's (<a href="#section3">Section 3</a>). If you want to see only your key, you can use <code>gpg --list-key [your@email]</code>&#65279;. 
+Use the following command to see all keys: <code>gpg --list-keys</code>&#65279;. Yours should be listed in there, and later, so will Edward's (<a href="#section3">Section 3</a>).<br />
+If you want to see only your key, you can use <code>gpg --list-key [your@email]</code>&#65279;.<br />
 You can also use <code>gpg --list-secret-key</code> to see your own private key.</dd>
 
 <dt>More resources</dt>
@@ -351,7 +355,7 @@ You can also use <code>gpg --list-secret-key</code> to see your own private key.
 href="https://www.gnupg.org/gph/en/manual/c14.html#AEN25">The GNU Privacy
 Handbook</a>. Make sure you stick with "RSA and RSA" (the default),
 because it's newer and more secure than the algorithms the documentation
-recommends. Also make sure your key is at least 4096 bits if you
+recommends. Also make sure your key is at least 4096&nbsp;bits if you
 want to be secure.</dd>
 
 <dt class="feedback">Don't see a solution to your problem?</dt>
@@ -405,19 +409,18 @@ 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>
 
 <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> 
+<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> 
  
 <p># Copy your keyID: <code>gpg --list-key [your@email]</code> will list your public ("pub") key information, including your keyID, which is a unique list of numbers and letters. Copy this keyID, so you can use it in the following command.</p>
 <p># Generate a revocation certificate: <code>gpg --gen-revoke --output revoke.asc [keyID]</code></p>
 <p># It will prompt you to give a reason for revocation, we recommend to use <samp>1&nbsp;=&nbsp;key has been compromised</samp>.</p>
-<p># You don't have to fill in a reason, but you can, then press "Enter" for an empty line, and confirm your selection.</p>
+<p># You don't have to fill in a reason, but you can; then press "Enter" for an empty line, and confirm your selection.</p>
 
 
 <!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
@@ -464,9 +467,9 @@ your key</a> as a file on your computer.</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 --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>
 
@@ -478,7 +481,7 @@ $ gpg --edit-key [your@email]
 
 <p>Because this is your key, you should choose <code>ultimate</code>&#65279;. 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 +525,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>
-- 
2.25.1