Various many changes.
authorZak Rogoff <zak@fsf.org>
Fri, 22 Jan 2016 20:30:55 +0000 (15:30 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 22 Jan 2016 20:30:55 +0000 (15:30 -0500)
en/confirmation.html
en/index.html
en/infographic.html
en/mac.html
en/next_steps.html
en/windows.html
en/workshops.html
index.html [deleted file]

index ce7c8bcd59171d37b98dfe7be95eb583faa49094..905eb5810fd0fc90b7b222c6e9468857a1673393 100644 (file)
                        </div>
                </header><!-- End #header -->
 
-<!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
-               <footer class="row" id="footer">
-                       <div>
-                               <div id="copyright">
-                                       <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><em>Version 3.0. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></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>
-                                       <p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
-                                        <p>
-                                          <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/"
-                                             rel="jslicense">
-                                            JavaScript license information
-                                          </a>
-                                        </p>
-                               </div><!-- /#copyright -->
-                               <p class="credits">
-                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
-                               </p><!-- /.credits -->
-                       </div>
-               </footer><!-- End #footer -->
+               <!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
+                               <footer class="row" id="footer">
+                                       <div>
+                                               <div id="copyright">
+                                                       <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-2016 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please support our work by <a href="https://u.fsf.org/yr">joining us as an associate member.</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>. Download the <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">source code of Edward reply bot</a> by Andrew Engelbrecht &lt;sudoman@ninthfloor.org&gt; and Josh Drake &lt;zamnedix@gnu.org&gt;, available under the GNU Affero General Public License. <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+               <p>Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls">PXL-2000</a> by Florian Cramer.</p>
+
+               <p>Download the <a href="emailselfdefense_source.zip">source package</a> for this guide, including fonts, image source files and the text of Edward's messages.</p>
+
+               <p>This site uses the Weblabels standard for labeling <a href="https://www.fsf.org/campaigns/freejs">free JavaScript</a>. View the JavaScript <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense">source code and license information</a>.</p>
+                                               </div><!-- /#copyright -->
+                                               <p class="credits">
+                                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
+                                               </p><!-- /.credits -->
+                                       </div>
+                               </footer><!-- End #footer -->
 
                <script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
                <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
index f4cef5729b45cd220d582f64811599473c6f674f..678194eacbb19a1dd3ca1534b5cc5eec173fe8a0 100644 (file)
@@ -13,7 +13,7 @@
 
        </head>
        <body>
-
+<iframe id="topbanner" src="//static.fsf.org/nosvn/banners/2015fundraiser/2015-fundraiser-banner-no-js.html" width="100%" height="180px" frameborder="0"></iframe>
                <!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
 
                <header class="row"  id="header">
                                                <li>On the screen titled "Encryption," select "Encrypt all of my messages by default, because privacy is critical to me."</li>
                                                <li>On the screen titled "Signing," select "Don't sign my messages by default."</li>
                                                <li>On the screen titled "Key Selection," select "I want to create a new key pair for signing and encrypting my email."</li>
-                                               <li>On the screen titled "Create Key," pick a strong password! We recommend the Diceware method, which creates passwords which are both strong and memorable. To use the Diceware method, you will need dice and this <a href="http://world.std.com/~reinhold/diceware.wordlist.asc">list of words</a>. Do not substitute computer dice for physical dice. Notice that each word on the word list corresponds to a unique five-digit number. Roll one die five times, or five dice once, then string the numbers on the dice dice together to create a five-digit number, and then look up the corresponding word.</li>
+                                               <li>On the screen titled "Create Key," pick a strong password!
+
+<li>If you don't have dice, pick a password which is at least twelve characters long, and includes at least one lower case and upper case letter and at least one number or punctuation symbol. Never pick a password you've used elsewhere. Don't use any recognizable patterns, such as birthdays, telephone numbers, pets' names, song lyrics, quotes from books, and so on. Don't forget your password, or all of this work will be wasted!</li>
+
+                                                       We recommend the Diceware method, which creates passwords which are both strong and memorable. To use the Diceware method, you will need dice and this <a href="http://world.std.com/~reinhold/diceware.wordlist.asc">list of words</a>. Do not substitute computer dice for physical dice. Notice that each word on the word list corresponds to a unique five-digit number. Roll one die five times, or five dice once, then string the numbers on the dice together to create a five-digit number, and then look up the corresponding word.</li>
                                                <li>Repeat this process until you have at least six words, separating each with a space and keeping them all lowercase. You'll end up with a password like "dog help people drive match ice." Don't rearrange or discard the words, because doing so makes the process much less secure.</li>
                                                        <li>Diceware passwords are hard to remember until you've typed them in a handful of times. Write down your password and keep it with you at all times until you've got it memorized. Then, destroy the piece of paper.</li>
-                                               <li>If you don't have dice, pick a password which is at least twelve characters long, and includes at least one lower case and upper case letter and at least one number or punctuation symbol. Never pick a password you've used elsewhere. Don't use any recognizable patterns, such as birthdays, telephone numbers, pets' names, song lyrics, quotes from books, and so on. Don't forget your password, or all of this work will be wasted!</li>
+
 </ul>
                                        <p class="notes">The program will take a little while to finish the next step, the "Key Creation" screen. While you wait, do something else with your computer, like watching a movie or browsing the Web. The more you use the computer at this point, the faster the key creation will go.</p>
                                                <p><span style="font-weight: bold;">When the "Key Generation Completed" screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there). This step is essential for your email self-defense, as you'll learn more about in <a href="#section5">Section 5</a>.</span></p>
