From: Zak Rogoff Date: Wed, 18 Jun 2014 23:19:19 +0000 (-0400) Subject: Changes based on Willie's copyedit. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=66a99343ec7db9d51f38165be3f32570110f4260;p=enc.git Changes based on Willie's copyedit. --- diff --git a/en/index.html b/en/index.html index 59b0a6c1..40d18c24 100644 --- a/en/index.html +++ b/en/index.html @@ -79,7 +79,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 that intercepts your email can't read it. All you need is a computer with an Internet connection, an email account and about half an hour.

+ 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 a surveillance agent or thief intercepting your email can't read it. All you need 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.

@@ -98,7 +98,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.

-

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.

+

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.

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

Step 1.A: Install Wizard

-

Step 1.a Set your email program up with your email account (if it isn't already)

+

Step 1.a Setup your email program with your email account (if it isn't already)

Open your email program and follow the wizard that sets it up with your email account.

@@ -212,7 +212,7 @@

Troubleshooting

The progress bar never finishes
-
Close the upload popup, make sure you are on the Internet and try again. If that doesn't work, try again, selecting a different keyserver.
+
Close the upload popup, make sure you are connected to the Internet, and try again. If that doesn't work, try again, selecting a different keyserver.
My key doesnt appear in the list
Try checking Show Default Keys.
@@ -327,7 +327,7 @@

#4 Learn the Web of Trust

Email encryption is a powerful technology, but it has a weakness; it requires a way to verify that a person's public key is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friend's name, creating keys to go with it and impersonating your friend. That's why the free software programmers that developed email encryption created keysigning and the Web of Trust.

-

When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, into a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.

+

When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, forming a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.

People's public keys are usually identified by their key fingerprint, which is a string of digits like DD878C06E8C2BEDDD4A440D3E573346992AB3FF7 (for Adele's key). You can see the fingerprint for your public key, and other public keys saved on your computer, by going to OpenPGP → Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that so that people can double-check that they have the correct public key when they download yours from a keyserver.

@@ -345,8 +345,8 @@

Step 4.a Sign a key

In your email program's menu, go to OpenPGP → Key Management.

Right click on Adele's public key and select Sign Key from the context menu.

-

In the window that pops up, select "I will not answer" and click OK.

-

In your email program's menu, go to OpenPGP → Key Management → Keyserver → Upload Public Keys and hit OK.

+

In the window that pops up, select "I will not answer" and click ok.

+

In your email program's menu, go to OpenPGP → Key Management → Keyserver → Upload Public Keys and hit ok.

You've just effectively said "I trust that Adele's public key actually belongs to Adele." This doesn't mean much because Adele isn't a real person, but it's good practice.

@@ -390,7 +390,7 @@

When should I encrypt?

-

The more you can encrypt your messages, the better. This is because, if you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.

+

The more you can encrypt your messages, the better. If you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.

That's not to say that only encrypting some of your email isn't helpful -- it's a great start and it makes bulk surveillance more difficult.

@@ -414,8 +414,8 @@

Copy your revocation certificate to somewhere safe

-

Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk or hard drive stored in a safe place in your home.

-

If your private key ever gets lost or stolen, you'll need this certificate file.

+

Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk, or hard drive stored in a safe place in your home.

+

If your private key ever gets lost or stolen, you'll need this certificate file to let people know that you are no longer using that keypair.

diff --git a/en/mac.html b/en/mac.html index f5aa8fb3..d193448e 100644 --- a/en/mac.html +++ b/en/mac.html @@ -52,7 +52,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 that intercepts your email can't read it. All you need is a computer with an Internet connection, an email account and about half an hour.

+ 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 a surveillance agent or thief intercepting your email can't read it. All you need 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.

@@ -70,7 +70,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.

-

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.

+

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.

@@ -80,7 +80,7 @@

Step 1.A: Install Wizard

-

Step 1.a Set your email program up with your email account (if it isn't already)

+

Step 1.a Setup your email program with your email account (if it isn't already)

Open your email program and follow the wizard that sets it up with your email account.

@@ -191,7 +191,7 @@

Troubleshooting

The progress bar never finishes
-
Close the upload popup, make sure you are on the Internet and try again. If that doesn't work, try again, selecting a different keyserver.
+
Close the upload popup, make sure you are connected to the Internet, and try again. If that doesn't work, try again, selecting a different keyserver.
My key doesnt appear in the list
Try checking Show Default Keys.
@@ -307,7 +307,7 @@

#4 Learn the Web of Trust

Email encryption is a powerful technology, but it has a weakness; it requires a way to verify that a person's public key is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friend's name, creating keys to go with it and impersonating your friend. That's why the free software programmers that developed email encryption created keysigning and the Web of Trust.

-

When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, into a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.

+

When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, forming a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.

People's public keys are usually identified by their key fingerprint, which is a string of digits like DD878C06E8C2BEDDD4A440D3E573346992AB3FF7 (for Adele's key). You can see the fingerprint for your public key, and other public keys saved on your computer, by going to OpenPGP → Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that so that people can double-check that they have the correct public key when they download yours from a keyserver.

@@ -325,8 +325,8 @@

Step 4.a Sign a key

In your email program's menu, go to OpenPGP → Key Management.

Right click on Adele's public key and select Sign Key from the context menu.

-

In the window that pops up, select "I will not answer" and click OK.

-

In your email program's menu, go to OpenPGP → Key Management → Keyserver → Upload Public Keys and hit OK.

+

In the window that pops up, select "I will not answer" and click ok.

+

In your email program's menu, go to OpenPGP → Key Management → Keyserver → Upload Public Keys and hit ok.

You've just effectively said "I trust that Adele's public key actually belongs to Adele." This doesn't mean much because Adele isn't a real person, but it's good practice.

@@ -370,7 +370,7 @@

When should I encrypt?

-

The more you can encrypt your messages, the better. This is because, if you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.

+

The more you can encrypt your messages, the better. If you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.

That's not to say that only encrypting some of your email isn't helpful -- it's a great start and it makes bulk surveillance more difficult.

@@ -394,8 +394,8 @@

Copy your revocation certificate to somewhere safe

-

Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk or hard drive stored in a safe place in your home.

-

If your private key ever gets lost or stolen, you'll need this certificate file.

+

Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk, or hard drive stored in a safe place in your home.

+

If your private key ever gets lost or stolen, you'll need this certificate file to let people know that you are no longer using that keypair.

diff --git a/en/next_steps.html b/en/next_steps.html index b470a94c..2042417e 100644 --- a/en/next_steps.html +++ b/en/next_steps.html @@ -88,7 +88,7 @@

Protect more of your digital life

-

Learn surveillance-resistant technologies for instant messages, hard drive storage, online sharing and more at the Free Software Directory's Privacy Pack and prism-break.org.

If you are using Windows, Mac OS or any other proprietary operating system, we recommend you switch to a free software operating system like GNU/Linux. This will make it much harder for attackers to enter your computer through hidden back doors. Check out the Free Software Foundation's endorsed versions of GNU/Linux.

+

Learn surveillance-resistant technologies for instant messages, hard drive storage, online sharing, and more at the Free Software Directory's Privacy Pack and prism-break.org.

If you are using Windows, Mac OS or any other proprietary operating system, we recommend you switch to a free software operating system like GNU/Linux. This will make it much harder for attackers to enter your computer through hidden back doors. Check out the Free Software Foundation's endorsed versions of GNU/Linux.

diff --git a/en/windows.html b/en/windows.html index 90acfc60..0b2501c6 100644 --- a/en/windows.html +++ b/en/windows.html @@ -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 that intercepts your email can't read it. All you need is a computer with an Internet connection, an email account and about half an hour.

+ 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 a surveillance agent or thief intercepting your email can't read it. All you need 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.

@@ -70,7 +70,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.

-

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.

+

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.

@@ -80,7 +80,7 @@

Step 1.A: Install Wizard

-

Step 1.a Set your email program up with your email account (if it isn't already)

+

Step 1.a Setup your email program with your email account (if it isn't already)

Open your email program and follow the wizard that sets it up with your email account.

@@ -189,7 +189,7 @@

Troubleshooting

The progress bar never finishes
-
Close the upload popup, make sure you are on the Internet and try again. If that doesn't work, try again, selecting a different keyserver.
+
Close the upload popup, make sure you are connected to the Internet, and try again. If that doesn't work, try again, selecting a different keyserver.
My key doesnt appear in the list
Try checking Show Default Keys.
@@ -305,7 +305,7 @@

#4 Learn the Web of Trust

Email encryption is a powerful technology, but it has a weakness; it requires a way to verify that a person's public key is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friend's name, creating keys to go with it and impersonating your friend. That's why the free software programmers that developed email encryption created keysigning and the Web of Trust.

-

When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, into a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.

+

When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, forming a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.

People's public keys are usually identified by their key fingerprint, which is a string of digits like DD878C06E8C2BEDDD4A440D3E573346992AB3FF7 (for Adele's key). You can see the fingerprint for your public key, and other public keys saved on your computer, by going to OpenPGP → Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that so that people can double-check that they have the correct public key when they download yours from a keyserver.

@@ -323,8 +323,8 @@

Step 4.a Sign a key

In your email program's menu, go to OpenPGP → Key Management.

Right click on Adele's public key and select Sign Key from the context menu.

-

In the window that pops up, select "I will not answer" and click OK.

-

In your email program's menu, go to OpenPGP → Key Management → Keyserver → Upload Public Keys and hit OK.

+

In the window that pops up, select "I will not answer" and click ok.

+

In your email program's menu, go to OpenPGP → Key Management → Keyserver → Upload Public Keys and hit ok.

You've just effectively said "I trust that Adele's public key actually belongs to Adele." This doesn't mean much because Adele isn't a real person, but it's good practice.

@@ -368,7 +368,7 @@

When should I encrypt?

-

The more you can encrypt your messages, the better. This is because, if you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.

+

The more you can encrypt your messages, the better. If you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.

That's not to say that only encrypting some of your email isn't helpful -- it's a great start and it makes bulk surveillance more difficult.

@@ -392,8 +392,8 @@

Copy your revocation certificate to somewhere safe

-

Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk or hard drive stored in a safe place in your home.

-

If your private key ever gets lost or stolen, you'll need this certificate file.

+

Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk, or hard drive stored in a safe place in your home.

+

If your private key ever gets lost or stolen, you'll need this certificate file to let people know that you are no longer using that keypair.