Merge branch 'master' of vcs.fsf.org:enc

diff --git a/index.html b/index.html
index 1391706cd13954946103120d04fe8e23f4861d8b..6f3fd227af78835fea1d958ff5ffeeb4a7f337d1 100644 (file)
--- a/index.html
+++ b/index.html
@@ -458,22 +458,33 @@
                                        </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>
+
+<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 privacy policy.</small></p>
+                                       </div><!-- End .newsletter -->
+
 <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 page, 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</p> 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">
@@ -483,6 +494,7 @@
 <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>