From f56da436840885d221c3331975b6ed759060c4db Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Wed, 4 Jun 2014 21:48:48 -0400 Subject: [PATCH] I think this is mostly changes to the intro. --- index.html | 17 +++++++++++++---- mac.html | 3 ++- static | 2 +- windows.html | 4 +++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 672f9be3..4ba2dc03 100644 --- a/index.html +++ b/index.html @@ -67,11 +67,12 @@

View & share our infographic →

-

The goal of this guide is to make it easy to set up email encryption on your computer. Once you've finished, you'll be able to send and receive emails that are coded to make sure that a surveillance agent or thief can't intercept your email and read it.

+

Bulk surveillance violates our fundamental rights and makes free speech risky. But we're far from helpless to do something about it. 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 coded to make sure that a surveillance agent or thief can't intercept your email and read it.

-

All you need is a computer with an Internet connection, an email account and about half an hour. You can use your existing email account for this without affecting it.

This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This makes it safer from surveillance than proprietary software (like Windows). Learn more about free software at fsf.org.

+

Let's get started!

+ @@ -83,7 +84,8 @@

#1 Get the pieces

-

Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to get it. Before starting though, you'll need any one of these desktop email programs installed on your computer: Icedove (for Debian GNU/Linux) or Thunderbird (for other GNU/Linux flavors). Email programs are another way to access the same email accounts you can access in a browser (like GMail), but provide extra features.

+

All you need to start is a computer with an Internet connection, an email account and about half an hour. You can use your existing email account for this without affecting it.

+

Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to donwload it. Before configuring GnuPG though, you'll need any one of these desktop email programs installed on your computer: Icedove (for Debian GNU/Linux) or Thunderbird (for other GNU/Linux flavors). Email programs are another way to access the same email accounts you can access in a browser (like GMail), but provide extra features.

If you are already have one of these, you can skip to Step 1.b.

@@ -149,6 +151,10 @@

#2 Make your keys

To use the GnuPG system, you'll need a public key and a private key (known together as a keypair). Each is a long string of randomly generated numbers that are unique to you. Your public and private keys are linked together by a special mathematical function.

+ +

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 phonebook, where people who want to send you an encrypted email 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 decode encrypted emails other people send to you.

@@ -161,7 +167,7 @@

In your email program's menu, select OpenPGP → Setup Wizard. You don't need to read the text in the window that pops up unless you'd like to, but it's good to read the text on the later screens of the wizard.

On the second screen, titled "Signing," select "No, I want to create per-recipient rules for emails that need to be signed."

Use the default options until you reach the screen titled "Create Key".

-

On the screen titled "Create Key," pick a strong password! Your password should be at least 8 characters and include at least one lower case and upper case letter and at least one punctuation mark. Don't forget it, or all this work will be wasted!

+

On the screen titled "Create Key," pick a strong password! Your password should be at least 12 characters and include at least one lower case and upper case letter and at least one number or punctuation symbol. Don't forget the password, or all this work will be wasted!

The program will take a little while to finish the next step, the "Key Creation" screen. While you wait, do something else with your computer, like watching a movie or browsing the Web. The more you use the computer at this point, the faster the key creation will go.

When the OpenPGP Confirm screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there. You'll learn more about the revocation certificate in Section 5. The setup wizard will ask you to move it onto an external device, but that isn't necessary at this moment.

After creating your key, the Enigmail set-up wizard automatically uploaded it to a keyserver, an online computer that makes everyone's keys available through the Internet.

@@ -175,6 +181,9 @@
The wizard says that it cannot find GnuPG.
Open whatever program you usually use for installing software, and search for GnuPG, then install it. Then restart the Engimail setup wizard by going to OpenPGP → Setup Wizard.
+
What does OpenPGP mean?
+ +
OpenPGP is a protocol that GnuPG uses, just like HTTP is a protocol for the Web. It's a slightly confusing name that Enigmail uses for its menus.
Don't see a solution to your problem?
Please let us know on the feedback page.
diff --git a/mac.html b/mac.html index 59a750ae..c291f03f 100644 --- a/mac.html +++ b/mac.html @@ -8,7 +8,8 @@
-

Before starting, you'll need Thunderbird or a similar desktop email program installed on your computer. Email programs are another way to access the same email accounts you can access in a browser (like GMail), but provide extra features.

+

All you need to start is a computer with an Internet connection, an email account and about half an hour. You can use your existing email account for this without affecting it.

+

To get started, you'll need Thunderbird or a similar desktop email program installed on your computer. Email programs are another way to access the same email accounts you can access in a browser (like GMail), but provide extra features.

If you are already have one of these, you can skip to Step 1.b.

diff --git a/static b/static index cdbd9b92..bcf35a0d 160000 --- a/static +++ b/static @@ -1 +1 @@ -Subproject commit cdbd9b926fed65b08d351ee178e3a1ec8dca05f2 +Subproject commit bcf35a0d86c7843a58dbeef7cb9e52051891568d diff --git a/windows.html b/windows.html index f9419d2f..da5c84b3 100644 --- a/windows.html +++ b/windows.html @@ -8,7 +8,9 @@
-

Before starting, you'll need any one of these desktop email programs installed on your computer: FossaMail or Thunderbird. Email programs are another way to access the same email accounts you can access in a browser (like GMail), but provide extra features.

+

All you need to start is a computer with an Internet connection, an email account and about half an hour. You can use your existing email account for this without affecting it.

+ +

To get started, you'll need any one of these desktop email programs installed on your computer: FossaMail or Thunderbird (FossaMail only works on 32-bit Windows computers). Email programs are another way to access the same email accounts you can access in a browser (like GMail), but provide extra features.

If you are already have one of these, you can skip to Step 1.b.

-- 2.25.1