Next step in reverting process: overwriting index with the version from the Internet...
authorZak Rogoff <zak@fsf.org>
Wed, 9 Dec 2015 21:32:19 +0000 (16:32 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 9 Dec 2015 21:32:19 +0000 (16:32 -0500)
en/index.html

index 23985cb008b6cf6ab536e79fbe55d9b496d59d59..88b04d9e3d3ad4044a232aebc8d19b38b298b495 100644 (file)
@@ -8,94 +8,89 @@
       <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="/web/20150910030655cs_/https://static.fsf.org/nosvn/enc-dev0/css/main.css" />
+               <link rel="shortcut icon" href="/web/20150910030655im_/https://static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 
        </head>
        <body>
 
-               <!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
-
-               <header class="row"  id="header">
+<!--
+               <nav class="nav">
                        <div>
-                               <h1>Email Self-Defense</h1>
-
-                               <!-- 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 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="/ar">العربية</a></li>-->
+                               <ul class="lang">
+                                       <li class="help"><a href="/web/20150910030655/http://libreplanet.org/wiki/GPG_guide">Translate this guide!</a></li>
                                </ul>
+                       </div>
+               </nav>
+-->
 
-                               <ul id="menu" class="os">
-                                       <li class="spacer">
-                                               <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>
-                                       <li class="spacer"><a href="workshops.html">Teach your friends</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">
-                                                       Share&nbsp;
-                                                       <img src="//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"
-                                                       class="share-logo" alt="[Pump.io]">&nbsp;
-                                                       <img src="//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"
-                                                       class="share-logo" alt="[Hacker News]">
-                                               </a>
-                                       </li>
-                                       <li class="spacer">V4.0</li>
-                               </ul>
+<!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
+
+               <header class="row"  id="header">
+                       <div>
+                         <h1>Email Self-Defense</h1>
+
+                          <!-- Language list for browsers that do not have JS enabled -->
+                          <ul id="languages" class="os">
+                            <li><a class="current" href="/web/20150910030655/https://emailselfdefense.fsf.org/en">english</a></li>
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/es">español</a></li>
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/fr">français</a></li>
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/de">deutsch</a></li>
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/it">italiano</a></li>
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/pt-br">português do Brasil</a></li>
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/tr">türkçe</a></li>
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/ro">română</a></li>
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/ru">русский</a></li>
+                            <!--<li><a href="/ml">മലയാളം</a></li>-->
+                            <!--<li><a href="/ko">한국어</a></li>-->
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/ja">日本語</a></li>
+                            <li><a href="/web/20150910030655/https://emailselfdefense.fsf.org/el">ελληνικά</a></li>
+                            <!--<li><a href="/ar">العربية</a></li>-->
+                          </ul>
+
+                          <ul id="menu" class="os">
+                           <li class="spacer">
+                              <a href="index.html">GNU/Linux</a>
+                            </li>
+                           <li>
+                              <a href="mac.html">Mac OS</a>
+                            </li>
+                           <li>
+                              <a href="windows.html" class="current">Windows</a>
+                            </li>
+                           <li class="spacer">
+                              <a href="/web/20150910030655/https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email%20encryption%20for%20everyone%20via%20%40fsf">
+                                 Share&nbsp;
+                                <img src="/web/20150910030655im_/https://static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
+                                     class="share-logo" alt="[GNU Social]">&nbsp;
+                                 <img src="/web/20150910030655im_/https://static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+                                      class="share-logo" alt="[Pump.io]">&nbsp;
+                                 <img src="/web/20150910030655im_/https://static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+                                      class="share-logo" alt="[Reddit]">&nbsp;
+                                 <img src="/web/20150910030655im_/https://static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
+                                      class="share-logo" alt="[Hacker News]">
+                              </a>
+                            </li>
+                         </ul>
 
                                <!-- ~~~~~~~~~ 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>
-                                  <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="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png"   /></a>  </p>
+                                       <h3><a href="/web/20150910030655/http://u.fsf.org/ys"><img alt="Free Software Foundation" src="/web/20150910030655im_/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="/web/20150910030655/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="/web/20150910030655im_/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>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 scrambed 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, about forty minutes and five dice (optional, but recommended).</p>
+                                               <a id="infographic" href="infographic.html"><img src="/web/20150910030655im_/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 whistleblowers use to protect their identities while shining light on human rights abuses and government corruption.</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>
 
-<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. This guide helps you do that. It is designed for beginners, but if you already know the basics of GnuPG or are an experienced free software user, you'll enjoy the advanced tips.</p>
+<p>In addition to using encryption, standing up to surveillance requires fighting politically for a <a href="/web/20150910030655/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><!-- End .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). 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 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="/web/20150910030655/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>If you already have an email program, 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/en/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
+                                               <p><img src="/web/20150910030655im_/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>
-                                               <p>Open your email program and follow the wizard (step-by-step walkthrough) that sets it up with your email account. Look for the letters SSL, TLS, or STARTTLS to the right of the servers when you're setting up your account. If you don't see them, you will still be able to use encryption, but this means that the people running your email system are running behind the industry standard in protecting your security and privacy. We recommend that you send them a friendly email asking them to enable SSL, TLS, or STARTTLS for your email server. They will know what you're talking about, so it's worth making the request even if you aren't an expert on these security systems.</p>
+                                               <p>Open your email program and follow the wizard (step-by-step walkthrough) that sets it up with your email account.</p>
 
                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                <div class="troubleshooting">
                                                        <h4>Troubleshooting</h4>
                                                        <dl>
                                                                <dt>The wizard doesn't launch</dt>
-                                                                       <dd>You can launch the wizard yourself, but the menu option for doing so is named differently in each email program. The button to launch it will be in the program's main menu, under "New" or something similar, titled something like "Add account" or "New/Existing email account."</dd>
+                                                                       <dd>You can launch the wizard yourself, but the menu option for doing so is named differently in each email programs. The button to launch it will be in the program's main menu, under "New" or something similar, titled something like "Add account" or "New/Existing email account."</dd>
                                                                <dt>The wizard can't find my account or isn't downloading my mail</dt>
                                                                        <dd>Before searching the Web, 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>
+                                                                       <dd class="feedback">Please let us know on the <a href="/web/20150910030655/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  ~~~~~~~~~ -->
+<!-- ~~~~~~~~~ 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="/web/20150910030655/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 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.B: Tools -> Add-ons" /></li>
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-02-search.png" alt="Step 1.B: Search Add-ons" /></li>
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/step1b-03-install.png" alt="Step 1.B: Install Add-ons" /></li>
+                                                       <li><img src="/web/20150910030655im_/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="/web/20150910030655im_/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="/web/20150910030655im_/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">
-                                               <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>
+                                               <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>
                                                <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>My email looks weird</dt>
-                                                                       <dd>Enigmail doesn't tend to play nice with HTML, which is used to format emails. To send an HTML-formatted email without encryption and or a signature, hold down the Shift key when you select compose. You can then write an email as if Enigmail wasn't there.</dd>
-                                                                       <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>
+                                                                       <dd class="feedback">Please let us know on the <a href="/web/20150910030655/https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
-                               </div><!-- End #step-1b .step -->
-
+                               </div><!-- End #step-1c .step -->
                        </div>
                </section><!-- End #section1 -->
 
                                        <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 and letters that are unique to you. Your public and private keys are linked together by a special mathematical function.</p>
 
-                                               <p>Your public key isn't like a physical key, because it's stored in the open in an online directory called a keyserver. People download it and use it, along with GnuPG, to encrypt emails they send to you. You can think of the keyserver as a phonebook; people who want to send you encrypted email can look up your public key.</p>
+<p>Your public key isn't like a physical key, because it's stored in the open in an online directory called a keyserver. People download it and use it, along with GnuPG, to encrypt emails they send to you. You can think of the keyserver as phonebook, where people who want to send you an encrypted email look up your public key.</p>
 
-                                               <p>Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key to descramble encrypted emails other people send to you. <span style="font-weight: bold;">You should never share you private key with anyone, under any circumstances.</span></p>
-                                               <p>In addition to encryption and decryption, you can also use these keys to sign messages and check the authenticity of other people's signatures. This process helps stop impersonators. We'll discuss this more in the next section.</p>
+<p>Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key to decode encrypted emails other people send to you.</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/en/screenshots/step2a-01-make-keypair.png" alt="Step 2.A: Make a Keypair" /></p>
+                                               <p><img src="/web/20150910030655im_/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>
-                                               <p>The Enigmail Setup wizard may start automatically. If it doesn't, select Enigmail &rarr; Setup Wizard from your email program's menu. 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. Click Next with the default options selected, except in these instances, which are listed in the order they appear:</p>
+                                               <p>The Enigmail Setup wizard may start automatically. If it doesn't, select Enigmail &rarr; Setup Wizard from your email program's menu. 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. Click Next with the default options selected, except in these instances:</p>
 <ul>
                                                <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>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>
+                                               <li>On the screen titled "Create Key," pick a strong password! Your password should be at least 12 characters and include at least one lower case and upper case letter and at least one number or punctuation symbol. Don't forget the password, or all 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>
-
+                                               <p>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). You'll learn more about the revocation certificate in <a href="#section5">Section 5</a>.</p>
 
                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                <div class="troubleshooting">
                                                        <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>My email looks weird</dt>