@@ -630,11 +634,11 @@ default). Once encryption is off, hit Send.</p>
                        <div>
                                <div id="copyright">
                                        <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-2015 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please support our work by <a href="https://u.fsf.org/yr">joining us as an associate member.</a></p>
+                                       <p>Copyright &copy; 2014-2016 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please support our work by <a href="https://u.fsf.org/yr">joining us as an associate member.</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>. Download the <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">source code of Edward reply bot</a> by Andrew Engelbrecht &lt;sudoman@ninthfloor.org&gt; and Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU Affero General Public License. <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</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>. Download the <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">source code of Edward reply bot</a> by Andrew Engelbrecht &lt;sudoman@ninthfloor.org&gt; and Josh Drake &lt;zamnedix@gnu.org&gt;, available under the GNU Affero General Public License. <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 
-<p>Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
+<p>Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls">PXL-2000</a> by Florian Cramer.</p>
 
 <p>Download the <a href="emailselfdefense_source.zip">source package</a> for this guide, including fonts, image source files and the text of Edward's messages.</p>
 
index 25dc8036915a13de22b15024761d033b47a13acb..0d32040629a633fd7cff50eee17ff4f48cb50f66 100644 (file)
                        </div>
                </header><!-- End #header -->
 
-<!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
-               <footer class="row" id="footer">
-                       <div>
-                               <div id="copyright">
-                                       <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><em>Version 3.0. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></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>
-                                       <p>Download the source packages for <a href="https://fixme.com">this guide</a> and for <a href="https://static.fsf.org/nosvn/enc-dev0/gnupg-infographic.zip">the infographic</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
-                                        <p>
-                                          <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/"
-                                             rel="jslicense">
-                                            JavaScript license information
-                                          </a>
-                                        </p>
-                               </div><!-- /#copyright -->
-                               <p class="credits">
-                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
-                               </p><!-- /.credits -->
-                       </div>
-               </footer><!-- End #footer -->
+               <!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
+                               <footer class="row" id="footer">
+                                       <div>
+                                               <div id="copyright">
+                                                       <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-2016 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please support our work by <a href="https://u.fsf.org/yr">joining us as an associate member.</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>. Download the <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">source code of Edward reply bot</a> by Andrew Engelbrecht &lt;sudoman@ninthfloor.org&gt; and Josh Drake &lt;zamnedix@gnu.org&gt;, available under the GNU Affero General Public License. <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+               <p>Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls">PXL-2000</a> by Florian Cramer.</p>
+
+               <p>Download the <a href="emailselfdefense_source.zip">source package</a> for this guide, including fonts, image source files and the text of Edward's messages.</p>
 
