Propagating replacement of section 6 to other pages.
authorZak Rogoff <zak@fsf.org>
Wed, 18 Jun 2014 21:21:50 +0000 (17:21 -0400)
committerZak Rogoff <zak@fsf.org>
Wed, 18 Jun 2014 21:21:50 +0000 (17:21 -0400)
mac.html
windows.html

index 8babe6c915dadd281fcd222ee4c84f2dce81ec7b..e324cfc2f4e6ef26a4e4e7461c7b13d765b640ef 100644 (file)
--- a/mac.html
+++ b/mac.html
 
 <!-- ~~~~~~~~~ Section 6: Next steps  ~~~~~~~~~ -->
                <section class="row" id="section6">
-                       <div>
-                               <!-- ~~~~~~~~~ section title + graphics  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#6</em> Next steps</h2>
-<p>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?</p>
-                               </div><!-- End .section-intro -->
-
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-political" class="step">
-                                       <div class="sidebar">
-                                               <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 id="step-click_here" class="step">
                                        <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>
-<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="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>
-<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>
-
+                                                                                               <h2><a href="http://enc-dev0.fsf.org/next_steps.html">Click here when you're done</a></h2>
+                                               
                                        </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">
+                               </div><!-- End #step-click_here .step-->
 
-
-
-                       <h3>Protect more of your digital life</h3>
-                       
-                                               <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 -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-better" class="step">
-<div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section6-next-steps.png" alt="Section 6: Next Steps" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3>Make Email Self-Defense tools even better</h3>
-<p><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Leave feedback and suggest improvements to this guide</a>. We welcome translations, but we ask that you contact us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> before you start, so that we can connect you with other translators working in your language.</p>
-
-                                               <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 promote Email Self-Defense as heavily as possible, and make more tools like it.</a><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/donate.en.png"></a>      <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/join.en.png"></a></p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-better .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ --
-                               <div id="step-learn_more" class="step">
-                                       <div class="main">
-                                               <h3>Learn more about GnuPG</h3>
-                                               <p>There are a lot more features of GnuPG to discover, including encrypting files on your computer. There are a variety of resources accessible via Google, but we recommend starting with the links on the <a href="https://www.gnupg.org/documentation/">GnuPG Web site</a>.</p>
-                                       </div><!-- End .main --
-                               </div><!-- End #step-learn_more .step -->
-
-
-                       </div>
                </section><!-- End #section6 -->
 
 <!-- ~~~~~~~~~ FAQ  ~~~~~~~~~ -->
index 904bb088ad17115c32cecb1347bcd8223292212c..dd4a30b5cd6b0697460a33ccbd140617dffdbf02 100644 (file)
 
 <!-- ~~~~~~~~~ Section 6: Next steps  ~~~~~~~~~ -->
                <section class="row" id="section6">
-                       <div>
-                               <!-- ~~~~~~~~~ section title + graphics  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#6</em> Next steps</h2>
-<p>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?</p>
-                               </div><!-- End .section-intro -->
-
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-political" class="step">
-                                       <div class="sidebar">
-                                               <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>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="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>
-<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 .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>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 -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-better" class="step">
-<div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section6-next-steps.png" alt="Section 6: Next Steps" /></p>
-                                       </div><!-- /.sidebar -->
+                       <div id="step-click_here" class="step">
                                        <div class="main">
-                                               <h3>Make Email Self-Defense tools even better</h3>
-<p><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Leave feedback and suggest improvements to this guide</a>. We welcome translations, but we ask that you contact us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> before you start, so that we can connect you with other translators working in your language.</p>
-
-                                               <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 promote Email Self-Defense as heavily as possible, and make more tools like it.</a><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/donate.en.png"></a>      <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/join.en.png"></a></p>
-
+                                                                                               <h2><a href="http://enc-dev0.fsf.org/next_steps.html">Click here when you're done</a></h2>
+                                               
                                        </div><!-- End .main -->
-                               </div><!-- End #step-better .step -->
+                               </div><!-- End #step-click_here .step-->
 
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ --
-                               <div id="step-learn_more" class="step">
-                                       <div class="main">
-                                               <h3>Learn more about GnuPG</h3>
-                                               <p>There are a lot more features of GnuPG to discover, including encrypting files on your computer. There are a variety of resources accessible via Google, but we recommend starting with the links on the <a href="https://www.gnupg.org/documentation/">GnuPG Web site</a>.</p>
-                                       </div><!-- End .main --
-                               </div><!-- End #step-learn_more .step -->
-
-
-                       </div>
                </section><!-- End #section6 -->
 
 <!-- ~~~~~~~~~ FAQ  ~~~~~~~~~ -->