-                                                                        <dd>Enigmail doesn't tend to play nice with HTML, which is used to format emails. To use it, you'll have to hold down the Shift key when you select compose. You can then write an email as if Enigmail wasn't there.</dd>
-
-                                                               <dt>More resources</dt>
-                                                                        <dd>If you're having trouble with our instructions or just want to learn more, check out <a href="https://enigmail.wiki/Key_Management#Generating_your_own_key_pair">Enigmail's wiki instructions for key generation</a>.</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>
+                                                                       <dd class="feedback">Please let us know on the <a href="/web/20150910030655/https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
-                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-
-                                                <div class="troubleshooting">
-                                                        <h4>Advanced</h4>
-                                                        <dl>
-
-
-                                                               <dt>Command line key generation</dt>
-                                                                       <dd>If you prefer using the command line for a higher degree of control, you can follow the documentation from <a href="https://www.gnupg.org/gph/en/manual/c14.html#AEN25">The GNU Privacy Handbook</a>. Make sure you stick with "RSA and RSA" (the default), because it's newer and more secure than the algorithms the documentation recommendeds. Also make sure your key is at least 2048 bits, or 4096 if you really want to be secure.</dd>
-
-                                                               <dt>Advanced key pairs</dt>
-                                                                       <dd>When GnuPG creates a new keypair, it compartmentalizes the encryption function from the signing function through <a href="https://wiki.debian.org/Subkeys">subkeys</a>. If you use subkeys carefully, you can keep your GnuPG identity much more secure and recover from a compromised key much more quickly. <a href="https://alexcabal.com/creating-the-perfect-gpg-keypair/">Alex Cabal</a> and <a href="http://keyring.debian.org/creating-key.html">the Debian wiki</a> provide good guides for setting up a secure subkey configuration.</dd>
-                                                       </dl>
-                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
                                </div><!-- End #step-2a .step  -->
 