+               <p>This site uses the Weblabels standard for labeling <a href="https://www.fsf.org/campaigns/freejs">free JavaScript</a>. View the JavaScript <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense">source code and license information</a>.</p>
+                                               </div><!-- /#copyright -->
+                                               <p class="credits">
+                                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
+                                               </p><!-- /.credits -->
+                                       </div>
+                               </footer><!-- End #footer -->
                <script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
                <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
index 3a7076648931596cd68c9ef2cfafcab74acbdf05..4ce8106746cc829a85c6ecfa2bb6db7ef9668dcc 100644 (file)
                        </div>
                </section> --><!-- End #faq -->
 
-<!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
-               <footer class="row" id="footer">
-                       <div>
-                               <div id="copyright">
-                                       <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><em>Version 3.0. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></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>
-                                       <p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
-                                        <p>
-                                          <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/"
-                                             rel="jslicense">
-                                            JavaScript license information
-                                          </a>
-                                        </p>
-                               </div><!-- /#copyright -->
-                               <p class="credits">
-                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
-                               </p><!-- /.credits -->
-                       </div>
-               </footer><!-- End #footer -->
+               <!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
+                               <footer class="row" id="footer">
+                                       <div>
+                                               <div id="copyright">
+                                                       <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-2016 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please support our work by <a href="https://u.fsf.org/yr">joining us as an associate member.</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>. Download the <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">source code of Edward reply bot</a> by Andrew Engelbrecht &lt;sudoman@ninthfloor.org&gt; and Josh Drake &lt;zamnedix@gnu.org&gt;, available under the GNU Affero General Public License. <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 
+               <p>Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls">PXL-2000</a> by Florian Cramer.</p>
+
+               <p>Download the <a href="emailselfdefense_source.zip">source package</a> for this guide, including fonts, image source files and the text of Edward's messages.</p>
+
+               <p>This site uses the Weblabels standard for labeling <a href="https://www.fsf.org/campaigns/freejs">free JavaScript</a>. View the JavaScript <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense">source code and license information</a>.</p>
+                                               </div><!-- /#copyright -->
+                                               <p class="credits">
+                                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
+                                               </p><!-- /.credits -->
+                                       </div>
+                               </footer><!-- End #footer -->
                <script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
                <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
index c41b65b6e0a194a44ac38084d01026c668462f83..64d8c94320bb96d5110b65e3170817b3c7423e96 100644 (file)
                        </div>
                </section> --><!-- End #faq -->
 
-<!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
-               <footer class="row" id="footer">
-                       <div>
-                               <div id="copyright">
-                                       <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><em>Version 3.0. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></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>
-                                       <p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
-                                        <p>
-                                          <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/"
-                                             rel="jslicense">
-                                            JavaScript license information
-                                          </a>
-                                        </p>
-                               </div><!-- /#copyright -->
-                               <p class="credits">
-                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
-                               </p><!-- /.credits -->
-                       </div>
-               </footer><!-- End #footer -->
-
+               <!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
+                               <footer class="row" id="footer">
+                                       <div>
+                                               <div id="copyright">
+                                                       <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-2016 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please support our work by <a href="https://u.fsf.org/yr">joining us as an associate member.</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>. Download the <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">source code of Edward reply bot</a> by Andrew Engelbrecht &lt;sudoman@ninthfloor.org&gt; and Josh Drake &lt;zamnedix@gnu.org&gt;, available under the GNU Affero General Public License. <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+               <p>Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls">PXL-2000</a> by Florian Cramer.</p>
+
+               <p>Download the <a href="emailselfdefense_source.zip">source package</a> for this guide, including fonts, image source files and the text of Edward's messages.</p>
+
+               <p>This site uses the Weblabels standard for labeling <a href="https://www.fsf.org/campaigns/freejs">free JavaScript</a>. View the JavaScript <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense">source code and license information</a>.</p>
+                                               </div><!-- /#copyright -->
+                                               <p class="credits">
+                                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
+                                               </p><!-- /.credits -->
+                                       </div>
+                               </footer><!-- End #footer -->
                <script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
                <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
