From: Thérèse Godefroy Date: Thu, 12 Aug 2021 12:37:59 +0000 (+0200) Subject: en/index.html: don't mention the terminal until it's needed; minor edits. X-Git-Url: https://vcs.fsf.org/?p=enc.git;a=commitdiff_plain;h=98681fc5f245838ebf27677e0453ef39dd249440 en/index.html: don't mention the terminal until it's needed; minor edits. Remove WIP warning (a062f9ca2 approved by Zoë); further changes for consistency, making macOS text clearer, fixing typos, etc. --- diff --git a/en/index.html b/en/index.html index 10284991..6d8ec20b 100644 --- a/en/index.html +++ b/en/index.html @@ -197,11 +197,11 @@ page.
-

Step 1.b Get your terminal ready and install GnuPG

+

Step 1.b Install GnuPG

-

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 GNU/Linux machine, you should already have GnuPG installed, 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.

+

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.

@@ -210,10 +210,13 @@ 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 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.
+
+

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 in MacOS.

+ +

# Copy the first command on the home page of Homebrew by clicking on the clipboard icon, and paste it in Terminal. Click "Enter" and wait for the installation to finalize.

+

# Then install GnuPG by entering the following code in Terminal:
+brew install gnupg gnupg2

+
@@ -226,8 +229,6 @@ When this is done, install GnuPG 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.

@@ -304,7 +305,7 @@ alt="Step 2.A: Set your passphrase" />

GnuPG program.

Whether on GNU/Linux, macOS or Windows, you can launch your -terminal ("Terminal" in macOS, "Powershell" in Windows) from the Applications +terminal ("Terminal" in macOS, "PowerShell" in Windows) from the Applications menu (some GNU/Linux systems respond to the Ctrl + Alt + T shortcut).

@@ -339,7 +340,7 @@ song lyrics, quotes from books, and so on.

GnuPG is not installed
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: +If GnuPG is not installed, it will 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.
@@ -348,7 +349,7 @@ 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).
+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.
@@ -417,7 +418,7 @@ $ gpg --export -a [keyID] > my_public_key.asc

Generate a revocation certificate

-

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 step 6.C 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 Section 5.

+

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 Step 6.C 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 Section 5.

# 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]