-
-
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-2b" class="step">
                                        <div class="main">
                                                <div class="troubleshooting">
                                                        <h4>Troubleshooting</h4>
                                                        <dl>
-                                                               <dt>The progress bar never finishes</dt>
+                                                               <dt>The progress bar never finishes.</dt>
                                                                                <dd>Close the upload popup, make sure you are connected to the Internet, and try again. If that doesn't work, try again, selecting a different keyserver.</dd>
 <dt>My key doesnt appear in the list</dt>
                                                                                <dd>Try checking "Display All Keys by Default."</dd>
-                                                               <dt>More documentation</dt>
-                                                                               <dd>If you're having trouble with our instructions or just want to learn more, check out <a href="https://www.enigmail.net/documentation/quickstart-ch2.php#id2533620">Enigmail's documentation</a>.</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>
+                                                                       <dd class="feedback">Please let us know on the <a href="/web/20150910030655/https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
 
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
-
-                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                                <div class="troubleshooting">
-                                                        <h4>Advanced</h4>
-                                                        <dl>
-                                                                <dt>Uploading a key from the command line</dt>
-                                                                                <dd>You can also upload your keys to a keyserver through the <a href="https://help.ubuntu.com/community/GnuPrivacyGuardHowto#Uploading_the_key_to_Ubuntu_keyserver">command line</a>. <a href="https://sks-keyservers.net/overview-of-pools.php">The sks Web site</a> maintains a list highly interconnected keyservers. You can also <a href="https://www.gnupg.org/gph/en/manual/x56.html#AEN64">directly export your key</a> as a file on your computer.</dd>
-
-                                                        </dl>
-                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
                                </div><!-- End #step-2b .step  -->
 
                                                <h2><em>#3</em> Try it out!</h2>
                                                <p>Now you'll try a test correspondence with a computer program named Edward, which knows how to use encryption. Except where noted, these are the same steps you'd follow when corresponding with a real, live person.</p>
 