index 3cd6ff5eb895a09d009428a688501af89dec9b68..e07ea353226d4a59b7a9acec2ecedf2c183e5264 100644 (file)
                        </div>
                </section> --><!-- End #faq -->
 
-<!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
-               <footer class="row" id="footer">
-                       <div>
-                               <div id="copyright">
-                                       <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><em>Version 3.0. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></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>
-                                       <p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
-                                        <p>
-                                          <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/"
-                                             rel="jslicense">
-                                            JavaScript license information
-                                          </a>
-                                        </p>
-                               </div><!-- /#copyright -->
-                               <p class="credits">
-                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
-                               </p><!-- /.credits -->
-                       </div>
-               </footer><!-- End #footer -->
+               <!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
+                               <footer class="row" id="footer">
+                                       <div>
+                                               <div id="copyright">
+                                                       <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-2016 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please support our work by <a href="https://u.fsf.org/yr">joining us as an associate member.</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>. Download the <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">source code of Edward reply bot</a> by Andrew Engelbrecht &lt;sudoman@ninthfloor.org&gt; and Josh Drake &lt;zamnedix@gnu.org&gt;, available under the GNU Affero General Public License. <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 
+               <p>Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls">PXL-2000</a> by Florian Cramer.</p>
+
+               <p>Download the <a href="emailselfdefense_source.zip">source package</a> for this guide, including fonts, image source files and the text of Edward's messages.</p>
+
+               <p>This site uses the Weblabels standard for labeling <a href="https://www.fsf.org/campaigns/freejs">free JavaScript</a>. View the JavaScript <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense">source code and license information</a>.</p>
+                                               </div><!-- /#copyright -->
+                                               <p class="credits">
+                                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
+                                               </p><!-- /.credits -->
+                                       </div>
+                               </footer><!-- End #footer -->
                <script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
                <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
index 7479e394c93468b6831767ed0d9eca799ebc10b9..03c86739f74a5f57f4fa684febfe981db759d9aa 100644 (file)
 </section> --><!-- End #faq -->
 
 <!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
-<footer class="row" id="footer">
-       <div>
-               <div id="copyright">
-                       <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 Â© 2014-2015 <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><em><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></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>. â€” <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
-                       <p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna GiedryÅ›, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
-                       <p>
-                               <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense">
-                                       JavaScript license information
-                               </a>
-                       </p>
-               </div><!-- /#copyright -->
-               <p class="credits">
-                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++"></a>
-               </p><!-- /.credits -->
-       </div>
-</footer><!-- End #footer -->
+               <footer class="row" id="footer">
+                       <div>
+                               <div id="copyright">
+                                       <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-2016 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please support our work by <a href="https://u.fsf.org/yr">joining us as an associate member.</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>. Download the <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">source code of Edward reply bot</a> by Andrew Engelbrecht &lt;sudoman@ninthfloor.org&gt; and Josh Drake &lt;zamnedix@gnu.org&gt;, available under the GNU Affero General Public License. <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+<p>Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls">PXL-2000</a> by Florian Cramer.</p>
+
+<p>Download the <a href="emailselfdefense_source.zip">source package</a> for this guide, including fonts, image source files and the text of Edward's messages.</p>
 
+<p>This site uses the Weblabels standard for labeling <a href="https://www.fsf.org/campaigns/freejs">free JavaScript</a>. View the JavaScript <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense">source code and license information</a>.</p>
+                               </div><!-- /#copyright -->
+                               <p class="credits">
+                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
+                               </p><!-- /.credits -->
+                       </div>
+               </footer><!-- End #footer -->
 <script src="http://piwik.fsf.org/piwik.js" async="" defer="" type="text/javascript"></script><script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
 <!--           <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script> -->
 
