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

diff --git a/index.html b/index.html
index 43569d36fbddd4c0d28e5d9a9d50f0381f0eba34..0c16c43d88e9134f0cb214a90afc03354929c179 100644 (file)
--- a/index.html
+++ b/index.html
@@ -50,7 +50,8 @@
                                <!-- ~~~~~~~~~ FSF Introduction ~~~~~~~~~ -->
                                <div id="fsf-intro">
                                        <h3><a href="http://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h3>
-                                       <p>Email Self-Defense is a project of the Free Software Foundation. The FSF works to secure freedom for computer users by promoting the development and use of free (as in freedom) software and documentation.</p><p>For our next step, we want to set up events to teach Email Self-Defense all over the world. Can you pitch in to help?</p>
+                                       <p>Email Self-Defense is a project of the Free Software Foundation. The FSF works to secure freedom for computer users by promoting the development and use of free (as in freedom) software and documentation.</p><p>We have big plans to get it in the hands of people under bulk surveillance all over the world, and make more tools like it. Can you make a donation to help us achieve that goal?   
+</p>
 
                                        <!--<p><a href="https://u.fsf.org/yr"><img alt="Join now" src="http://static.fsf.org/nosvn/enc-dev0/img/join.en.png"></a></p>-->
                                        <p><a href="https://u.fsf.org/7w"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/donate.en.png"></a></p>
@@ -198,17 +199,6 @@
 <p>Put at least one word (whatever you want) in the subject and body of the email, then hit send.</p>
 
 <p>It may take two or three minutes for Adele to respond. In the meantime, you might want to skip ahead and check out the Use it well section of this guide. Once she's responded, head to the next step. From here one, you'll be doing just the same thing as when corresponding with a real person.</p>
-
-                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>PLACEHOLDER</dt>
-                                                                       <dd>PLACEHOLDER</dd>
-                                                               <dt class="feedback">Don't see a solution to your problem?</dt>
-                                                                       <dd class="feedback">Please let us know on the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
-                                                       </dl>
-                                               </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
                                </div><!-- End #step-3b .step -->