-                                               <!-- <p>NOTE: Edward is currently having some technical difficulties, so he may take a long time to respond, or not respond at all. We're sorry about this and we're working hard to fix it. Your key will still work even without testing with Edward.</p> -->
+                                               <p>NOTE: Edward is currently having some technical difficulties, so he may take a long time to respond, or not respond at all. We're sorry about this and we're working hard to fix it. Your key will still work even without testing with Edward.</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/en/screenshots/section3-try-it-out.png" alt="Try it out." /></p>
+                                               <p><img src="/web/20150910030655im_/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>
 
 <p>Address the message to edward-en@fsf.org. Put at least one word (whatever you want) in the subject and body of the email. Don't send yet.</p>
 
-<p>The lock icon in the top left should be yellow, meaning encryption is
-turned on. We want the this first special message to be unencrypted, so
-click the icon once to turn it off. The lock should become grey, with a
-blue dot on it (to alert you that the setting has been changed from the
-default). Once encryption is off, hit Send.</p>
+<p>There should be an icon of a yellow key in the bottom right of the composition window. This means that encryption is on, however, we want this first special message to Edward to be unencrypted. Click the key icon once to turn encryption off. The key should become grey, with a blue dot on it (to alert you that the setting has been changed from the default). Once encryption is off, hit Send.</p>
 
 <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>
 
@@ -335,41 +287,25 @@ default). Once encryption is off, hit Send.</p>
                                        <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 edward-en@fsf.org. Make the subject "Encryption test" or something similar and write something in the body.</p>
-                                                       <p>The key in the top left of the window should be yellow, meaning encryption is on. This will be your default from now on.</p>
-                                                       <p class="notes">Next to the key, you'll notice an icon of a pencil. We'll get to this in a moment.</p>
+                                                       <p>The key in the bottom right of the window should be yellow, meaning encryption is on. This will be your default from now on.</p>
+                                                       <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 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. Check the box in front of Edward's key and click Send.</p>
 
-<p class="notes">Since you encrypted this email with Edward's public key, Edward's private key is required to decrypt it. Edward is the only one with his private key, so no one except him can decrypt it.</p>
+<p class="notes">Since you encrypted this email with Edward's public key, Edward's private key is required to decrypt it. Edward is the only one with his private key, so no one except him &mdash; not even you &mdash; can decrypt it.</p>
                                        <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                        <div class="troubleshooting">
                                                                <h4>Troubleshooting</h4>
                                                                <dl>
                                                                        <dt>Enigmail can't find Edward's key</dt>
                                                                                <dd>Close the pop-ups that have appeared since you clicked Send. 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>Unscrambled messages in the Sent folder</dt>
