Oops, I copied the archive's windows.html over our index.html. This commit brings...
authorZak Rogoff <zak@fsf.org>
Wed, 9 Dec 2015 21:54:18 +0000 (16:54 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 9 Dec 2015 21:54:18 +0000 (16:54 -0500)
en/index.html
en/windows.html

index 07ecb16598d362d4903a110a29d2d45bb4a6a456..7f6ea96d32a6cd570c33a29b01cb512249a413c6 100644 (file)
        </head>
        <body>
 
-<!--
-               <nav class="nav">
-                       <div>
-                               <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  ~~~~~~~~~ -->
 
                <header class="row"  id="header">
 
                           <ul id="menu" class="os">
                            <li class="spacer">
-                              <a href="index.html">GNU/Linux</a>
+                              <a href="index.html" class="current">GNU/Linux</a>
                             </li>
                            <li>
                               <a href="mac.html">Mac OS</a>
                             </li>
                            <li>
-                              <a href="windows.html" class="current">Windows</a>
+                              <a href="windows.html">Windows</a>
                             </li>
+
                            <li class="spacer">
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email%20encryption%20for%20everyone%20via%20%40fsf">
                                  Share&nbsp;
 
                                <!-- ~~~~~~~~~ FSF Introduction ~~~~~~~~~ -->
                                <div id="fsf-intro">
-                                       <h3><a href="http://u.fsf.org/ys"><img alt="Free Software Foundation" src="https://static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h3>
-                                       <span  style="font-size:125%"><p>We fight for computer users' rights, and promote the development of free (as in freedom) software. Resisting bulk surveillance is very important to us.</p><p><strong>We want to translate this guide into more languages, and make a version for encryption on mobile devices. Please donate, and help people around the world take the first step towards protecting their privacy with free software.</strong></p></span>
-
-                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=email_self_defense&amp;pk_kwd=guide_donate"><img alt="Donate" src="https://static.fsf.org/nosvn/enc-dev0/img/en/donate.png"/></a>      </p>
+                                 <h3>
+                                    <a href="http://u.fsf.org/ys">
+                                      <img alt="Free Software Foundation"
+                                           src="https://static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" />
+                                    </a>
+                                  </h3>
+                                  <div class="fsf-emphasis">
+                                    <p>
+                                      We fight for computer users' rights, and promote the development of free (as in freedom) software. Resisting bulk surveillance is very important to us.
+                                    </p>
+                                    <p>
+                                      <strong>
+                                        We want to translate this guide into more languages, and make a version for encryption on mobile devices. Please donate, and help people around the world take the first step towards protecting their privacy with free software.
+                                      </strong>
+                                    </p>
+                                  </div>
+
+                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=email_self_defense&amp;pk_kwd=guide_donate"><img alt="Donate" src="https://static.fsf.org/nosvn/enc-dev0/img/en/donate.png" /></a>  </p>
 
                                </div><!-- End #fsf-intro -->
 
                                        <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
                                <div class="section-intro">
                                                <h2><em>#1</em> Get the pieces</h2>
-                                               <p class="notes">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). To defend your freedom as well as protect yourself from surveillance, we recommend you switch to a free software operating system like GNU/Linux. Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
-                        <p>To get started, you'll need the IceDove desktop email program installed on your computer. For your system, IceDove may be known by the alternate name "Thunderbird." 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 class="notes">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>
+
+<p>Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to download it. Before configuring GnuPG though, you'll need the IceDove desktop email program installed on your computer. Most GNU/Linux distributions have IceDove installed already, though it may be under the alternate name "Thunderbird." 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 already have an email program, you can skip to <a href="#step-1b">Step 1.b</a>.</p>
                                </div><!-- End .section-intro -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step1-a .step -->
 
-<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1b" class="step">
-
-                                       <div class="main">
-                                               <h3><em>Step 1.b</em> Get GnuPG by downloading GPG4Win</h3>
-                                               <p>GPG4Win is a software package that includes GnuPG. <a href="http://files.gpg4win.org/gpg4win-2.2.1.exe">Download</a> and install it, choosing default options whenever asked. After it's installed, you can close any windows that it creates.</p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step1-b .step -->
-
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1c" class="step">
+                               <div id="step-1b" class="step">
                                        <div class="sidebar">
                                                <ul class="images">
-                                                       <li><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-01-tools-addons.png" alt="Step 1.C: Tools -> Add-ons" /></li>
-                                                       <li><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-02-search.png" alt="Step 1.C: Search Add-ons" /></li>
-                                                       <li><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-03-install.png" alt="Step 1.C: Install Add-ons" /></li>
+                                                       <li><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-01-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></li>
+                                                       <li><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-02-search.png" alt="Step 1.B: Search Add-ons" /></li>
+                                                       <li><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-03-install.png" alt="Step 1.B: Install Add-ons" /></li>
                                                </ul>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
-                                               <h3><em>Step 1.c</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>
+                                               <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>
                                                <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">
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
-                               </div><!-- End #step-1c .step -->
+                               </div><!-- End #step-1b .step -->
                        </div>
                </section><!-- End #section1 -->
 
                                                        <dl>
                                                                <dt>I can't find the Enigmail menu.</dt>
                                                                        <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars. Enigmail 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  Enigmail setup wizard by going to Enigmail &rarr; 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>
index 3cd6ff5eb895a09d009428a688501af89dec9b68..07ecb16598d362d4903a110a29d2d45bb4a6a456 100644 (file)
@@ -8,11 +8,12 @@
       <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
 
       <meta name="viewport" content="width=device-width, initial-scale=1" />
