Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 18 Aug 2015 20:25:53 +0000 (16:25 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 18 Aug 2015 20:25:53 +0000 (16:25 -0400)
1  2 
en/workshops.html

diff --combined en/workshops.html
index 35365f0664998b45026af284007b0cef3b9f2daa,bc801621fc2e7ee5074ab8c548d9d85258ff090f..9b684b2ed51cbca59e349c9cd394cd9f93bd1abc
@@@ -3,7 -3,7 +3,7 @@@
        <head>
                        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
  
-                       <title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
+                       <title>Email Self-Defense - Teach your friends!</title>
                        <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
        <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
  
@@@ -68,7 -68,7 +68,7 @@@
                                <div id="fsf-intro">
                                  <h3>
                                      <a href="http://u.fsf.org/ys">
 -                                      <img alt="Free Software Foundation" src="Email%20Self-Defense%20-%20a%20guide%20to%20fighting%20surveillance%20with%20GnuPG%20encryption_files/fsf-logo.png">
 +                                      <img alt="Free Software Foundation" src="https://static.fsf.org/nosvn/enc-dev0/img/en/fsf-logo.png">
                                      </a>
                                    </h3>
                                    <div class="fsf-emphasis">
@@@ -87,7 -87,7 +87,7 @@@ step towards protecting their privacy w
                                      </p>
                                    </div>
  
 -                                      <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=email_self_defense&amp;pk_kwd=guide_donate"><img alt="Donate" src="Email%20Self-Defense%20-%20a%20guide%20to%20fighting%20surveillance%20with%20GnuPG%20encryption_files/donate.png"></a>  </p>
 +                                      <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=email_self_defense&amp;pk_kwd=guide_donate"><img alt="Donate" src="https://static.fsf.org/nosvn/enc-dev0/img/en/donate.png"></a>  </p>
  
                                </div><!-- End #fsf-intro -->
  
                                <div class="intro">
                                        <p>
                                                <a id="infographic" href="https://emailselfdefense.fsf.org/en/infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/en/infographic-button.png" alt="View &amp; share our infographic →"></a>
-                                       Each person who chooses to resist mass surveillance makes it easier and less out of the ordinary for others to resist as well. People normalizing the use of strong cryptography helps whistle-blowers, dissidents, and activists and blend in better by providing cover traffic.</p>
- <p>There's no objective method of what constitutes an interesting correspondance. As such, don't presume just because you find an email you sent to a friend innocous, your friend (or a third party, for that matter!) feels the same way. Show your friends respect by encrypting your correspondences with them.</p>
- <p>Without our collective complacency, mass surveillance loses its effectiveness. This guide aims to help you facilitate Email Self-Defense workshops within your community, so that we may all stand a better chance of making the world a better, freer place!</p>
+                                       <p>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!</p>
  
                                </div><!-- End .intro -->
  
                        </div>
                </header><!-- End #header -->
  
- <!-- ~~~~~~~~~ Section 0: Why GnuPG>  ~~~~~~~~~ -->
+ <!-- ~~~~~~~~~ Section 1: Get your friends or community interested>  ~~~~~~~~~ -->
                <section class="row" id="section1">
                        <div>
                                        <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
                                <div class="section-intro">
-                                               <h2><em>#0</em> Why GnuPG? </h2>
- <p>NSA whistleblower Edward Snowden once famously <a href="http://www.theguardian.com/world/2013/jun/17/edward-snowden-nsa-files-whistleblower?CMP=twt_gu#block-51bf3588e4b082a2ed2f5fc5">wrote </a>, "Encryption works." When he chose to leak his information <a href="https://firstlook.org/theintercept/2014/10/28/smuggling-snowden-secrets/"> to film maker Laura Poitras</a>, he put his trust in the GNU Privacy Guard , and it didn't let him down. Although “encryption works,” even the most perfect software and algorithms still fail when the underlying system is not secure, or if the user doesn't understand how to properly make the software work for them.</p>
- <p>Setting up a secure computer and understanding how it works is a daunting task, even for many advanced users. Simple mistakes lead to disaster, and many people who would benefit from using GnuPG don't simply because the process sounds too complex. GnuPG is a powerful and versatile program, and it's sad that more people don't use it.</P>
- <p>If you already love GnuPG, do your part to help increase herd immunity to mass surveillance by helping your friends and neighbors master the challenges GnuPG poses. Help them keep their digital love letters private, and teach them the benefits of free software. Oftentimes, users over-calculate the complexity of setting up GnuPG, when all they really need is a ally to sit down with them and help them get started. Go be that friend!</P>
- <p>To fully benefit from this guide, please read it in its entirety before proceeding.</p>
+                                               <h2><em>#1</em> Get your friends or community interested </h2>
+                                               <p>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.</p>
+                                               <p>Here are some arguments you can use to help explain why it's worth it to learn GnuPG. Feel free to mix and match whichever you think will make sense to your community:</p>
  
                                </div><!-- End .section-intro -->
                        </div>