From 74a876a745ed598099fc2fdb0b4fe16b698b5a82 Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Mon, 22 Feb 2016 10:58:46 -0500 Subject: [PATCH] Copying over some HTML validation fixes from Niibe by overwriting the en directory with the one he worked on in the dev repo. --- en/confirmation.html | 4 ++-- en/index.html | 17 ++++++++--------- en/infographic.html | 8 ++++---- en/mac.html | 19 +++++++++---------- en/next_steps.html | 6 +++--- en/windows.html | 17 ++++++++--------- en/workshops.html | 28 ++++++++++++++-------------- 7 files changed, 48 insertions(+), 51 deletions(-) diff --git a/en/confirmation.html b/en/confirmation.html index 905eb58..8a7921c 100644 --- a/en/confirmation.html +++ b/en/confirmation.html @@ -30,12 +30,12 @@

+ class="share-logo" alt="[GNU Social]" />  GNU Social |  + class="share-logo" alt="[Pump.io]" />  Pump.io |  Twitter diff --git a/en/index.html b/en/index.html index 091e413..529b22b 100644 --- a/en/index.html +++ b/en/index.html @@ -24,7 +24,7 @@

@@ -91,7 +91,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 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, and about forty minutes.

+ 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 scrambled 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, and about forty minutes.

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.