-                                                                               <dd>Even though you can't decrypt messages encrypted to someone else's key, your email program will automatically save a copy encrypted to your public key, which you'll be able to view from the Sent folder like a normal email. This is normal, and it doesn't mean that your email was not sent encrypted.</dd>
-                                                                       <dt>More resources</dt>
-                                                                               <dd>If you're still having trouble with our instructions or just want to learn more, check out <a href="https://enigmail.wiki/Signature_and_Encryption#Encrypting_a_message">Enigmail's wiki</a>.</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>
+                                                                       <dd class="feedback">Please let us know on the <a href="/web/20150910030655/https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
                                                                </dl>
                                                        </div><!-- /.troubleshooting -->
-
-
-                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Advanced</h4>
-                                                       <dl>
-                                                               <dt>Encrypt messages from the command line</dt>
-                                                                       <dd>You can also encrypt and decrypt messages and files form the <a href="https://www.gnupg.org/gph/en/manual/x110.html">command line</a>, if that's your preference. The option --armor makes the encrypted output appear in the regular character set.</dd>
-                                                       </dl>
-                                               </div><!-- /.troubleshooting -->
-
-
                                                </div><!-- End .main -->
                                        </div><!-- End #step-3b .step -->
 
@@ -377,8 +313,7 @@ default). Once encryption is off, hit Send.</p>
                                <div id="step-headers_unencrypted" class="step">
                                        <div class="main">
                                                <h3><em>Important:</em> Security tips</h3>
-                                               <p>Even if you encrypt your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so a surveillance system can still figure out who you're communicating with. Also, surveillance agents will know that you're using GnuPG, even if they can't figure out what you're saying. When you send attachments, Enigmail will give you an option of whether you want to encrypt them.</p>
-                                               <p>Encryption only works when you use it, so it's a good habit to double-check that email encryption is turned on before you hit send.</p>
+                                               <p>Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system. When you send attachments, Enigmail will give you an option of whether you want to encrypt them.</p>
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-headers_unencrypted .step-->
@@ -396,19 +331,17 @@ default). Once encryption is off, hit Send.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-3c .step -->
 
-
+<!-- STEP 3D IS COMMENTED OUT UNTIL WE FIND A WAY TO VALIDATE SIGNATURES
                                <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>GnuPG includes a way for you to sign messages and files, verifying that they came from you and that they weren't tampered with along the way. These signatures are stronger than their pen-and-paper cousins -- they're impossible to forge, because they're impossible to create without your private key (another reason to keep your private key safe).</p>
-
-                                               <p>You can sign messages to anyone (including people who haven't created their own keypair!) so it's a great way to promote GnuPG. To sign an email to a friend, click the pencil icon next to the lock icon so that it turns gold. If you sign a message, Enigmail will ask you for your password before it sends the message off. It will do this every time it needs to use your private key.</p>
-
-                                               <p>When the pencil is gold but the lock is grey, the email will be signed but not encrypted. When the pencil is grey and the lock is gold, the email will be encrypted but not signed. When they're both gold, the email will be signed and encrypted.</p>
+                                               <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>
-                               </div>
+                               </div>-->
                        </div>
-               </section>
+               </section><!-- End #section3 -->
 
 
 <!-- ~~~~~~~~~ Section 4: Learn the Web of Trust  ~~~~~~~~~ -->
@@ -419,10 +352,11 @@ default). Once encryption is off, hit Send.</p>
                                                <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 public key is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friend's name, creating keys to go with it and impersonating your friend. That's why the free software programmers that developed email encryption created keysigning and the Web of Trust.</p>
 
