From 7d8fbcb02b28ca4ff91bba6d3ef375a594a27d63 Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Wed, 18 Jun 2014 15:23:36 -0400 Subject: [PATCH] Section 6: Propagating new Section 6 to Windows and Mac versions. This includes removing the cryptoparty step. --- mac.html | 39 ++++++++++++++------------------------- windows.html | 38 ++++++++++++++------------------------ 2 files changed, 28 insertions(+), 49 deletions(-) diff --git a/mac.html b/mac.html index c6845759..5c8e34fe 100644 --- a/mac.html +++ b/mac.html @@ -430,29 +430,15 @@

You've now completed the basics of email encryption with GnuPG, taking action against bulk surveillance. A pat on the back to you! Want to do more to secure privacy for yourself and the people you communicate with?

+ -
+
-

Section 6: Next Steps

+

View & share our infographic →

-
-

Go to a keysigning party

-

Keysigning parties are social events designed to build the Web of Trust. Participants match each others' photo IDs and key IDs, and then get out their laptops and sign each other's public keys. They're a great way to meet likeminded people and learn about new privacy tools, as well as build up people's trust in your key. Look for keysignings at tech events, hackerspaces and nerdy parties.

-
-
- -
-
-

Switch to GNU/Linux for maximum safety

-

Mac OS is a nonfree operating system, which means that no one but Apple gets to see the code it runs on. This makes running Mac OS risky for your privacy -- there's no way to know if it's spying on you.

To push back hard against surveillance, we recommend you switch to a free software operating system like GNU/Linux. Free operating systems are completely transparent, so anyone can find and remove dangerous code. Learn more about free software at fsf.org.

-
-
- - -

Work for political change

-

Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. One of the key things needed is reducing the amount of data collected about us in the first place. To learn more and participate in efforts for change, join the Free Software Foundation's low-traffic mailing list.

+

Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. To learn more and participate in efforts for change, join the Free Software Foundation's low-traffic mailing list (read our privacy policy):

-

Read our Privacy Policy

+
+

Join us on microblogging services for day-to-day updates:

+

GNU Social | Pump.io | Twitter

+

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

-
-
-

View & share our infographic →

-
+
@@ -485,13 +471,16 @@
+
+

Section 6: Next Steps

+

Make Email Self-Defense tools even better

-

Leave feedback and suggest improvements to this guide, or email us at campaigns@fsf.org if you'd like to help maintain or translate it.

+

Leave feedback and suggest improvements to this guide. We welcome translations, but we ask that you contact us at campaigns@fsf.org before you start, so that we can connect you with other translators working in your language.

If you like programming, you can contribute code to GnuPG or Enigmail.

-

If you can't do any of these, please support the Free Software Foundation so we can get Email Self-Defense into the hands of as many people as possible, and make more tools like it.

Donate Join now

+

To go the extra mile, support the Free Software Foundation so we can promote Email Self-Defense as heavily as possible, and make more tools like it.

Donate Join now

diff --git a/windows.html b/windows.html index a47fcf65..f1a62bc3 100644 --- a/windows.html +++ b/windows.html @@ -428,28 +428,15 @@

You've now completed the basics of email encryption with GnuPG, taking action against bulk surveillance. A pat on the back to you! Want to do more to secure privacy for yourself and the people you communicate with?

+ -
+
-

Section 6: Next Steps

+

View & share our infographic →

-
-

Go to a keysigning party

-

Keysigning parties are social events designed to build the Web of Trust. Participants match each others' photo IDs and key IDs, and then get out their laptops and sign each other's public keys. They're a great way to meet likeminded people and learn about new privacy tools, as well as build up people's trust in your key. Look for keysignings at tech events, hackerspaces and nerdy parties.

-
-
- -
-
-

Switch to GNU/Linux for maximum safety

-

Windows is a nonfree operating system, which means that no one but Apple gets to see the code it runs on. This makes running Windows risky for your privacy -- there's no way to know if it's spying on you.

To push back hard against surveillance, we recommend you switch to a free software operating system like GNU/Linux. Free operating systems are completely transparent, so anyone can find and remove dangerous code. Learn more about free software at fsf.org.

-
-
- -

Work for political change

-

Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. One of the key things needed is reducing the amount of data collected about us in the first place. To learn more and participate in efforts for change, join the Free Software Foundation's low-traffic mailing list.

+

Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. To learn more and participate in efforts for change, join the Free Software Foundation's low-traffic mailing list (read our privacy policy):

-

Read our Privacy Policy

+
+

Join us on microblogging services for day-to-day updates:

+

GNU Social | Pump.io | Twitter

+

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

-
-
-

View & share our infographic →

-
+
@@ -482,13 +469,16 @@
+
+

Section 6: Next Steps

+

Make Email Self-Defense tools even better

-

Leave feedback and suggest improvements to this guide, or email us at campaigns@fsf.org if you'd like to help maintain or translate it.

+

Leave feedback and suggest improvements to this guide. We welcome translations, but we ask that you contact us at campaigns@fsf.org before you start, so that we can connect you with other translators working in your language.

If you like programming, you can contribute code to GnuPG or Enigmail.

-

If you can't do any of these, please support the Free Software Foundation so we can get Email Self-Defense into the hands of as many people as possible, and make more tools like it.

Donate Join now

+

To go the extra mile, support the Free Software Foundation so we can promote Email Self-Defense as heavily as possible, and make more tools like it.

Donate Join now

-- 2.25.1