Section 3 security tips: Added that you will have the choice whether or not to encryp...
authorZak Rogoff <zak@fsf.org>
Wed, 18 Jun 2014 20:07:56 +0000 (16:07 -0400)
committerZak Rogoff <zak@fsf.org>
Wed, 18 Jun 2014 20:07:56 +0000 (16:07 -0400)
index.html
mac.html
windows.html

index 0ba1881011cb0f9e3b05f286158b88093798b153..fc438f1daf8199a90563b979922cd4869a9925b6 100644 (file)
                                <div id="step-headers_unencrypted" class="step">
                                        <div class="main">
                                                <h3><em>Important:</em> Security tips</h3>
-                                               <p>Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system.</p>
+                                               <p>Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system. When you send attachments, Enigmail will give you an option of whether you want to encrypt them.</p>
 <p>It's also good practice to click the key icon in your email composition window <strong>before</strong> you start to write. Otherwise, your email client could save an unencrypted draft on the mail server, potentially exposing it to snooping.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-headers_unencrypted .step-->
index 5c8e34fe7f4405f43e440fa1e785949a390b39eb..8babe6c915dadd281fcd222ee4c84f2dce81ec7b 100644 (file)
--- a/mac.html
+++ b/mac.html
@@ -69,7 +69,7 @@
                                        <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
                                <div class="section-intro">
                                                <h2><em>#1</em> Get the pieces</h2>
-                                               <p class="notes">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 <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
+                                               <p class="notes">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 <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
                         <p>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.</p>
                         <p>If you are already have one of these, you can skip to <a href="#step-1b">Step 1.b</a>.</p>
                                </div><!-- End .section-intro -->
                                <div id="step-headers_unencrypted" class="step">
                                        <div class="main">
                                                <h3><em>Important:</em> Security tips</h3>
-                                               <p>Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system.</p>
+                                               <p>Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system. When you send attachments, Enigmail will give you an option of whether you want to encrypt them.</p>
 <p>It's also good practice to click the key icon in your email composition window <strong>before</strong> you start to write. Otherwise, your email client could save an unencrypted draft on the mail server, potentially exposing it to snooping.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-headers_unencrypted .step-->
                                                <p><a id="infographic" href="infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/infographic-button.png" alt="View &amp; share our infographic &rarr;" /></a></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
-                                               <h3>Work for political change</h3>
-                                               <p>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 (<a href="https://my.fsf.org/donate/privacypolicy.html">read our privacy policy</a>)</a>:</p>
+                                               <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>
 <div class="newsletter">
                                                <form method="post" action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31">
-                                                       <input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail"><input type="submit" value="Subscribe me" name="_qf_Edit_next">
+                                                       <input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail"><input type="submit" value="Add me" name="_qf_Edit_next">
                                                        <div>
                                                                <input type="hidden" value="" 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="Edit:cancel" name="_qf_default">
                                                        </div>
                                                </form>
-<br>
+<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>
+                                       </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></small></p>
-                                       </div><!-- End .newsletter -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->
+                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                               <div id="step-friends" class="step">
+<div class="main">
+
+                       <h3>Get your friends involved</h3>
+<p>Before you close this guide, use <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Encrypt with me using Email Self-Defense %40fsf">our sharing page</a> to compose a message to a few friends and ask them to join you in using encrypted email. Remember to include your <a href="#section4">GnuPG public key ID</a> so they can easily download your key.</p>
+                       
+                                       </div><!-- End .main -->
+                               </div><!-- End #step-friends .step -->
 
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-more_technologies" class="step">
 <div class="main">
 
 
+
                        <h3>Protect more of your digital life</h3>
                        
-                                               <p>Learn surveillance-resistant technologies for instant messages, hard drive storage, online sharing and more at <a href="https://directory.fsf.org/wiki/Collection:Privacy_pack"> the Free Software Directory's Privacy Pack</a> and <a href="https://prism-break.org">prism-break.org</a>.</p>
+                                               <p>It's also great to learn surveillance-resistant technologies for instant messages, hard drive storage, online sharing and more at <a href="https://directory.fsf.org/wiki/Collection:Privacy_pack"> the Free Software Directory's Privacy Pack</a> and <a href="https://prism-break.org">prism-break.org</a>.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-more_technologies .step -->
 
index f1a62bc3556fbdc96190c9890f509eb4d76124c9..904bb088ad17115c32cecb1347bcd8223292212c 100644 (file)
@@ -69,7 +69,7 @@
                                        <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
                                <div class="section-intro">
                                                <h2><em>#1</em> Get the pieces</h2>
-                                               <p class="notes">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 <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
+                                               <p class="notes">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 <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
                         <p>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.</p>
                         <p>If you are already have one of these, you can skip to <a href="#step-1b">Step 1.b</a>.</p>
                                </div><!-- End .section-intro -->
                                <div id="step-headers_unencrypted" class="step">
                                        <div class="main">
                                                <h3><em>Important:</em> Security tips</h3>
-                                               <p>Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system.</p>
+                                               <p>Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system. When you send attachments, Enigmail will give you an option of whether you want to encrypt them.</p>
 <p>It's also good practice to click the key icon in your email composition window <strong>before</strong> you start to write. Otherwise, your email client could save an unencrypted draft on the mail server, potentially exposing it to snooping.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-headers_unencrypted .step-->
                                                <p><a id="infographic" href="infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/infographic-button.png" alt="View &amp; share our infographic &rarr;" /></a></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
-                                               <h3>Work for political change</h3>
-                                               <p>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 (<a href="https://my.fsf.org/donate/privacypolicy.html">read our privacy policy</a>)</a>:</p>
+                                               <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>
 <div class="newsletter">
                                                <form method="post" action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31">
-                                                       <input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail"><input type="submit" value="Subscribe me" name="_qf_Edit_next">
+                                                       <input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail"><input type="submit" value="Add me" name="_qf_Edit_next">
                                                        <div>
                                                                <input type="hidden" value="" 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="Edit:cancel" name="_qf_default">
                                                        </div>
                                                </form>
-<br>
+<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>
+                                       </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></small></p>
-                                       </div><!-- End .newsletter -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->
+                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                               <div id="step-friends" class="step">
+<div class="main">
+
+                       <h3>Get your friends involved</h3>
+<p>Before you close this guide, use <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Encrypt with me using Email Self-Defense %40fsf">our sharing page</a> to compose a message to a few friends and ask them to join you in using encrypted email. Remember to include your <a href="#section4">GnuPG public key ID</a> so they can easily download your key.</p>
+                       
+                                       </div><!-- End .main -->
+                               </div><!-- End #step-friends .step -->
 
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-more_technologies" class="step">
 <div class="main">
 
 
+
                        <h3>Protect more of your digital life</h3>
-                       
-                                               <p>Learn surveillance-resistant technologies for instant messages, hard drive storage, online sharing and more at <a href="https://directory.fsf.org/wiki/Collection:Privacy_pack"> the Free Software Directory's Privacy Pack</a> and <a href="https://prism-break.org">prism-break.org</a>.</p>
+                       <p>The biggest single step you can make is to switch to a free software operating system like GNU/Linux, making it much harder for attackers to enter your computer through hidden back doors.</p>
+                                               <p>It's also great to learn surveillance-resistant technologies for instant messages, hard drive storage, online sharing and more at <a href="https://directory.fsf.org/wiki/Collection:Privacy_pack"> the Free Software Directory's Privacy Pack</a> and <a href="https://prism-break.org">prism-break.org</a>.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-more_technologies .step -->