From 6e1b0fa2ede15035992bb7e876de395a0d701774 Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Fri, 6 Jun 2014 17:40:00 -0400 Subject: [PATCH] Making various changes after the first day of feedback. --- index.html | 14 +++++++------- infographic.html | 6 ++++++ mac.html | 14 ++++++-------- windows.html | 17 +++++++---------- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/index.html b/index.html index 9852a702..c43b2a11 100644 --- a/index.html +++ b/index.html @@ -47,7 +47,7 @@

Free Software Foundation

Email Self-Defense is a project of the Free Software Foundation. We fight for computer user's rights, and promote the development of free (as in freedom) software like GnuPG, which is used in this guide.

We have big plans to get this guide in the hands of people under bulk surveillance all over the world, and to make more tools like it. Can you make a donation to help us achieve these goals?

 -

Donate Join now

+

Donate Join now

@@ -55,7 +55,7 @@

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 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. 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 that intercepts your email can't read it.

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 Edward Snowden used to share his famous secrets about the NSA.

@@ -161,7 +161,6 @@

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.

@@ -171,7 +170,7 @@
In many new email programs, the main menu is represented by an image of three stacked horizontal bars. OpenPGP may be inside a section called Tools.
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.
+
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.
@@ -261,8 +260,9 @@
-

Important: Subject lines are not encrypted

+

Important: Security tips

Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system.

+

It's also good practice to click the key icon in your email composition window before you start to write. Otherwise, your email client could save an unencrypted draft on the mail server, potentially exposing it to snooping.

@@ -376,7 +376,7 @@

Important: Be wary of invalid keys

GnuPG makes email safer, but it's still important to watch out for invalid keys, which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.

-

In your email program, go back to the second email that Adele sent you. Because it was encrypted with her key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: Part of this message encrypted."

+

In your email program, go back to the second email that Adele sent you. Because Adele encrypted it with your public key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: Part of this message encrypted."

When using GnuPG, make a habit of glancing at that bar. The program will warn you there if you get an email encrypted with a key that can't be trusted.

@@ -476,7 +476,7 @@

If you like programming, you can contribute code to GnuPG or Enigmail.

-

If you can't do any of these, please donate to the Free Software Foundation so we can get Email Self-Defense into the hands of as many people as possible, and make more tools like it.

Donate Join now

+

If you can't do any of these, please donate to the Free Software Foundation so we can get Email Self-Defense into the hands of as many people as possible, and make more tools like it.

Donate Join now

diff --git a/infographic.html b/infographic.html index 64ef6e0c..502301a2 100644 --- a/infographic.html +++ b/infographic.html @@ -18,6 +18,12 @@

← Read the full guide

Share our infographic with the hashtag #EmailSelfDefense

+

View & share our infographic

Download the source files for the infographic

diff --git a/mac.html b/mac.html index 25d36608..8edcbd1a 100644 --- a/mac.html +++ b/mac.html @@ -45,7 +45,7 @@

Free Software Foundation

Email Self-Defense is a project of the Free Software Foundation. We fight for computer user's rights, and promote the development of free (as in freedom) software like GnuPG, which is used in this guide.

We have big plans to get this guide in the hands of people under bulk surveillance all over the world, and to make more tools like it. Can you make a donation to help us achieve these goals?

 -

Donate Join now

+

Donate Join now

@@ -53,7 +53,7 @@

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 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. 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 that intercepts your email can't read it.

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 Edward Snowden used to share his famous secrets about the NSA.

@@ -170,7 +170,6 @@

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.

@@ -178,9 +177,7 @@
I can't find the OpenPGP menu.
In many new email programs, the main menu is represented by an image of three stacked horizontal bars. OpenPGP may be inside a section called Tools.
-
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.
@@ -270,8 +267,9 @@
-

Important: Subject lines are not encrypted

+

Important: Security tips

Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system.

+

It's also good practice to click the key icon in your email composition window before you start to write. Otherwise, your email client could save an unencrypted draft on the mail server, potentially exposing it to snooping.

@@ -385,7 +383,7 @@

Important: Be wary of invalid keys

GnuPG makes email safer, but it's still important to watch out for invalid keys, which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.

-

In your email program, go back to the second email that Adele sent you. Because it was encrypted with her key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: Part of this message encrypted."

+

In your email program, go back to the second email that Adele sent you. Because Adele encrypted it with your public key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: Part of this message encrypted."

When using GnuPG, make a habit of glancing at that bar. The program will warn you there if you get an email encrypted with a key that can't be trusted.

@@ -492,7 +490,7 @@

If you like programming, you can contribute code to GnuPG or Enigmail.

If you can't do any of these, please donate to the Free Software Foundation so we can get Email Self-Defense into the hands of as many people as possible, and make more tools like it.

-

Donate

+

Donate

diff --git a/windows.html b/windows.html index c70b1fa4..1b663f5d 100644 --- a/windows.html +++ b/windows.html @@ -45,15 +45,15 @@

Free Software Foundation

Email Self-Defense is a project of the Free Software Foundation. We fight for computer user's rights, and promote the development of free (as in freedom) software like GnuPG, which is used in this guide.

We have big plans to get this guide in the hands of people under bulk surveillance all over the world, and to make more tools like it. Can you make a donation to help us achieve these goals?

 -

Donate Join now

+

Donate Join now

- 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 coded to make sure that a surveillance agent or thief can't intercept your email and read it.

+ 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 coded to make sure that a surveillance agent or thief that intercepts your email can't read it.

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 Edward Snowden used to share his famous secrets about the NSA.

@@ -168,7 +168,6 @@

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.

@@ -176,9 +175,6 @@
I can't find the OpenPGP menu.
In many new email programs, the main menu is represented by an image of three stacked horizontal bars. OpenPGP may be inside a section called Tools.
-
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.
@@ -268,8 +264,9 @@
-

Important: Subject lines are not encrypted

+

Important: Security tips

Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system.

+

It's also good practice to click the key icon in your email composition window before you start to write. Otherwise, your email client could save an unencrypted draft on the mail server, potentially exposing it to snooping.

@@ -383,7 +380,7 @@

Important: Be wary of invalid keys

GnuPG makes email safer, but it's still important to watch out for invalid keys, which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.

-

In your email program, go back to the second email that Adele sent you. Because it was encrypted with her key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: Part of this message encrypted."

+

In your email program, go back to the second email that Adele sent you. Because Adele encrypted it with your public key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: Part of this message encrypted."

When using GnuPG, make a habit of glancing at that bar. The program will warn you there if you get an email encrypted with a key that can't be trusted.

@@ -489,7 +486,7 @@

If you like programming, you can contribute code to GnuPG or Enigmail.

If you can't do any of these, please donate to the Free Software Foundation so we can get Email Self-Defense into the hands of as many people as possible, and make more tools like it.

-

Donate

+

Donate

-- 2.25.1