en: add "End .intro" comment.
[enc.git] / en / index.html
index ac23298776e4cc55e27a64edc34b3cceb1111998..35a350543f044ba1c0c86dd082171c575fdf47b3 100644 (file)
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
        <head>
-                       <meta charset="utf-8">
+                       <meta charset="utf-8" />
 
                        <title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
                        <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="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">
+      <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" />
 
        </head>
                           <!-- Language list for browsers that do not have JS enabled -->
                           <ul id="languages" class="os">
                             <li><a class="current" href="/en">english</a></li>
-                            <li><a href="/es">español</a></li>
+                            <!--<li><a href="/es">español</a></li>-->
                             <li><a href="/fr">français</a></li>
                             <li><a href="/de">deutsch</a></li>
+                            <!--<li><a href="/it">italiano</a></li>-->
                             <li><a href="/pt-br">português do Brasil</a></li>
                             <li><a href="/tr">türkçe</a></li>
                             <!--<li><a href="/ro">română</a></li>-->
                             <li><a href="/ru">русский</a></li>
-                            <li><a href="/ml">മലയാളം</a></li>
+                            <!--<li><a href="/ml">മലയാളം</a></li>-->
                             <!--<li><a href="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
-                            <li><a href="/el">ελληνικά</a></li>
+                            <!--<li><a href="/el">ελληνικά</a></li>-->
+                            <!--<li><a href="/ar">العربية</a></li>-->
                           </ul>
 
                           <ul id="menu" class="os">
@@ -58,7 +60,7 @@
                                  <h3>
                                     <a href="http://u.fsf.org/ys">
                                       <img alt="Free Software Foundation"
-                                           src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png">
+                                           src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" />
                                     </a>
                                   </h3>
                                   <div class="fsf-emphasis">
@@ -72,7 +74,7 @@
                                     </p>
                                   </div>
 
-                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=esd&pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png"></a>      <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/en/join.png"></a></p>
+                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=esd&pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" /></a>      <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/en/join.png" /></a></p>
 
                                </div><!-- End #fsf-intro -->
 
@@ -86,7 +88,7 @@
 
 <p>In addition to using encryption, standing up to surveillance requires fighting politically for a <a href="http://gnu.org/philosophy/surveillance-vs-democracy.html">reduction in the amount of data collected on us</a>, but the essential first step is to protect yourself and make surveillance of your communication as difficult as possible. Let's get started!</p>
 
-                               </div>
+                               </div><!-- End .intro -->
 
                        </div>
                </header><!-- End #header -->
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
-                               </div><!-- End #step-2a .step  -->
+                               </div><!-- End #step-2b .step  -->
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="terminology" class="step">
                                        <div class="main">
 
 <p class="notes">It may take two or three minutes for Edward to respond. In the meantime, you might want to skip ahead and check out the <a href="#section5">Use it Well</a> section of this guide. Once he's responded, head to the next step. From here on, you'll be doing just the same thing as when corresponding with a real person.</p>
                                        </div><!-- End .main -->
-                               </div><!-- End #step-3b .step -->
+                               </div><!-- End #step-3a .step -->
 
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-3b" class="step">
                                                        <p class="notes">Next to the key, you'll notice an icon of a pencil. Clicking this tells Enigmail to add a special, unique signature to your message, generated using your private key. This is a separate feature from encryption, and you don't have to use it for this guide.</p>
                                                        <p>Click Send. Enigmail will pop up a window that says "Recipients not valid, not trusted or not found."</p>
 
-                                                       <p>To encrypt an email to Edward, you need his public key, 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>To encrypt an email to Edward, you need his public key, 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 C), 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 Edward's key from the list and click Ok. If the message doesn't send automatically, you can hit send now.</p>
                                        <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                <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>
+                                       <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 2.0. <!--Source code of Edward reply bot by PROGRAMMERNAME, available under the GNU General Public License.--></em></p>
+                                        <p><em><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Version 2.0. 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>
                                         </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-dev0n/img/jplusplus.png" alt="Journalism++" /></a>
+                                       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 -->