From b9fab8670a6cb36e50bc1c83807e2e037f9acd03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Th=C3=A9r=C3=A8se=20Godefroy?= Date: Sun, 28 Feb 2016 23:20:19 +0100 Subject: [PATCH] en: various fixes - update language picker in index, mac and windows; - add a language picker to workshops; - use same JScript in workshops as in index, to make lang. picker work; - remove

after infographic (to align the paragraph); - remove spurious

; - remove

inside

  • (it made the text smaller); - update content: 40 instead of 30 min; - fix a few comments; - add links to free software definition in mac and windows (reported missing by victorhck); - fix these links to take advantage of MultiViews: https://www.gnu.org/philosophy/free-sw.html --- en/confirmation.html | 2 +- en/index.html | 38 +++++++++--------- en/infographic.html | 2 +- en/mac.html | 37 ++++++++--------- en/next_steps.html | 2 +- en/windows.html | 37 ++++++++--------- en/workshops.html | 96 +++++++++++++++++++++----------------------- 7 files changed, 105 insertions(+), 109 deletions(-) diff --git a/en/confirmation.html b/en/confirmation.html index 8a7921cf..c7034a76 100644 --- a/en/confirmation.html +++ b/en/confirmation.html @@ -5,7 +5,7 @@ Email Self-Defense - a guide to fighting surveillance with GnuPG encryption - + diff --git a/en/index.html b/en/index.html index 009ab501..7361dbad 100644 --- a/en/index.html +++ b/en/index.html @@ -5,7 +5,7 @@ Email Self-Defense - a guide to fighting surveillance with GnuPG encryption - + @@ -22,20 +22,22 @@ @@ -108,7 +110,7 @@

    #1 Get the pieces

    -

    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.

    +

    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 the IceDove desktop email program installed on your computer. Most GNU/Linux distributions have IceDove installed already, though it may be under the alternate name "Thunderbird." 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 already have an email program, you can skip to Step 1.b.

    @@ -199,8 +201,7 @@
  • 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.

    @@ -574,7 +575,7 @@

    Webmail and GnuPG

    When you use a web browser to access your email, you're using webmail, an email program stored on a distant website. Unlike webmail, your desktop email program runs on your own computer. Although webmail can't decrypt encrypted email, it will still display it in its encrypted form. If you primarily use webmail, you'll know to open your email client when you receive a scrambled email.

    - + - diff --git a/en/infographic.html b/en/infographic.html index 1e0cc930..3500f0a8 100644 --- a/en/infographic.html +++ b/en/infographic.html @@ -5,7 +5,7 @@ Email Self-Defense - a guide to fighting surveillance with GnuPG encryption - + diff --git a/en/mac.html b/en/mac.html index 0b6915d6..a0856657 100644 --- a/en/mac.html +++ b/en/mac.html @@ -5,7 +5,7 @@ Email Self-Defense - a guide to fighting surveillance with GnuPG encryption - + @@ -22,20 +22,22 @@ @@ -108,7 +110,7 @@

    #1 Get the pieces

    -

    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 defend your freedom as well as protect yourself from surveillance, we recommend you switch to a free software operating system like GNU/Linux. Learn more about free software at fsf.org.

    +

    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 defend your freedom as well as protect yourself from surveillance, we recommend you switch to a free software operating system like GNU/Linux. Learn more about free software at fsf.org.

    To get started, you'll need the IceDove desktop email program installed on your computer. For your system, IceDove may be known by the alternate name "Thunderbird." 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 already have an email program, you can skip to Step 1.b.

    @@ -203,8 +205,7 @@
  • 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.

    @@ -575,7 +576,7 @@

    Webmail and GnuPG

    When you use a web browser to access your email, you're using webmail, an email program stored on a distant website. Unlike webmail, your desktop email program runs on your own computer. Although webmail can't decrypt encrypted email, it will still display it in its encrypted form. If you primarily use webmail, you'll know to open your email client when you receive a scrambled email.

    - + @@ -108,7 +110,7 @@

    #1 Get the pieces

    -

    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 defend your freedom as well as protect yourself from surveillance, we recommend you switch to a free software operating system like GNU/Linux. Learn more about free software at fsf.org.

    +

    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 defend your freedom as well as protect yourself from surveillance, we recommend you switch to a free software operating system like GNU/Linux. Learn more about free software at fsf.org.

    To get started, you'll need the IceDove desktop email program installed on your computer. For your system, IceDove may be known by the alternate name "Thunderbird." 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 already have an email program, you can skip to Step 1.b.

    @@ -203,8 +205,7 @@
  • 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.

    @@ -570,7 +571,7 @@

    Webmail and GnuPG

    When you use a web browser to access your email, you're using webmail, an email program stored on a distant website. Unlike webmail, your desktop email program runs on your own computer. Although webmail can't decrypt encrypted email, it will still display it in its encrypted form. If you primarily use webmail, you'll know to open your email client when you receive a scrambled email.

    - + + +