Propagating fsf area and political change section changes to mac and windows.

diff --git a/mac.html b/mac.html
index 4d02e9a91f84c2cc608f4e8b9fb20449cef98bdf..25d366087739686b930e57af0bead355b4048c35 100644 (file)
--- a/mac.html
+++ b/mac.html
@@ -39,24 +39,14 @@
                                        <li class="share"><a href="https://fsf.org/twitter">#EmailSelfDefense</a></li>
                                </ul>
 
+                               <!-- ~~~~~~~~~ FSF Introduction ~~~~~~~~~ -->
                                <!-- ~~~~~~~~~ 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. We fight for computer user's rights, and promote the development of free (as in freedom) software like GnuPG, which is used in this guide.</p><p>We have big plans to get this guide in the hands of people under bulk surveillance all over the world, and to make more tools like it. Can you make a donation to help us achieve that goal?</p>
+                                       <span  style="font-size:125%"><p>Email Self-Defense is a project of the Free Software Foundation. We fight for computer user's rights, and promote the development of free (as in freedom) software like GnuPG, which is used in this guide.</p><p><strong>We have big plans to get this guide in the hands of people under bulk surveillance all over the world, and to make more tools like it. Can you make a donation to help us achieve these goals?</strong></p></span>
 
-                                       <!--<p><a href="https://u.fsf.org/yr"><img alt="Join now" src="//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>
-                                               <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">
-                                                       <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>Read our <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a></small></p>
-                                       </div><!-- End .newsletter -->
+                                       <p><a href="https://u.fsf.org/7w"><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 #fsf-intro -->
 
                                <!-- ~~~~~~~~~ Guide Introduction ~~~~~~~~~ -->
@@ -462,7 +452,16 @@
                                <div id="step-political" class="step">
                                        <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. One of the key things needed is <a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">reducing the amount of data collected about us in the first place</a>.</p><p>To learn more and participate in efforts for change, join the <a href="https://www.fsf.org/free-software-supporter/subscribe">Free Software Foundation's mailing list.</a></p>
+                                               <p>Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. One of the key things needed is <a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">reducing the amount of data collected about us in the first place</a>. To learn more and participate in efforts for change, join the Free Software Foundation's low-traffic mailing list.</a></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">
+                                                       <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>Read our <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a></small></p>
+                                       </div><!-- End .newsletter -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->

diff --git a/windows.html b/windows.html
index 963a84f40c4382baa189d3cdfd62d800639bcf67..c70b1fa456466a8241b6104d012f0f5597f3b551 100644 (file)
--- a/windows.html
+++ b/windows.html
@@ -43,21 +43,10 @@
                                <!-- ~~~~~~~~~ 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. We fight for computer user's rights, and promote the development of free (as in freedom) software like GnuPG, which is used in this guide.</p><p>We have big plans to get this guide in the hands of people under bulk surveillance all over the world, and to make more tools like it. Can you make a donation to help us achieve that goal?</p>
+                                       <span  style="font-size:125%"><p>Email Self-Defense is a project of the Free Software Foundation. We fight for computer user's rights, and promote the development of free (as in freedom) software like GnuPG, which is used in this guide.</p><p><strong>We have big plans to get this guide in the hands of people under bulk surveillance all over the world, and to make more tools like it. Can you make a donation to help us achieve these goals?</strong></p></span>
 
-                                       <!--<p><a href="https://u.fsf.org/yr"><img alt="Join now" src="//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>
-                                               <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">
-                                                       <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>Read our <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a></small></p>
-                                       </div><!-- End .newsletter -->
+                                       <p><a href="https://u.fsf.org/7w"><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 #fsf-intro -->
 
                                <!-- ~~~~~~~~~ Guide Introduction ~~~~~~~~~ -->
@@ -460,7 +449,16 @@
                                <div id="step-political" class="step">
                                        <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. One of the key things needed is <a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">reducing the amount of data collected about us in the first place</a>.</p><p>To learn more and participate in efforts for change, join the <a href="https://www.fsf.org/free-software-supporter/subscribe">Free Software Foundation's mailing list.</a></p>
+                                               <p>Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. One of the key things needed is <a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">reducing the amount of data collected about us in the first place</a>. To learn more and participate in efforts for change, join the Free Software Foundation's low-traffic mailing list.</a></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">
+                                                       <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>Read our <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a></small></p>
+                                       </div><!-- End .newsletter -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->