From: Thérèse Godefroy Date: Wed, 20 Sep 2017 18:40:22 +0000 (+0200) Subject: en: adjust spaces; fix comments. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=305b417edd9bea87793847d19ce118e3cdf00723;p=enc.git en: adjust spaces; fix comments. --- diff --git a/en/confirmation.html b/en/confirmation.html index e2a13d3f..dd0605c4 100644 --- a/en/confirmation.html +++ b/en/confirmation.html @@ -31,13 +31,11 @@ -  GNU Social - |  +  GNU Social  |  -  Pump.io - |  +  Pump.io  |  Twitter

Read why GNU Social and Pump.io are better than Twitter.

diff --git a/en/index.html b/en/index.html index e36e1c7e..6936e0ab 100644 --- a/en/index.html +++ b/en/index.html @@ -96,7 +96,8 @@

- 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 anyone, including 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 anyone, including 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.

@@ -400,7 +401,7 @@
- +

Step 3.d Send a test signed email

@@ -424,7 +425,7 @@

Edward's reply will arrive encrypted, because he prefers to use encryption whenever possible. If everything goes according to plan, it should say "Your signature was verified." If your test signed email was also encrypted, he will mention that first.

-
+ @@ -479,7 +480,7 @@

You may also see public keys referred to by their key ID, which is simply the last eight digits of the fingerprint, like C09A61E8 for Edward. The key ID is visible directly from the Key Management window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to whom you are trying to communicate to verify which one to use.

- +
@@ -500,7 +501,7 @@
- + @@ -566,8 +567,8 @@

Transferring you key

You can use Enigmail's key management window to import and export keys. If you want to be able to read your encrypted email on a different computer, you will need to export your secret key from here. Be warned, if you transfer the key without encrypting the drive it's on the transfer will be dramatically less secure.

-
--> - + --> @@ -590,6 +591,7 @@ --> + diff --git a/en/mac.html b/en/mac.html index ca6d15db..96f0ccf1 100644 --- a/en/mac.html +++ b/en/mac.html @@ -96,7 +96,8 @@

- 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.

+ 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.

@@ -401,7 +402,7 @@
- +

Step 3.d Send a test signed email

@@ -425,7 +426,7 @@

Edward's reply will arrive encrypted, because he prefers to use encryption whenever possible. If everything goes according to plan, it should say "Your signature was verified." If your test signed email was also encrypted, he will mention that first.

-
+ @@ -480,7 +481,7 @@

You may also see public keys referred to by their key ID, which is simply the last eight digits of the fingerprint, like C09A61E8 for Edward. The key ID is visible directly from the Key Management window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to whom you are trying to communicate to verify which one to use.

- +
@@ -501,7 +502,7 @@
- + @@ -567,8 +568,8 @@

Transferring you key

You can use Enigmail's key management window to import and export keys. If you want to be able to read your encrypted email on a different computer, you will need to export your secret key from here. Be warned, if you transfer the key without encrypting the drive it's on the transfer will be dramatically less secure.

-
--> - + --> @@ -591,7 +592,7 @@ --> - + diff --git a/en/next_steps.html b/en/next_steps.html index fb76be79..8e3128b8 100644 --- a/en/next_steps.html +++ b/en/next_steps.html @@ -51,13 +51,11 @@ -  GNU Social - |  +  GNU Social  |  -  Pump.io - |  +  Pump.io  |  Twitter

Read why GNU Social and Pump.io are better than Twitter, and why we don't use Facebook.

@@ -95,7 +93,7 @@
  • Add your public key fingerprint anywhere that you normally display your email address. Some good places are: your email signature (the text kind, not the cryptographic kind), social media profiles, blogs, Websites, or business cards. At the Free Software Foundation, we put ours on our staff page.
    • - +
    @@ -122,7 +120,7 @@

    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 0b0bce6b..a45326cc 100644 --- a/en/windows.html +++ b/en/windows.html @@ -96,7 +96,8 @@

    - 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.

    + 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.

    @@ -396,7 +397,7 @@
    - +

    Step 3.d Send a test signed email

    @@ -420,7 +421,7 @@

    Edward's reply will arrive encrypted, because he prefers to use encryption whenever possible. If everything goes according to plan, it should say "Your signature was verified." If your test signed email was also encrypted, he will mention that first.

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

    You may also see public keys referred to by their key ID, which is simply the last eight digits of the fingerprint, like C09A61E8 for Edward. The key ID is visible directly from the Key Management window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to whom you are trying to communicate to verify which one to use.

    - +
    @@ -496,7 +497,7 @@
    - + @@ -562,8 +563,8 @@

    Transferring you key

    You can use Enigmail's key management window to import and export keys. If you want to be able to read your encrypted email on a different computer, you will need to export your secret key from here. Be warned, if you transfer the key without encrypting the drive it's on the transfer will be dramatically less secure.

    -
    --> - + --> @@ -586,7 +587,7 @@ --> - + diff --git a/en/workshops.html b/en/workshops.html index f749219d..29cb3a02 100644 --- a/en/workshops.html +++ b/en/workshops.html @@ -144,7 +144,7 @@ - +