From a062f9ca20bbbcaf8c50985d4a2e80192ed3c131 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Th=C3=A9r=C3=A8se=20Godefroy?= Date: Wed, 4 Aug 2021 13:28:23 +0200 Subject: [PATCH] en/fr: more proposed changes (typo in a command, edit 1b & 2a, minor fixes). --- en/index.html | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/en/index.html b/en/index.html index 02697cc4..9b8c416e 100644 --- a/en/index.html +++ b/en/index.html @@ -197,7 +197,8 @@ page.

Step 1.b Get your terminal ready and install GnuPG

-

If you are using a GNU/Linux machine, you should already have GnuPG installed, and you can skip to Section 2.

+

If you are using a GNU/Linux machine, you should already have GnuPG installed, as well as a terminal, and you can skip to Section 2.

+

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.

@@ -208,9 +209,9 @@ page.
Use a third-party package manager to install GnuPG
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).
-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 Homebrew and paste it in Terminal. Click "Enter" and wait for it to finalize.
-When it is done, install the program by entering the following code in Terminal:
-brew install gnupg gnupg2. After installation is done, you can follow the steps of the rest of this guide.
+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 Homebrew and paste it in Terminal. Click "Enter" and wait for the installation to finalize.
+When this is done, install GnuPG by entering the following code in Terminal:
+brew install gnupg gnupg2. After installation is done, you can follow the steps of the rest of this guide.
@@ -223,6 +224,8 @@ When it is done, install the program by entering the following code in Terminal:
Get GnuPG by downloading GPG4Win

GPG4Win 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.

+ +

To follow the rest of the steps in this guide, you'll use the program called "PowerShell", which you'll see elsewhere referred to as a "terminal." This allows you to operate your computer using the command line.

@@ -298,11 +301,10 @@ alt="Step 2.A: Set your passphrase" />

We will use the command line in a terminal to create a keypair using the GnuPG program.

-

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 Ctrl + Alt + T shortcut.

+

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 Ctrl + Alt + T +shortcut).

# Enter gpg --full-generate-key to start the process.

# To answer what kind of key you would like to create, select the default option: 1 RSA and RSA.

@@ -334,7 +336,7 @@ song lyrics, quotes from books, and so on.

GnuPG is not installed
-GPG is not installed. You can check if this is the case with the command gpg --version. +You can check if this is the case with the command gpg --version. If GnuPG is not installed, it would bring up the following result on most GNU/Linux operating systems, or something like it: Command 'gpg' not found, but can be installed with: sudo apt install gnupg. Follow that command and install the program.
@@ -344,7 +346,8 @@ If GnuPG is not installed, it would bring up the following result on most GNU/Li
How can I see my key?
-Use the following command to see all keys: gpg--list-keys. Yours should be listed in there, and later, so will Edward's (section 3). If you want to see only your key, you can use gpg --list-key [your@email]. +Use the following command to see all keys: gpg --list-keys. Yours should be listed in there, and later, so will Edward's (section 3).
+If you want to see only your key, you can use gpg --list-key [your@email].
You can also use gpg --list-secret-key to see your own private key.
More resources
@@ -352,7 +355,7 @@ You can also use gpg --list-secret-key to see your own private key. href="https://www.gnupg.org/gph/en/manual/c14.html#AEN25">The GNU Privacy Handbook. 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 bits if you want to be secure. @@ -417,7 +420,7 @@ takes a few hours for them to match each other when a new key is uploaded.

# Copy your keyID: gpg --list-key [your@email] 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.

# Generate a revocation certificate: gpg --gen-revoke --output revoke.asc [keyID]

# It will prompt you to give a reason for revocation, we recommend to use 1 = key has been compromised.

-

# You don't have to fill in a reason, but you can, then press enter for an empty line, and confirm your selection.

+

# You don't have to fill in a reason, but you can; then press "Enter" for an empty line, and confirm your selection.

-- 2.25.1