@@ -199,8 +199,8 @@
  • On the screen titled "Encryption," select "Encrypt all of my messages by default, because privacy is critical to me."
  • On the screen titled "Signing," select "Don't sign my messages by default."
  • On the screen titled "Key Selection," select "I want to create a new key pair for signing and encrypting my email."
    • -
  • On the screen titled "Create Key," pick a strong password! You can do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in this article by Micah Lee.

    - +

  • On the screen titled "Create Key," pick a strong password! You can do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in this article by Micah Lee.

    +

    • If you'd like to pick a password manually, come up with something you can remember which is at least twelve characters long, and includes at least one lower case and upper case letter and at least one number or punctuation symbol. Never pick a password you've used elsewhere. Don't use any recognizable patterns, such as birthdays, telephone numbers, pets' names, song lyrics, quotes from books, and so on.

    @@ -587,7 +587,6 @@
    End #step-5d .step--> - diff --git a/en/infographic.html b/en/infographic.html index 0d32040..1e0cc93 100644 --- a/en/infographic.html +++ b/en/infographic.html @@ -20,13 +20,13 @@

      + class="share-logo" alt="[GNU Social]" />    + class="share-logo" alt="[Pump.io]" />    + class="share-logo" alt="[Reddit]" />    + class="share-logo" alt="[Hacker News]" />  Share our infographic with the hashtag #EmailSelfDefense diff --git a/en/mac.html b/en/mac.html index b200d57..0c5a41e 100644 --- a/en/mac.html +++ b/en/mac.html @@ -24,7 +24,7 @@ @@ -91,7 +91,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 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, and about forty minutes.

    + 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 scrambled 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, and about forty minutes.

    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.

    @@ -119,7 +119,7 @@

    Step 1.A: Install Wizard

    -

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

    +

    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.

    @@ -203,8 +203,8 @@
  • On the screen titled "Encryption," select "Encrypt all of my messages by default, because privacy is critical to me."
  • On the screen titled "Signing," select "Don't sign my messages by default."
  • On the screen titled "Key Selection," select "I want to create a new key pair for signing and encrypting my email."
    • -
  • On the screen titled "Create Key," pick a strong password! You can do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in this article by Micah Lee.

    - +

  • On the screen titled "Create Key," pick a strong password! You can do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in this article by Micah Lee.

    +

    • If you'd like to pick a password manually, come up with something you can remember which is at least twelve characters long, and includes at least one lower case and upper case letter and at least one number or punctuation symbol. Never pick a password you've used elsewhere. Don't use any recognizable patterns, such as birthdays, telephone numbers, pets' names, song lyrics, quotes from books, and so on.

    @@ -588,7 +588,6 @@
    End #step-5d .step--> - diff --git a/en/next_steps.html b/en/next_steps.html index da7627a..733b895 100644 --- a/en/next_steps.html +++ b/en/next_steps.html @@ -50,12 +50,12 @@

    + class="share-logo" alt="[GNU Social]" />  GNU Social |  + class="share-logo" alt="[Pump.io]" />  Pump.io |  Twitter @@ -120,7 +120,7 @@

    The Onion Router (Tor) network wraps Internet communication in multiple layers of encryption and bounces it around the world several times. When used properly, Tor confuses surveillance field agents and the global surveillance apparatus alike. Using it simultaneously with GnuPG's encryption will give you the best results.

    To have your email program send and receive email over Tor, install the Torbirdy plugin the same way you installed Enigmail, by searching for it through Add-ons.

    -

    Before beginning to check your email over Tor, make sure you understand the security tradeoffs involved. This infographic from our friends at the Electronic Frontier Foundation demonstrates how Tor keeps you secure. +

    Before beginning to check your email over Tor, make sure you understand the security tradeoffs involved. This infographic from our friends at the Electronic Frontier Foundation demonstrates how Tor keeps you secure.

    diff --git a/en/windows.html b/en/windows.html index 8539da8..6a9f2e9 100644 --- a/en/windows.html +++ b/en/windows.html @@ -24,7 +24,7 @@ @@ -91,7 +91,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 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, and about forty minutes.

    + 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 scrambled 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, and about forty minutes.

    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.

    @@ -203,8 +203,8 @@
  • On the screen titled "Encryption," select "Encrypt all of my messages by default, because privacy is critical to me."
  • On the screen titled "Signing," select "Don't sign my messages by default."
  • On the screen titled "Key Selection," select "I want to create a new key pair for signing and encrypting my email."
    • -
  • On the screen titled "Create Key," pick a strong password! You can do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in this article by Micah Lee.

    - +

  • On the screen titled "Create Key," pick a strong password! You can do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in this article by Micah Lee.

    +

    • If you'd like to pick a password manually, come up with something you can remember which is at least twelve characters long, and includes at least one lower case and upper case letter and at least one number or punctuation symbol. Never pick a password you've used elsewhere. Don't use any recognizable patterns, such as birthdays, telephone numbers, pets' names, song lyrics, quotes from books, and so on.

    @@ -583,7 +583,6 @@
    End #step-5d .step--> - diff --git a/en/workshops.html b/en/workshops.html index 2cdca1b..1d9a70f 100644 --- a/en/workshops.html +++ b/en/workshops.html @@ -1,13 +1,13 @@ - + Email Self-Defense - Teach your friends! - - + + - - - + + + @@ -34,10 +34,10 @@
  • Share  -   -   -   - +   +   +   +
    • @@ -45,7 +45,7 @@

    - Free Software Foundation + Free Software Foundation

    @@ -57,14 +57,14 @@

    -

    Donate

    +

    Donate

    - View & share our infographic → + View & share our infographic →

    Understanding and setting up email encryption sounds like a daunting task to many people. That's why helping your friends with GnuPG plays such an important role in helping spread encryption. Even if only one person shows up, that's still one more person using encryption who wasn't before. You have the power to help your friends keep their digital love letters private, and teach them about the importance of free software. If you use GnuPG to send and receive encrypted email, you're a perfect candidate for leading a workshop!

    @@ -78,7 +78,7 @@
    -

    +

    #1 Get your friends or community interested

    If you hear friends grumbling about their lack of privacy, ask them if they're interested in attending a workshop on Email Self-Defense. If your friends don't grumble about privacy, they may need some convincing. You might even hear the classic "if you've got nothing to hide, you've got nothing to fear" argument against using encryption.

    Here are some talking points you can use to help explain why it's worth it to learn GnuPG. Mix and match whichever you think will make sense to your community:

    -- 2.25.1