-<p>When you sign someone's key, you are publicly saying that you've verified that it belongs to them and not an impostor. Signing keys and messages is the same type mathematical operation, but they carry very different implications. It's a good practice to generally sign your email, but if you casually sign people's keys, you may accidently end up vouching for the identity of an imposter!</p>
+<p>When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, forming a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.</p>
 
-<p>People who use your public key can see who has signed it. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is a constellation of GnuPG users, connected to each other by chains of trust expressed through signatures. The more signatures of people you trust a key has, the more trustworthy that key is.</p>
+<p>People's public keys are usually identified by their key fingerprint, which is a string of digits like F357AA1A5B1FA42CFD9FE52A9FF2194CC09A61E8 (for Edward's key). You can see the fingerprint for your public key, and other public keys saved on your computer, by going to Enigmail &rarr; Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that people can double-check that they have the correct public key when they download yours from a keyserver.</p>
 
+<p class="notes">You may also see public keys referred to by their key ID, which is simply the last 8 digits of the fingerprint, like C09A61E8 for Edward. The key ID is visible directly from the Key Management window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to whom are trying to communicate to verify which one to use.</p>
 
 
                                </div><!-- End .section-intro -->
@@ -430,7 +364,7 @@ default). Once encryption is off, hit Send.</p>
                                <!-- ~~~~~~~~~ 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="/web/20150910030655im_/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>
@@ -447,7 +381,7 @@ default). Once encryption is off, hit Send.</p>
                                                                <p><strong>To:</strong> <input type="text" placeholder="50BD01x4" name="TO"></p>
                                                                <p class="buttons"><input type="submit" value="trust paths" name="PATHS"> <input type="reset" value="reset" name=".reset"></p>
                                                        </form>
-                                               </div>End #pgp-pathfinder -->
+                                               </div><!-- End #pgp-pathfinder -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-4a .step -->
@@ -455,33 +389,11 @@ default). Once encryption is off, hit Send.</p>
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-sign_real_keys" class="step">
                                        <div class="main">
-                                               <h3>Identifying keys: Fingerprints and IDs</h3>
-                                               <p>People's public keys are usually identified by their key fingerprint, which is a string of digits like F357AA1A5B1FA42CFD9FE52A9FF2194CC09A61E8 (for Edward's key). You can see the fingerprint for your public key, and other public keys saved on your computer, by going to Enigmail &rarr; Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that people can double-check that they have the correct public key when they download yours from a keyserver.</p>
-
-<p class="notes">You may also see public keys referred to by their key ID, which is simply the last eight digits of the fingerprint, like C09A61E8 for Edward. The key ID is visible directly from the Key Management window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to whom you are trying to communicate to verify which one to use.</p>
-
+                                               <h3><em>Important:</em> check people's identification before signing their keys</h3>
+                                               <p>Before signing a real person's key, always make sure it actually belongs to them, and that they are who they say they are. Ask them to show you their ID (unless you trust them very highly) and their public key fingerprint -- not just the shorter public key ID, which could refer to another key as well. In Enigmail, 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>
                                        </div><!-- End .main -->
                                </div><!-- End #step-sign_real_keys .step-->
 