-                       <link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
-               <link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
+                       <link rel="stylesheet" href="https://static.fsf.org/nosvn/enc-dev0/css/main.css" />
+               <link rel="shortcut icon" href="https://static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 
        </head>
        <body>
+
 <!--
                <nav class="nav">
                        <div>
 
                           <!-- 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="/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 class="current" href="https://emailselfdefense.fsf.org/en">english</a></li>
+                            <li><a href="https://emailselfdefense.fsf.org/es">español</a></li>
+                            <li><a href="https://emailselfdefense.fsf.org/fr">français</a></li>
+                            <li><a href="https://emailselfdefense.fsf.org/de">deutsch</a></li>
+                            <li><a href="https://emailselfdefense.fsf.org/it">italiano</a></li>
+                            <li><a href="https://emailselfdefense.fsf.org/pt-br">português do Brasil</a></li>
+                            <li><a href="https://emailselfdefense.fsf.org/tr">türkçe</a></li>
+                            <li><a href="https://emailselfdefense.fsf.org/ro">română</a></li>
+                            <li><a href="https://emailselfdefense.fsf.org/ru">русский</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="https://emailselfdefense.fsf.org/ja">日本語</a></li>
+                            <li><a href="https://emailselfdefense.fsf.org/el">ελληνικά</a></li>
                             <!--<li><a href="/ar">العربية</a></li>-->
                           </ul>
 
                               <a href="windows.html" class="current">Windows</a>
                             </li>
                            <li class="spacer">
-                              <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email encryption for everyone via %40fsf">
+                              <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email%20encryption%20for%20everyone%20via%20%40fsf">
                                  Share&nbsp;
-                                <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
+                                <img src="https://static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]">&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+                                 <img src="https://static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
                                       class="share-logo" alt="[Pump.io]">&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+                                 <img src="https://static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                       class="share-logo" alt="[Reddit]">&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
+                                 <img src="https://static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
                                       class="share-logo" alt="[Hacker News]">
                               </a>
                             </li>
 
                                <!-- ~~~~~~~~~ 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>
+                                       <h3><a href="http://u.fsf.org/ys"><img alt="Free Software Foundation" src="https://static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h3>
                                        <span  style="font-size:125%"><p>We fight for computer users' rights, and promote the development of free (as in freedom) software. Resisting bulk surveillance is very important to us.</p><p><strong>We want to translate this guide into more languages, and make a version for encryption on mobile devices. Please donate, and help people around the world take the first step towards protecting their privacy with free software.</strong></p></span>
 
-                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=email_self_defense&amp;pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png"/></a>      </p>
+                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=email_self_defense&amp;pk_kwd=guide_donate"><img alt="Donate" src="https://static.fsf.org/nosvn/enc-dev0/img/en/donate.png"/></a>      </p>
 
                                </div><!-- End #fsf-intro -->
 
                                <!-- ~~~~~~~~~ Guide Introduction ~~~~~~~~~ -->
                                <div class="intro">
                                        <p>
-                                               <a id="infographic" href="infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/en/infographic-button.png" alt="View &amp; share our infographic &rarr;" /></a>
+                                               <a id="infographic" href="infographic.html"><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/infographic-button.png" alt="View &amp; share our infographic &rarr;" /></a>
                                        Bulk surveillance violates our fundamental rights and makes free speech risky. This guide will teach you a basic surveillance self-defense skill: email encryption. Once you've finished, you'll be able to send and receive emails that are coded to make sure a surveillance agent or thief intercepting your email can't read it. All you need is a computer with an Internet connection, an email account, and about half an hour.</p>
 
 <p>Even if you have nothing to hide, using encryption helps protect the privacy of people you communicate with, and makes life difficult for bulk surveillance systems. If you do have something important to hide, you're in good company; these are the same tools that Edward Snowden used to share his famous secrets about the NSA.</p>
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-1a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
+                                               <p><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 1.a</em> Setup your email program with your email account</h3>
                                <div id="step-1c" class="step">
                                        <div class="sidebar">
                                                <ul class="images">
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-01-tools-addons.png" alt="Step 1.C: Tools -> Add-ons" /></li>
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-02-search.png" alt="Step 1.C: Search Add-ons" /></li>
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-03-install.png" alt="Step 1.C: Install Add-ons" /></li>
+                                                       <li><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-01-tools-addons.png" alt="Step 1.C: Tools -> Add-ons" /></li>
+                                                       <li><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-02-search.png" alt="Step 1.C: Search Add-ons" /></li>
+                                                       <li><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-03-install.png" alt="Step 1.C: Install Add-ons" /></li>
                                                </ul>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-2a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step2a-01-make-keypair.png" alt="Step 2.A: Make a Keypair" /></p>
+                                               <p><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step2a-01-make-keypair.png" alt="Step 2.A: Make a Keypair" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 2.a</em> Make a keypair</h3>
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-3a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section3-try-it-out.png" alt="Try it out." /></p>
+                                               <p><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section3-try-it-out.png" alt="Try it out." /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 3.a</em> Send Edward your public key</h3>
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-4a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section4-web-of-trust.png" alt="Section 4: Web of Trust" /></p>
+                                               <p><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section4-web-of-trust.png" alt="Section 4: Web of Trust" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 4.a</em> Sign a key</h3>
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>When should I encrypt?</h3>
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5b" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="https://static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Important:</em> Be wary of invalid keys</h3>
                <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="https://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/"
+                                          <a href="https://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>
+                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org/"><strong>Journalism++</strong> <img src="https://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>
+               <script src="https://static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
+               <script src="https://static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
 
                 <!-- Piwik -->
                 <script type="text/javascript">