Changing paragraphs in the fsf box and adding tracking links.

diff --git a/index.html b/index.html
index fc20fb70b09f1c73e250ec5728b2a15aa73f6259..fd2df79519f456a0764aaf17372239db0683e4d6 100644 (file)
--- a/index.html
+++ b/index.html
@@ -42,12 +42,11 @@
                                </div>
                                <!-- ~~~~~~~~~ FSF Introduction ~~~~~~~~~ -->
                                <div id="fsf-intro">
-                                       <h3><a href="http://www.fsf.org/"><img alt="Free Software Foundation" src="http://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.
-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>
+                                       <h3><a href="http://u.fsf.org/ys"><img alt="Free Software Foundation" src="http://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><a href="http://fsf.org/jfb"><img alt="Join now" src="http://static.fsf.org/nosvn/enc-dev0/img/join.en.png"></a></p>-->
-                                       <p><a href="http://donate.fsf.org"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/donate.en.png"></a></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>
                                        <div class="newsletter">
                                                <h5>Sign up</h5>
                                                <p>Enter your email address to receive our monthly newsletter, the <a href="https://www.fsf.org/free-software-supporter/">Free Software Supporter</a></p>
@@ -70,7 +69,7 @@ For our next step, we want to set up events to teach Email Self-Defense all over
                                        <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
                                <div class="section-intro">
                                                <h2><em>#1</em> Get the pieces</h2>
-                                               <p>Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to get it. Before starting though, you'll need any one of these desktop email programs installed on your computer: <a href="http://directory.fsf.org/wiki/Icedove">Icedove</a> (for Debian GNU/Linux) or Thunderbird (for other GNU/Linux flavors. 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>Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to get it. Before starting though, you'll need any one of these desktop email programs installed on your computer: <a href="http://directory.fsf.org/wiki/Icedove">Icedove</a> (for Debian GNU/Linux) or Thunderbird (for other GNU/Linux flavors). 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 -->
 
@@ -401,8 +400,8 @@ For our next step, we want to set up events to teach Email Self-Defense all over
                                                <li><a href="http://libreplanet.org/wiki/GPG_guide">Help translate this guide to other languages</a></li>
                                </div><!-- /#contribute -->
                                <div id="copyright">
-                                       <h4><a href="http://www.fsf.org/"><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://fsf.org">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://fsf.org/jfb">Join.</a></p>
+                                       <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>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>
                                </div><!-- /#copyright -->
                        </div>