-                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                                <div id="check-ids-before-signing" class="step">
-                                        <div class="main">
-                                                <h3><em>Important:</em> check people's identification before signing their keys</h3>
-                                                <p>Before signing a real person's key, always make sure it actually belongs to them, and that they are who they say they are. Ask them to show you their ID (unless you trust them very highly) and their public key fingerprint -- not just the shorter public key ID, which could refer to another key as well. In Enigmail, 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>
-
-                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                                <div class="troubleshooting">
-                                                        <h4>Advanced</h4>
-                                                        <dl>
-                                                                <dt>Master the Web of Trust</dt>
-                                                                       <dd>Unfortunately, trust does not spread between users the way <a href="http://fennetic.net/irc/finney.org/~hal/web_of_trust.html">many people think</a>. One of best ways to strengthen the GnuPG community is to properly <a href="https://www.gnupg.org/gph/en/manual/x334.html">understand</a> the web of trust and to carefully sign as many people's keys as <a href="http://www.cryptnet.net/fdp/crypto/keysigning_party/en/keysigning_party.html">circumstances</a> permit.</dd>
-                                                               <dt>Set ownertrust</dt>
-                                                                       <dd>If you trust someone enough to validate other people's keys, you can assign them an ownertrust level through Enigmails's key management window. Right click on the other person's key, go to the "Select Owner Trust" menu option, select the trustlevel and click OK. Only do this once you've read and understand "Master the Web of Trust" above.</dd>
-                                                        </dl>
-                                                </div><!-- /.troubleshooting -->
-                                        </div><!-- End .main -->
-
-                                </div><!-- End #step-sign_real_keys .step-->
 
 
                        </div>
@@ -499,7 +411,7 @@ default). Once encryption is off, hit Send.</p>
                                <!-- ~~~~~~~~~ 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="/web/20150910030655im_/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>
@@ -514,10 +426,10 @@ default). Once encryption is off, hit Send.</p>
                                <!-- ~~~~~~~~~ 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="/web/20150910030655im_/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>Be wary of invalid keys</h3>
+                                               <h3><em>Important:</em> Be wary of invalid keys</h3>
                                                <p>GnuPG makes email safer, but it's still important to watch out for invalid keys, which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.</p>
                                                <p>In your email program, go back to the second email that Edward sent you. Because Edward encrypted it with your public key, it will have a message from Enigmail at the top, which most likely says "Enigmail: Part of this message encrypted."</p>
 <p><b>When using GnuPG, make a habit of glancing at that bar. The program will warn you there if you get an email encrypted with a key that can't be trusted.</b></p>
@@ -537,38 +449,17 @@ default). Once encryption is off, hit Send.</p>
                                <div id="step-lost_key" class="step">
                                        <div class="main">
                                                <h3><em>Important:</em> act swiftly if someone gets your private key</h3>
-                                               <p>If you lose your private key or someone else gets ahold of it (say, by stealing or cracking your computer), it's important to revoke it immediately before someone else uses it to read your encrypted email or forge your signature. This guide doesn't cover how to revoke a key, but you can follow the <a href="https://www.gnupg.org/gph/en/manual.html#AEN305">instructions on the GnuPG site</a>. After you're done revoking, send an email to everyone with whom you usually use your key to make sure they know.</p>
+                                               <p>If you lose your private key or someone else gets ahold of it (say, by stealing or cracking your computer), it's important to revoke it immediately before someone else uses it to read your encrypted email. This guide doesn't cover how to revoke a key, but you can follow the <a href="/web/20150910030655/https://www.gnupg.org/gph/en/manual.html#AEN305">instructions on the GnuPG site</a>. 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-->
 
-
-
-                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                                <!---<div id="transfer-key" class="step">
-                                        <div class="main">
-                                                <h3>Transferring you key</h3>
-                                                <p>You can use Enigmail's <a href="https://www.enigmail.net/documentation/keyman.php">key management window</a> to import and export keys. If you want to be able to read your encrypted email on a different computer, you will need to export your secret key from here. Be warned, if you transfer the key without <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">encrypting</a> the drive it's on the transfer will be dramatically less secure.</p>
-                                        </div><!-- End .main -->
-                                </div><!-- End #step-lost_key .step-->
-
-
-
-
-                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                                <div id="webmail-and-GnuPG" class="step">
-                                        <div class="main">
-                                                <h3>Webmail and GnuPG</h3>
-                                                <p>When you use a web browser to access your email, you're using webmail, an email program stored on a distant website. Unlike webmail, your desktop email program runs on your own computer. Although webmail can't decrypt encrypted email, it will still display it in its encrypted form. If you primarily use webmail, you'll know to open your email client when you receive a scrambled email.</p>
-                                        </div><!-- End .main -->
-                                </div><!-- End #step-lost_key .step-->
-
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~
                                <div id="step-5d" class="step">
                                        <div class="main">
                                                <h3>Make your public key part of your online identity</h3>
                                                <p> First add your public key fingerprint to your email signature, then compose an email to at least five of your friends, telling them you just set up GnuPG and mentioning your public key fingerprint. Link to this guide and ask them to join you. Don't forget that there's also an awesome <a href="infographic.html">infographic to share.</a></p>
 
