commit
[enc.git] / en / next_steps.html
index a93b61eaaf24bec1ad490cd971ffd890b35d57fb..21d539c34ab9603d123ebdeadc8407f70818de50 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
        <head>
-                       <meta charset="utf-8" />
+                       <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
                        <title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
                        <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
@@ -27,6 +27,9 @@
 <!-- ~~~~~~~~~ Section 6: Next steps  ~~~~~~~~~ -->
                <section class="row" id="section6">
                        <div>
+
+
+
                                <!-- ~~~~~~~~~ section title + graphics  ~~~~~~~~~ -->
                                <div class="section-intro">
                                                <h2><em>#6</em> Next steps</h2>
                                        <div class="main">
                                                <h3>Join the movement</h3>
 
-<p>You've just taken a huge step towards protecting your privacy online. But each of us acting alone isn't enough. To topple bulk surveillance, we need to build a movement for the autonomy and freedom of all computer users. Join the Free Software Foundation's community  to meet like-minded people and work together for change:</p>
+<p>You've just taken a huge step towards protecting your privacy online. But each of us acting alone isn't enough. To topple bulk surveillance, we need to build a movement for the autonomy and freedom of all computer users. Join the Free Software Foundation's community to meet like-minded people and work together for change.</p>
+
+<p style="font-size:150%">
+  <a href="https://status.fsf.org/fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
+         class="share-logo" alt="[GNU Social]">
+    &nbsp;GNU Social
+  </a> |&nbsp;
+  <a href="http://microca.st/fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+         class="share-logo" alt="[Pump.io]">
+    &nbsp;Pump.io
+  </a> |&nbsp;
+  <a href="https://www.twitter.com/fsf">Twitter</a>
+</p>
+<p><a href="https://www.fsf.org/twitter"><small>Read why GNU Social and Pump.io are better than Twitter.</small></a></p>
+<br />
 <div class="newsletter">
-                                               <form method="post" action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31">
+<p style="font-size:150%">Low-volume mailing list</p>
+
+                                               <form method="post" action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=31">
                                                  <input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail" />
                                                   <input type="submit" value="Add me" name="_qf_Edit_next" />
-                                                 <input type="hidden" value="https://emailselfdefense.fsf.org/en/confirmation.html" name="postURL" />
+                                                         <input type="hidden" value="https://emailselfdefense.fsf.org/en/confirmation.html" name="postURL" />
                                                   <input type="hidden" value="1" name="group[25]" />
-                                                  <input type="hidden" value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31" name="cancelURL" />
+                                                  <input type="hidden" value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=31" name="cancelURL" />
                                                   <input type="hidden" value="Edit:cancel" name="_qf_default" />
                                                </form>
-<p><small>You'll receive action alerts and updates from our low-volume mailing list. Read our <a href="https://my.fsf.org/donate/privacypolicy.html">privacy policy</a>.</small></p>
+<p><small>Read our <a href="https://my.fsf.org/donate/privacypolicy.html">privacy policy</a>.</small></p>
                                        </div><!-- End .newsletter -->
-<br />
-<p>Join us on microblogging services for day-to-day updates:</p>
-<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="http://microca.st/fsf">Pump.io</a> | <a href="https://www.twitter.com/fsf">Twitter</a></p>
-<p><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better than Twitter.</a></p>
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->
+
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-friends" class="step">
 <div class="main">
                                        </div><!-- End .main -->
                                </div><!-- End #step-more_technologies .step -->
 
+
+                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                                <div id="privacy-tor" class="step">
+                                        <div class="main">
+                                                <h3>Optional: Protect Your Privacy with Tor</h3>
+                                                <p><a href=https://www.torproject.org/about/overview.html.en>The Onion Router (Tor) network</a> wraps Internet communication in multiple layers of encryption and bounces it around the world several times. When used properly, Tor confuses surveillance field agents and the global surveillance apparatus alike. To have your email program send and receive email over Tor, install the <a href="https://addons.mozilla.org/en-us/thunderbird/addon/torbirdy/">Torbirdy plugin</a> the same way you installed Enigmail, by searching for it through Add-ons.</p>
+
+                                                <p>Before beginning to check your email over Tor, make sure you understand <a href="https://www.torproject.org/docs/faq.html.en#WhatProtectionsDoesTorProvide">the security tradeoffs involved</a>. This <a href=https://www.eff.org/pages/tor-and-https">infographic</a> demonstrates how Tor keeps you secure.
+                                        </div><!-- End .main -->
+                                </div><!-- End #step-lost_key .step-->
+
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-better" class="step">
 <div class="sidebar">
 
                                                <p>If you like programming, you can contribute code to <a href="https://www.gnupg.org/">GnuPG</a> or <a href="https://www.enigmail.net/home/index.php">Enigmail</a>.</p>
 
-<p>To go the extra mile, support the Free Software Foundation so we can keep improving Email Self-Defense, and make more tools like it.</p><p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=esd&pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" /></a> </p>
+<p>To go the extra mile, support the Free Software Foundation so we can keep improving Email Self-Defense, and make more tools like it.</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="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" /></a> </p>
 
 <br />
 
                                <div id="copyright">
                                        <h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h4>
                                        <p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.1. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></p>
+                                        <p><em>Version 3.0. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></p>
 <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
                                        <p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>