From 8015decf05b802a7b7c3a3acfc5ddba85a914830 Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Wed, 11 Jun 2014 17:43:07 -0400 Subject: [PATCH] Intro and #1 Intro (all OSs): Adding language about needing to resist data collectin to intro and moving FS language to #1 Intro. --- index.html | 11 ++++------- mac.html | 11 +++-------- windows.html | 10 +++------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/index.html b/index.html index 28db6810..b70522f0 100644 --- a/index.html +++ b/index.html @@ -55,15 +55,11 @@

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.

+ 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. All you need for this guide is a computer with an Internet connection, an email account and about half an hour.

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.

- - -

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!

+

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. Let's get started!

@@ -76,7 +72,8 @@

#1 Get the pieces

-

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.

+

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.

+

Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to download it. Before configuring GnuPG though, you'll need a desktop email program installed on your computer. Most GNU/Linux distributions have a free software version of the Thunderbird email program available to install. This guide will work with them, in addition to Thunderbird itself. 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/mac.html b/mac.html index c7244900..7bd20f0a 100644 --- a/mac.html +++ b/mac.html @@ -39,7 +39,6 @@
  • #EmailSelfDefense
    • -

    Free Software Foundation

    @@ -53,15 +52,11 @@

    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.

    + 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. All you need for this guide is a computer with an Internet connection, an email account and about half an hour.

    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.

    - - -

    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 Mac OS). To be as safe as possible from surveillance, we recommend you switch to a free software operating system like GNU/Linux. Learn more about free software at fsf.org.

    - -

    Let's get started!

    +

    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. Let's get started!

    @@ -74,7 +69,7 @@

    #1 Get the pieces

    -

    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.

    +

    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.

    To get started, you'll need a desktop email program installed on your computer. This guide works with free software versions of the Thunderbird email program, and with Thunderbird itself. 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/windows.html b/windows.html index 0ad99c24..2c36538f 100644 --- a/windows.html +++ b/windows.html @@ -53,15 +53,11 @@

    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.

    + 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. All you need for this guide is a computer with an Internet connection, an email account and about half an hour.

    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.

    - - -

    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). To be as safe as possible from surveillance, we recommend you switch to a free software operating system like GNU/Linux. Learn more about free software at fsf.org.

    - -

    Let's get started!

    +

    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. Let's get started!

    @@ -73,7 +69,7 @@

    #1 Get the pieces

    -

    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.

    +

    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.

    To get started, you'll need a desktop email program installed on your computer. This guide works with free software versions of the Thunderbird email program, and with Thunderbird itself. 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