-<p class="notes">Start writing your public key fingerprint anywhere someone would see your email address: your social media profiles, blog, Website, or business card. (At the Free Software Foundation, we put ours on our <a href="https://fsf.org/about/staff">staff page</a>.) We need to get our culture to the point that we feel like something is missing when we see an email address without a public key fingerprint.</p>
+<p class="notes">Start writing your public key fingerprint anywhere someone would see your email address: your social media profiles, blog, Website, or business card. (At the Free Software Foundation, we put ours on our <a href="/web/20150910030655/https://fsf.org/about/staff">staff page</a>.) We need to get our culture to the point that we feel like something is missing when we see an email address without a public key fingerprint.</p>
                                        </div><!-- End .main
                                </div> End #step-5d .step-->
 
@@ -618,41 +509,66 @@ default). Once encryption is off, hit Send.</p>
                <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-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>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>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>
+                                       <h4><a href="/web/20150910030655/https://u.fsf.org/ys"><img alt="Free Software Foundation" src="/web/20150910030655im_/https://static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h4>
+                                       <p>Copyright &copy; 2014 <a href="/web/20150910030655/https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="/web/20150910030655/https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="/web/20150910030655/https://u.fsf.org/yr">Join.</a></p>
+                                        <p><em>Version 3.0. <a href="/web/20150910030655/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="/web/20150910030655/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="/web/20150910030655/https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="/web/20150910030655/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="/web/20150910030655/https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="/web/20150910030655/http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="/web/20150910030655/http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="/web/20150910030655/http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
+                                        <p>
+                                          <a href="/web/20150910030655/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="/web/20150910030655/http://jplusplus.org/"><strong>Journalism++</strong> <img src="/web/20150910030655im_/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>
-
-               <!-- Piwik -->
-               <script type="text/javascript" >
-                 // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
-                 var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-                 document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-                 try {
-                 var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
-                 piwikTracker.trackPageView();
-                 piwikTracker.enableLinkTracking();
-                 } catch( err ) {}
-                 // @license-end
-               </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
-               <!-- End Piwik Tracking Code -->
-               
-
-               
+               <script src="/web/20150910030655js_/https://static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
+               <script src="/web/20150910030655js_/https://static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
+
+                <!-- Piwik -->
+                <script type="text/javascript">
+                 /*
+                 @licstart The following is the entire license notice for the
+                    JavaScript code in this page.
+
+                 Copyright 2014 Matthieu Aubry
+
+                  This program is free software: you can redistribute it and/or modify
+                 it under the terms of the GNU General Public License as published by
+                 the Free Software Foundation, either version 3 of the License, or
+                 (at your option) any later version.
+
+                  This program is distributed in the hope that it will be useful,
+                 but WITHOUT ANY WARRANTY; without even the implied warranty of
+                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+                 GNU General Public License for more details.
+
+                  You should have received a copy of the GNU General Public License
+                 along with this program.  If not, see /web/20150910030655/http://www.gnu.org/licenses/.
+
+                  @licend The above is the entire license notice
+                     for the JavaScript code in this page.
+                 */
+                 var _paq = _paq || [];
+                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
+                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
+                 _paq.push(["trackPageView"]);
+                 _paq.push(["enableLinkTracking"]);
+
+                 (function() {
+                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
+                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
+                   _paq.push(["setSiteId", "5"]);
+                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+                 })();
+                </script>
+                <!-- End Piwik Code -->
        </body>
 </html>