From 02e5b8a74b108a5c8cdcdbd06f305271d82040cd Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Fri, 15 Jan 2016 18:32:26 -0500 Subject: [PATCH] Fixing typos. --- en/index.html | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/en/index.html b/en/index.html index 23985cb..069ff47 100644 --- a/en/index.html +++ b/en/index.html @@ -91,9 +91,9 @@

- View & share our infographic →Bulk surveillance violates our fundamental rights and makes free speech risky. This guide will teach you a basic surveillance self-defense skill: email encryption. Once you've finished, you'll be able to send and receive emails that are scrambed to make sure a surveillance agent or thief intercepting your email can't read it. All you need is a computer with an Internet connection, an email account, about forty minutes and five dice (optional, but recommended).

+ View & share our infographic →Bulk surveillance violates our fundamental rights and makes free speech risky. This guide will teach you a basic surveillance self-defense skill: email encryption. Once you've finished, you'll be able to send and receive emails that are scrambed to make sure a surveillance agent or thief intercepting your email can't read them. All you need is a computer with an Internet connection, an email account, about forty minutes and five dice (optional, but recommended).

-

Even if you have nothing to hide, using encryption helps protect the privacy of people you communicate with, and makes life difficult for bulk surveillance systems. If you do have something important to hide, you're in good company; these are the same tools that whistleblowers use to protect their identities while shining light on human rights abuses and government corruption.

+

Even if you have nothing to hide, using encryption helps protect the privacy of people you communicate with, and makes life difficult for bulk surveillance systems. If you do have something important to hide, you're in good company; these are the same tools that whistleblowers use to protect their identities while shining light on human rights abuses, corruption and other crimes.

In addition to using encryption, standing up to surveillance requires fighting politically for a reduction in the amount of data collected on us, but the essential first step is to protect yourself and make surveillance of your communication as difficult as possible. This guide helps you do that. It is designed for beginners, but if you already know the basics of GnuPG or are an experienced free software user, you'll enjoy the advanced tips.

@@ -120,8 +120,9 @@

Step 1.A: Install Wizard

-

Step 1.a Setup your email program with your email account

-

Open your email program and follow the wizard (step-by-step walkthrough) that sets it up with your email account. Look for the letters SSL, TLS, or STARTTLS to the right of the servers when you're setting up your account. If you don't see them, you will still be able to use encryption, but this means that the people running your email system are running behind the industry standard in protecting your security and privacy. We recommend that you send them a friendly email asking them to enable SSL, TLS, or STARTTLS for your email server. They will know what you're talking about, so it's worth making the request even if you aren't an expert on these security systems.

+

Step 1.a Set up your email program with your email account

+

Open your email program and follow the wizard (step-by-step walkthrough) that sets it up with your email account.

+

Look for the letters SSL, TLS, or STARTTLS to the right of the servers when you're setting up your account. If you don't see them, you will still be able to use encryption, but this means that the people running your email system are running behind the industry standard in protecting your security and privacy. We recommend that you send them a friendly email asking them to enable SSL, TLS, or STARTTLS for your email server. They will know what you're talking about, so it's worth making the request even if you aren't an expert on these security systems.

@@ -160,8 +161,7 @@
I can't find the menu.
In many new email programs, the main menu is represented by an image of three stacked horizontal bars.
My email looks weird
-
Enigmail doesn't tend to play nice with HTML, which is used to format emails. To send an HTML-formatted email without encryption and or a signature, hold down the Shift key when you select compose. You can then write an email as if Enigmail wasn't there.
-
In many new email programs, the main menu is represented by an image of three stacked horizontal bars.
+
Enigmail doesn't tend to play nice with HTML, which is used to format emails, so it may disable your HTML formatting automatically. To send an HTML-formatted email without encryption or a signature, hold down the Shift key when you select compose. You can then write an email as if Enigmail wasn't there.
@@ -183,8 +183,8 @@

Your public key isn't like a physical key, because it's stored in the open in an online directory called a keyserver. People download it and use it, along with GnuPG, to encrypt emails they send to you. You can think of the keyserver as a phonebook; people who want to send you encrypted email can look up your public key.

-

Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key to descramble encrypted emails other people send to you. You should never share you private key with anyone, under any circumstances.

-

In addition to encryption and decryption, you can also use these keys to sign messages and check the authenticity of other people's signatures. This process helps stop impersonators. We'll discuss this more in the next section.

+

Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key together to descramble encrypted emails other people send to you. You should never share you private key with anyone, under any circumstances.

+

In addition to encryption and decryption, you can also use these keys to sign messages and check the authenticity of other people's signatures. We'll discuss this more in the next section.

@@ -218,7 +218,7 @@
Open whatever program you usually use for installing software, and search for GnuPG, then install it. Then restart the Enigmail setup wizard by going to Enigmail → Setup Wizard.
My email looks weird
-
Enigmail doesn't tend to play nice with HTML, which is used to format emails. To use it, you'll have to hold down the Shift key when you select compose. You can then write an email as if Enigmail wasn't there.
+
Enigmail doesn't tend to play nice with HTML, which is used to format emails, so it may disable your HTML formatting automatically. To send an HTML-formatted email without encryption or a signature, hold down the Shift key when you select compose. You can then write an email as if Enigmail wasn't there.
More resources
If you're having trouble with our instructions or just want to learn more, check out Enigmail's wiki instructions for key generation.
@@ -237,7 +237,7 @@
Command line key generation
-
If you prefer using the command line for a higher degree of control, you can follow the documentation from 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 recommendeds. Also make sure your key is at least 2048 bits, or 4096 if you really want to be secure.
+
If you prefer using the command line for a higher degree of control, you can follow the documentation from 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 2048 bits, or 4096 if you want to be extra secure.
Advanced key pairs
When GnuPG creates a new keypair, it compartmentalizes the encryption function from the signing function through subkeys. If you use subkeys carefully, you can keep your GnuPG identity much more secure and recover from a compromised key much more quickly. Alex Cabal and the Debian wiki provide good guides for setting up a secure subkey configuration.
@@ -277,7 +277,7 @@

Advanced

Uploading a key from the command line
-
You can also upload your keys to a keyserver through the command line. The sks Web site maintains a list highly interconnected keyservers. You can also directly export your key as a file on your computer.
+
You can also upload your keys to a keyserver through the command line. The sks Web site maintains a list of highly interconnected keyservers. You can also directly export your key as a file on your computer.
@@ -651,8 +651,8 @@ default). Once encryption is off, hit Send.

// @license-end - - + + -- 2.25.1