Trying moving newsletter join to the bottom.

diff --git a/index.html b/index.html
index 408b03989a14667ea682476ad42fa588d66d89f8..ee4c5e1c29626be0f0f17c6b7b1bf18965e85cf2 100644 (file)
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
                        <meta charset="utf-8">
                        
                        <title>Email Self-Defense - a guide to fighting surveillance with GnuPG</title>
-                       <meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+                       <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
       <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG.">
 
       <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -48,17 +48,7 @@
                                        <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>
 
                                        <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 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 -->
+                                       
                                </div><!-- End #fsf-intro -->
 
                                <!-- ~~~~~~~~~ Guide Introduction ~~~~~~~~~ -->
@@ -449,6 +439,18 @@
                                                <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>
 
+<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 -->
+
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->
 

diff --git a/mac.html b/mac.html
index c8733f295aadf90df5b9c7391eed6ee7a979ead7..4d02e9a91f84c2cc608f4e8b9fb20449cef98bdf 100644 (file)
--- a/mac.html
+++ b/mac.html
@@ -4,9 +4,8 @@
                        <meta charset="utf-8">
                        
                        <title>Email Self-Defense - a guide to fighting surveillance with GnuPG</title>
-                       <meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+                       <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
       <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG.">
-
       <meta name="viewport" content="width=device-width, initial-scale=1">
                        <link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css">
                <link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />

diff --git a/windows.html b/windows.html
index 0c33a2b42cecfc6abb413b0ec3a2985765433a80..963a84f40c4382baa189d3cdfd62d800639bcf67 100644 (file)
--- a/windows.html
+++ b/windows.html
@@ -4,7 +4,7 @@
                        <meta charset="utf-8">
                        
                        <title>Email Self-Defense - a guide to fighting surveillance with GnuPG</title>
-                       <meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+                       <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
       <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG.">
 
       <meta name="viewport" content="width=device-width, initial-scale=1">