diff --git a/index.html b/index.html
deleted file mode 100644 (file)
index 6fd19b3..0000000
+++ /dev/null
@@ -1,422 +0,0 @@
-<!DOCTYPE html>
-<html>
-       <head>
-                       <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="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="http://static.fsf.org/nosvn/enc-dev0/css/main.css">
-               <link rel="shortcut icon" href="http://static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
-
-                       <!-- our local static folder url -->
-                       <link rel="stylesheet" href="static/css/main.css">
-
-       </head>
-       <body>
-               <nav class="nav">
-                       <div>
-                               <ul class="os">
-                                       <li><a href="index.html" class="current">GNU/Linux</a></li>
-                                       <li><a href="mac.html">Mac OS</a></li>
-                                       <li><a href="windows.html">Windows</a></li>
-                               </ul>
-                               <!--<ul class="lang">
-                                       <li class="help"><a href="http://libreplanet.org/wiki/GPG_guide">Translate this guide!</a></li>
-                               </ul> -->
-                       </div>
-               </nav>
-
-<!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
-<!-- ~~~~~~~~~  Revision as of 18:53, 1 June 2014 by Zakkai ~~~~~~~~~ -->
-               <header class="row"  id="header">
-
-               <div class="highlight" style="background: red;"><!-- DELETE THIS DIV HIGHLIGHT BEFORE LAUNCH -->
-                               <h3 style="text-align: center;"><strong style="color: white;">Website Under Construction</strong></h3>
-               </div>
-
-                       <div>
-                               <h1>Email Self-Defense</h1>
-                               <div class="intro">
-                                       <p>The goal of this guide is to make it easy to set up email encryption on your computer. Once you've finished, you'll be able to send and receive emails that are coded to make sure that a surveillance agent or thief can't intercept your email and read it. </p>
-                                       <!--<p>You'll also be able to sign emails to show reliably that they are from you. Though the need for signing may be less obvious, you'll actually do it more often.</p>-->
-                                       <p>All you need is a computer with an Internet connection, and email account and about half an hour. You can use your existing email account for this without affecting it.</p>
-
-<p>This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This makes it safer from surveillance than proprietary software (like Windows). Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
-
-                               </div>
-                               <!-- ~~~~~~~~~ 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>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>
-                                       <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 -->
-
-                       </div>
-               </header><!-- End #header -->
-
-<!-- ~~~~~~~~~ Section 1: Get the pieces  ~~~~~~~~~ -->
-               <section class="row" id="section1">
-                       <div>
-                                       <!-- ~~~~~~~~~ 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>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 -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.a</em> Set your email program up with your email account (if it isn't already)</h3>
-                                               <p>Open your email program and follow the wizard that sets it up with your email account.</p>
-
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>What's a wizard?</dt>
-                                                                       <dd>A wizard is a series of windows that pop up to make it easy to get something done on a computer, like installing a program. You click through it, selecting options as you go.</dd>
-                                                               <dt>My email program can't find my account or isn't downloading my mail?</dt>
-                                                                       <dd>Before Googling, we recommend you start by asking other people who use your email system, to figure out the correct settings.</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 #step1-a .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1b" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-01-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
-                                               <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
-
-                                               <ul class="images">
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-02-search.png" alt="Step 1.B: Search Add-ons" /></li><li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-03-install.png" alt="Step 1.B: Install Add-ons" /></li>
-                                               </ul>
-
-                                               <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the menu.</dt>
-                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</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-1b .step -->
-                       </div>
-               </section><!-- End #section1 -->
-
-<!-- ~~~~~~~~~ Section 2: Make your keys  ~~~~~~~~~ -->
-               <section class="row" id="section2">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                       <h2><em>#2</em> Make your keys</h2>
-                                               <p>To use the GnuPG system, you'll need a public key and a private key (known together as a keypair). Each is a long string of randomly generated numbers that are unique to you. Your public and private keys are linked together by a special mathematical function.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-2a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 2.a</em> Make a keypair</h3>
-                                               <p>In your email program's menu, select OpenPGP -> Setup Wizard. You don't need to read the text in the window that pops up unless you'd like to, but it's good to read the text on the later screens of the wizard.</p>
-                                               <p>On the second screen, titled "Signing," select "No, I want to create per-recipient rules for emails that need to be signed."</p>
-                                               <p>Use the default options until you reach the screen titled "Create Key".</p>
-                                               <p>On the screen titled "Create Key," pick a strong password! Your password should be at least 8 characters and include at least one lower case and upper case letter and at least one punctuation mark. Don't forget it, or all this work will be wasted!</p>
-                                       <p>The program will take a little while to finish the next step, the "Key Creation" screen. While you wait, do something else with your computer, like watching a movie or browsing the Web. The more you use the computer at this point, the faster the key creation will go.</p>
-                                               <p>When the OpenPGP Confirm screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there. You'll learn more about the revocation certificate in Section 5. The setup wizard will ask you to move it onto an external device, but that isn't necessary at this moment.</p>
-                                               <p class="highlight">After creating your key, the Enigmail set-up wizard automatically uploaded it to a keyserver, an online computer that makes everyone's keys available through the Internet.</p>
-
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the OpenPGP menu.</dt>
-                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars. OpenPGP may be inside a section called Tools.</dd>
-    <dt>The wizard says that it cannot find GnuPG.</dt>
-
-                                         <dd>Open whatever program you usually use for installing  software, and search for GnuPG, then install it. Then restart the  Engimail setup wizard by going to OpenPGP -> Setup Wizard.</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-2a .step  -->
-                       </div>
-               </section><!-- End #section2 -->
-
-<!-- ~~~~~~~~~ Section 3: Try it out  ~~~~~~~~~ -->
-               <section class="row" id="section3">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#3</em> Try it out!</h2>
-                                               <p>Now you'll try a test correspondence with a computer program named Adele, which knows how to use encryption. You'd follow the same steps if communicating with a real person. Then you'll send your first signed email to a real person!</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 3.a</em> Send Adele your public key</h3>
-                                               <p>This is a special step that you won't have to do when corresponding with real people. In your email program's menu, go to OpenPGP -> Key Management. You should see your key in the list that pops up. Right click on your key and select Send Public Keys by Email. This will create a new draft message, as if you had just hit the Write button.</p>
-
-<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>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-3b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3b" class="step">
-                                       <div class="main">
-                                                       <h3><em>Step 3.b</em> Send a test encrypted email</h3>
-                                                       <p>Write a new email in your email program, addressed to adele-en@gnupp.de. Make the subject "Encryption test" or something similar and write something in the body. Don't send it yet.</p>
-                                                       <p>Click the icon of the key in the bottom right of the composition window (it should turn yellow). This tells Enigmail to encrypt the email with the key you downloaded in the last step.</p>
-                                                       <p>Click Send. Enigmail will pop up a window that says "Recipients not valid, not trusted or not found."</p>
-
-                                                       <p>To encrypt and email to Adele, you need her public key, and so now you'll have Enigmail download it from a keyserver. Click Download Missing Keys and use the default in the pop-up that asks you to choose a keyserver. Once it finds keys, check the first one (Key ID starting with 9), then select ok. Select ok in the next pop-up.</p>
-
-                                                       <p>Now you are back at the "Recipients not valid, not trusted or not found" screen. Select Adele's key from the list and click Ok. If the message doesn't send automatically, you can hit send now.</p>
-                                       <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                                       <div class="troubleshooting">
-                                                               <h4>Troubleshooting</h4>
-                                                               <dl>
-                                                                       <dt>Enigmail can't find Adele's key</dt>
-                                                                               <dd>Close the pop-ups that have appeared since you clicked. Make sure you are connected to the Internet and try again. If that doesn't work, repeat the process, choosing a different keyserver when it asks you to pick one.</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 -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3c" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 3.c</em> Receive a response</h3>
-                                               <p>When Adele receives your email, she will use her private key to decrypt it, then fetch your public key from a keyserver and use it to encrypt a response to you.</p>
-                                               <p class="highlight">Since you encrypted this email with Adele's public key, Adele's private key is required to decrypt it. Adele is the only one with her private key, so no one except her &mdash; not even you &mdash; can decrypt it.</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.</p>
-                                               <p>When you receive Adele's email and open it, Enigmail will automatically detect that it is encrypted with your public key, and then it will use your private key to decrypt it.</p>
-                                               <p class="highlight">Notice the bar that Enigmail shows you with information about the status of Adele's key.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-3c .step -->
-
-<!-- STEP 3D IS COMMENTED OUT UNTIL WE FIND A WAY TO VALIDATE SIGNATURES
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ --
-                               <div id="step-3d" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 3.d</em> Send a test signed email to a friend</h3>
-                                               <p>Write a new email in your email program, addressed to a friend. If you want, tell them about this guide!</p>
-                                               <p>Before sending the email, click the icon of the pencil in the bottom right of the composition window (it should turn yellow). This tells Enigmail to sign the email with you private key.</p>
-                                               <p>After you click send, Enigmail will ask you for your password. It will do this any time it needs to use your public key.</p>
-                                       </div><!-- End .main --
-                               </div><!-- End #step-3d .step -->
-                       </div>
-               </section><!-- End #section3 --
-
-
-<!-- ~~~~~~~~~ Section 4: Learn the Web of Trust  ~~~~~~~~~ -->
-               <section class="row" id="section4">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#4</em> Learn the Web of Trust</h2>
-                                               <p>Email encryption is a powerful technology, but it has a weakness; it requires a way to verify that a person's keypair is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friends name, creating a keypair to go with it and impersonating your friend. They would then be able to impersonate your friend by signing messages with the private key they'd created, and decrypt messages intended for your friend with the public key.</p>
-                                               <p>That's why the programmers that developed email encryption created keysigning and the Web of Trust. Keysigning allows a person to publicly state that they trust that a public key belongs to a specific person. To sign someone's public key, you need to use your private key, so the world will know that it was you.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-4a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/placeholders/placeholder.png" alt="Placeholder" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 4.a</em> Sign a key</h3>
-                                               <p>In your email program's menu, go to OpenPGP -> Key Management.</p>
-                                               <p>Right click on Adele's public key and select Sign Key from the context menu.</p>
-                                               <p>In the window that pops up, select "I will not answer" and click OK.</p>
-                                               <p>In your email program's menu, go to OpenPGP -> Key Management -> Keyserver -> Upload Public Keys and hit OK.</p>
-                                               <p class="highlight">You've just effectively said "I trust that Adele's public key actually belongs to Adele." This doesn't mean much because Adele isn't a real person. Before signing a real person's key, always make sure it actually belongs to them, and answer honestly in the window that pops up and asks "How carefully have you verified that the key you are about to sign actually belongs to the person(s) named above?".</p>
-                                               <p class="highlight">It's important to take keysigning seriously because it will affect people beyond just you and the person who's key you are signing. If someone doubts that a key actually belongs to the person that is says it does, they can go on a keyserver and see the number of signatures that it has. The more it has, the more they are likely to trust it.</p>
-                                               <p class="highlight">The Web of Trust takes this concept to the next level. It is a network of key signatures that is saved in keyservers on the Internet. It builds chains of trust between individuals that do not know each other by passing through others, a bit like the famous <a href="http://en.wikipedia.org/wiki/Six_degrees_of_separation">"six degrees of separation" game</a>. You don't need to understand it in detail to use email encryption, but it will become a powerful tool if you become an advanced user.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-4a .step -->
-                       </div>
-               </section><!-- End #section4 -->
-
-<!-- ~~~~~~~~~ Section 5: Use it well  ~~~~~~~~~ -->
-               <section id="section5" class="row">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#5</em> Use it well</h2>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5a" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 5a</em> When should I encrypt? When should I sign?</h3>
-                                               <p>Everyone uses GnuPG a little differently. Encryption is most important for messages involving finances, personal information, politically sensitive conversations and anything else that you wouldn't want to fall into the wrong hands. Signing is best for when you think there might be concern about your identity, or as a way of demonstrating that you know how to use GnuPG and will be able to decrypt emails. If you're already encrypting, there's no reason not to sign as well, to give the recipient added assurance that the message is from you.</p>
-                                               <p>If you're using your email program (or wherever you have GnuPG set up) often, we recommend that you sign all outgoing messages because it turns you into an ambassador for GnuPG. Anyone can read a signed email, so it doesn't matter if the recipient doesn't yet know how to use email encryption. The more you encrypt the better, but you won't be able to do so unless the recipient has a public key. However, if you've set it up for an email program on your computer, but you primarily use email through your phone, then you'll only want to fire up the email program and use GnuPG for special occasions. If this describes you, we recommend you use </p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5a .step -->
-
-                               <div id="step-5b" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 5b</em> Be wary of invalid keys</h3>
-                                               <p>Coming soon</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5c" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 5c</em> Make it part of your online identity</h3>
-                                               <p>Start writing your key ID anywhere someone would see your email address. Add it to your email signature, social media profile, blog, Website, or business card.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5c .step-->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-lost_key" class="step">
-                                       <div class="main">
-                                               <h3><em>Important:</em> act swiftly if you lose your key</h3>
-                                               <p>If you lose your private key or someone else gets ahold of it (say, by stealing your computer), it's important to revoke it immediately before someone else uses it to steal your identity. This guide doesn't cover how to revoke a key, but it only takes a minute. We recommend you Google it or seek help from a skilled friend. After you're done revoking, send an email to everyone with whom you usually use your key to make sure they know.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-lost_key .step-->
-
-                       </div>
-               </section><!-- End #section5 -->
-
-<!-- ~~~~~~~~~ Section 6: Next steps  ~~~~~~~~~ -->
-               <section class="row" id="section6">
-                       <div>
-                               <!-- ~~~~~~~~~ section title + graphics  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#6</em> Next steps</h2>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-keysigning_party" class="step">
-                                       <div class="main">
-                                               <h3>Go to a keysigning party</h3>
-                                               <p>Keysigning parties are social events designed to build the Web of Trust. Participants match each others' photo IDs and Key IDs, and then get out their laptops and sign each other's public keys. They're a great way to meet likeminded people and learn about new privacy tools, as well as build up people's trust in your key. Look for keysigning at tech events, hackerspaces and nerdy parties.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #keysigning_party .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-programming" class="step">
-                                       <div class="main">
-                                               <h3>Make these tools even better</h3>
-                                               <p>Like programming? Contribute code to <a href="https://www.gnupg.org/">GnuPG</a> or <a href="https://www.enigmail.net/home/index.php">Enigmail</a>. Have an idea for improving this guide? Leave us <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a>.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-programming .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-more_technologies" class="step">
-                                       <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:PRISM"> the Free Software Directory's PRISM Collection</a> and <a href="prism-break.org">prism-break.org</a>.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-more_technologies .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-learn_more" class="step">
-                                       <div class="main">
-                                               <h3>Learn more about GnuPG</h3>
-                                               <p>There are a lot more features of GnuPG to discover, including encrypting files on your computer. There are a variety of resources accessible via Google, but we recommend starting with the links on the <a href="https://www.gnupg.org/documentation/">GnuPG Web site</a>.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-learn_more .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-contribute" class="step">
-                                       <div class="main">
-                                               <h3>Contribute to this guide</h3>
-                                               <ul>
-                                                       <li><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Leave feedback and suggest improvements</a></li>
-                                                       <li>Email us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> if you'd like to help maintain and improve this guide, or to translate it</a></li>
-                                                       <li><a href="https://u.fsf.org/7w">Donate to the Free Software Foundation</a></li>
-                                               </ul>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-contribute .step -->
-
-                       </div>
-               </section><!-- End #section6 -->
-
-<!-- ~~~~~~~~~ FAQ  ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search
-               for /* Guide Sections Background */ then add #faq to the desired color
-
-               <section class="row" id="faq">
-                       <div>
-                               <div class="sidebar">
-                                       <h2>FAQ</h2>
-                               </div>
-
-                               <div class="main">
-                                       <dl>
-                                               <dt>My key expired</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>Who can read encrypted messages? Who can read signed ones?</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>My email program is opening at times I don't want it to open/is now my default program and I don't want it to be.</dt>
-                                                       <dd>Answer coming soon.</dd>
-                                       </dl>
-                               </div>
-                       </div>
-               </section> --><!-- End #faq -->
-
-<!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
-               <footer class="row" id="footer">
-                       <div>
-                               <div id="copyright">
-                                       <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>
-               </footer><!-- End #footer -->
-
-               <script src="http://static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
-               <script src="http://static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
-
-       </body>
-</html>