--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>confirmation-diff.html</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+
+<title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
+
+<meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+<meta name="description" content="Email surveillance violates our fundamental rights and makes
+free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
+<link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
+</head>
+
+<body>
+<header class="row centered" id="header"><div>
+
+<p><strong>Please check your email for a confirmation link now. Thanks for joining our
+list!</strong></p>
+
+<p>If you don't receive the confirmation link, send us an email at info@fsf.org to be
+added manually.</p>
+
+<br />
+
+<p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section3-try-it-out.png"
+alt="Try it out." /></p>
+
+<br />
+
+<p>Join us on microblogging services for day-to-day updates:</p>
+
+<p style="font-size:150%"> <a href="https://status.fsf.org/fsf"> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
+alt="[GNU Social]">
+ GNU Social </a> | <a href="http://microca.st/fsf"> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
+alt="[Pump.io]">
+ Pump.io </a> | <a href="https://www.twitter.com/fsf">Twitter</a> </p>
+
+<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better
+than Twitter.</a></small></p>
+
+<hr />
+
+<p class="back" style="font-size:150%">← Return to <a href="index.html">Email
+Self-Defense</a></p>
+
+</div></header><!-- End #header -->
+
+<!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
+<footer class="row" id="footer"><div>
+<div id="copyright">
+
+<h4><a href="https://u.fsf.org/ys"><img
+alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"
+/></a></h4>
+
+<p>Copyright © 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 <span class="removed"><del><strong>2.1.</strong></del></span> <span class="inserted"><ins><em>3.0.</em></ins></span> <a
+href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source
+code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU
+General Public License.</a></em></p>
+
+<p>The images on this page are under a <a
+href="https://creativecommons.org/licenses/by/4.0/">Creative Commons
+Attribution 4.0 license (or later version)</a>, and the rest of it is under
+a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons
+Attribution-ShareAlike 4.0 license (or later version)</a>. — <a
+href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+<p>Download the source package for <a href="emailselfdefense_source.zip">this
+guide</a>. Fonts used in the guide & infographic: <a
+href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a
+href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedryś <a
+href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type,
+<a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a>
+by Florian Cramer.</p>
+
+<p> <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense"> JavaScript
+license information </a> </p>
+
+</div><!-- /#copyright -->
+
+<p class="credits"> Infographic and guide design by <a rel="external"
+href="http://jplusplus.org"><strong>Journalism++</strong> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
+alt="Journalism++" /></a> </p><!-- /.credits -->
+
+</div></footer><!-- End #footer -->
+</pre></body></html>
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>index-diff.html</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+
+<title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
+
+<meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
+<meta name="description" content="Email surveillance violates our fundamental rights and makes
+free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
+<link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
+</head>
+
+<body>
+
+<!-- ~~~~~~~~~ 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="/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>
+
+<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="https://fsf.org/share?u=https://u.fsf.org/zb&t=Email
+encryption for everyone via %40fsf"> Share <img
+src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
+alt="[GNU Social]"> <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+class="share-logo"
+alt="[Pump.io]"> <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+class="share-logo"
+alt="[Reddit]"> <img src="//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&id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate"><img
+alt="Donate" src="//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 & share our infographic →" /></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>
+
+<p>In addition to using encryption, standing up to surveillance requires fighting politically
+for a <a href="http://gnu.org/philosophy/surveillance-vs-democracy.html">reduction in the
+amount of data collected on us</a>, but the essential first step is to protect yourself
+and make surveillance of your communication as difficult as possible. Let's get started!</p>
+
+</div><!-- End .intro -->
+</div></header><!-- End #header -->
+
+<!-- ~~~~~~~~~ Section 1: Get the pieces ~~~~~~~~~ -->
+<section class="row" id="section1"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#1</em> Get the pieces</h2>
+
+<p 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 a desktop email program
+installed on your computer. Most GNU/Linux distributions have a free software version of
+the Thunderbird email program available to install. This guide will work with them, in
+addition to Thunderbird itself. 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 <span class="removed"><del><strong>one of these,</strong></del></span> <span class="inserted"><ins><em>an email program,</em></ins></span> 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 1.a</em> Setup your email program with your email <span class="removed"><del><strong>account (if it isn't
+already)</h3></strong></del></span> <span class="inserted"><ins><em>account</h3></em></ins></span>
+
+<p>Open your email program and follow the wizard <span class="inserted"><ins><em>(step-by-step walkthrough)</em></ins></span> that sets it
+up with your email account.</p>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<span class="removed"><del><strong><dt>What's a wizard?</dt>
+
+<dd>A</strong></del></span>
+<span class="inserted"><ins><em><dt>The</em></ins></span> wizard <span class="inserted"><ins><em>doesn't launch</dt>
+
+<dd>You can launch the wizard yourself, but the menu option for doing so</em></ins></span> is <span class="removed"><del><strong>a series of windows that pop up</strong></del></span> <span class="inserted"><ins><em>named differently
+in each email programs. The button</em></ins></span> to <span class="removed"><del><strong>make</strong></del></span> <span class="inserted"><ins><em>launch</em></ins></span> it <span class="removed"><del><strong>easy to get</strong></del></span> <span class="inserted"><ins><em>will be in the program's main menu, under
+"New" or something similar, titled</em></ins></span> something <span class="removed"><del><strong>done on
+a computer,</strong></del></span> like <span class="removed"><del><strong>installing a program. You click through it, selecting options as you go.</dd>
+
+<dt>My</strong></del></span> <span class="inserted"><ins><em>"Add account" or "New/Existing</em></ins></span> email <span class="removed"><del><strong>program</strong></del></span>
+<span class="inserted"><ins><em>account."</dd>
+
+<dt>The wizard</em></ins></span> 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>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step1-a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-1b" class="step">
+<div class="sidebar">
+<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>
+</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? <span class="removed"><del><strong>if</strong></del></span> <span class="inserted"><ins><em>If</em></ins></span> 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 class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-1b .step -->
+</div></section><!-- End #section1 -->
+
+<!-- ~~~~~~~~~ Section 2: Make your keys ~~~~~~~~~ -->
+<section class="row" id="section2"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#2</em> Make your keys</h2>
+
+<p>To use the GnuPG system, you'll need a public key and a private key (known together as a
+keypair). Each is a long string of randomly generated numbers 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 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 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 2.a</em> Make a keypair</h3>
+
+<span class="removed"><del><strong><p>In your email program's menu,</strong></del></span>
+
+<span class="inserted"><ins><em><p>The Enigmail Setup wizard may start automatically. If it doesn't,</em></ins></span> select <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> →
+Setup <span class="removed"><del><strong>Wizard.</strong></del></span> <span class="inserted"><ins><em>Wizard from your email program's menu.</em></ins></span> 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 <span class="removed"><del><strong>wizard.</p>
+
+<p>On</strong></del></span> <span class="inserted"><ins><em>wizard. Click Next with the default options selected, except in these instances:</p>
+
+<ul>
+<li>On</em></ins></span> the second screen, titled <span class="inserted"><ins><em>"Encryption," select "Encrypt all of my messages by default,
+because privacy is critical to me."</li>
+<li>On the third screen, titled</em></ins></span> "Signing," select <span class="removed"><del><strong>"No, I</strong></del></span> <span class="inserted"><ins><em>"Don't sign my messages by default."</li>
+<li>On the fourth screen, titled "Key Selection," select "I</em></ins></span> want to create <span class="removed"><del><strong>per-recipient
+rules</strong></del></span> <span class="inserted"><ins><em>a new key pair</em></ins></span>
+for <span class="removed"><del><strong>emails that need to be signed."</p>
+
+<p>Use the default options until you reach the screen titled "Create Key".</p>
+
+<p>On</strong></del></span> <span class="inserted"><ins><em>signing and encryption my email."</li>
+<li>On</em></ins></span> 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 <span class="removed"><del><strong>wasted!</p></strong></del></span> <span class="inserted"><ins><em>wasted!</li>
+</ul></em></ins></span>
+
+<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>When the <span class="removed"><del><strong>OpenPGP Confirm</strong></del></span> <span class="inserted"><ins><em>"Key Generation Completed"</em></ins></span> 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 <span class="removed"><del><strong>5</a>. The setup wizard will ask
+you to move it onto an external device, but that isn't necessary at this moment.</p></strong></del></span> <span class="inserted"><ins><em>5</a>.</p></em></ins></span>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<dt>I can't find the <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> menu.</dt>
+
+<dd>In many new email programs, the main menu is represented by an image of three stacked
+horizontal bars. <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> 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 <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> →
+Setup Wizard.</dd>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-2a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-2b" class="step">
+<div class="main">
+
+<h3><em>Step 2.b</em> Upload your public key to a keyserver</h3>
+
+<p>In your email program's menu, select <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> → Key Management.</p>
+
+<p>Right click on your key and select Upload Public Keys to Keyserver. Use the default
+keyserver in the popup.</p>
+
+<p class="notes">Now someone who wants to send you an encrypted message can download your
+public key from the Internet. There are multiple keyservers that you can select from the
+menu when you upload, but they are all copies of each other, so it doesn't matter which
+one you use. However, it sometimes takes a few hours for them to match each other when a
+new key is uploaded.</p>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<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 <span class="removed"><del><strong>Show Default Keys.</dd></strong></del></span> <span class="inserted"><ins><em>"Display All Keys by Default."</dd></em></ins></span>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-2b .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="terminology" class="step">
+<div class="main">
+
+<h3>GnuPG, OpenPGP, what?</h3>
+
+<span class="removed"><del><strong><p>You're using a program called GnuPG, but the menu in your email program is called
+OpenPGP. Confusing, right? In</strong></del></span>
+
+<span class="inserted"><ins><em><p>In</em></ins></span> general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are used <span class="removed"><del><strong>interchangeably, though they all have slightly different meanings.</p></strong></del></span>
+<span class="inserted"><ins><em>interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the encryption standard,
+and GNU Privacy Guard (often shortened to GPG or GnuPG) is the program that implements the
+standard. Enigmail is a plug-in program for your email program that provides an interface
+for GnuPG.</p></em></ins></span>
+
+</div><!-- End .main -->
+</div><!-- End #terminology.step-->
+</div></section><!-- End #section2 -->
+
+<!-- ~~~~~~~~~ Section 3: Try it out ~~~~~~~~~ -->
+<section class="row" id="section3"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#3</em> Try it out!</h2>
+
+<p>Now you'll try a test correspondence with a computer program named 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>
+
+</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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 3.a</em> Send Edward your public key</h3>
+
+<p>This is a special step that you won't have to do when corresponding with real people. In
+your email program's menu, go to <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> → Key Management. You should see your key in
+the list that pops up. Right click on your key and select Send Public Keys by Email. This
+will create a new draft message, as if you had just hit the Write button.</p>
+
+<p>Address the message to edward-en@fsf.org. Put at least one word (whatever you want)
+in the subject and body of the <span class="removed"><del><strong>email, then</strong></del></span> <span class="inserted"><ins><em>email. Then</em></ins></span> hit send.</p>
+
+<span class="inserted"><ins><em><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></em></ins></span>
+
+<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>
+
+<span class="inserted"><ins><em><p>When you open Edward's reply, Enigmail may prompt you for your password before using
+your private key to decrypt it.</p></em></ins></span>
+
+</div><!-- End .main -->
+</div><!-- End #step-3a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-3b" class="step">
+<div class="main">
+
+<h3><em>Step 3.b</em> Send a test encrypted email</h3>
+
+<p>Write a new email in your email program, addressed to edward-en@fsf.org. Make the subject
+"Encryption test" or something similar and write something in the <span class="removed"><del><strong>body. Don't send it yet.</p>
+
+<p>Click the icon of the</strong></del></span> <span class="inserted"><ins><em>body.</p>
+
+<p>They</em></ins></span> key in the bottom right of the <span class="removed"><del><strong>composition</strong></del></span> window <span class="removed"><del><strong>(it</strong></del></span> should <span class="removed"><del><strong>turn
+yellow).</strong></del></span> <span class="inserted"><ins><em>be yellow, meaning encryption is
+on.</em></ins></span> This <span class="removed"><del><strong>tells Enigmail to encrypt the email.</p></strong></del></span> <span class="inserted"><ins><em>will be your default from now on.</p></em></ins></span>
+
+<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. <span class="removed"><del><strong>Select</strong></del></span> <span class="inserted"><ins><em>Check
+the box in front of</em></ins></span> Edward's key <span class="removed"><del><strong>from the list</strong></del></span> and click <span class="removed"><del><strong>Ok. If</strong></del></span> <span class="inserted"><ins><em>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</em></ins></span> the <span class="removed"><del><strong>message doesn't send automatically,</strong></del></span> <span class="inserted"><ins><em>only one with his private key, so no one
+except him — not even</em></ins></span> you <span class="inserted"><ins><em>—</em></ins></span> can <span class="removed"><del><strong>hit send now.</p></strong></del></span> <span class="inserted"><ins><em>decrypt it.</p></em></ins></span>
+
+<!-- ~~~~~~~~~ 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 <span class="removed"><del><strong>clicked.</strong></del></span> <span class="inserted"><ins><em>clicked Send.</em></ins></span> Make sure you are connected
+to the Internet and try again. If that doesn't work, repeat the process, choosing a
+different keyserver when it asks you to pick one.</dd>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-3b .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-headers_unencrypted" class="step">
+<div class="main">
+
+<h3><em>Important:</em> Security tips</h3>
+
+<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>
+
+<span class="removed"><del><strong><p>It's also good practice to click the key icon in your email composition window
+<strong>before</strong> you start to write. Otherwise, your email client could save an
+unencrypted draft on the mail server, potentially exposing it to snooping.</p></strong></del></span>
+
+</div><!-- End .main -->
+</div><!-- End #step-headers_unencrypted .step-->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-3c" class="step">
+<div class="main">
+
+<h3><em>Step 3.c</em> Receive a response</h3>
+
+<p>When Edward receives your email, he will use his private key to decrypt it, then <span class="removed"><del><strong>fetch</strong></del></span> <span class="inserted"><ins><em>use</em></ins></span>
+your public key <span class="removed"><del><strong>from a keyserver and use it</strong></del></span> <span class="inserted"><ins><em>(which you sent him in <a href="#step-3a">Step 3.A</a>)</em></ins></span> to encrypt <span class="removed"><del><strong>a response</strong></del></span> <span class="inserted"><ins><em>his
+reply</em></ins></span> to you.</p>
+
+<p <span class="removed"><del><strong>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 — not even you — can decrypt it.</p>
+
+<p</strong></del></span> 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.</p>
+
+<p>When you receive Edward's email and open it, Enigmail will automatically detect that
+it is encrypted with your public key, and then it will use your private key to decrypt it.</p>
+
+<p>Notice the bar that Enigmail shows you above the message, with information about the
+status of Edward's key.</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>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></section><!-- End #section3 -->
+
+<!-- ~~~~~~~~~ Section 4: Learn the Web of Trust ~~~~~~~~~ -->
+<section class="row" id="section4"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#4</em> Learn the Web of Trust</h2>
+
+<p>Email encryption is a powerful technology, but it has a weakness; it requires a way to
+verify that a person's 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 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'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 <span class="removed"><del><strong>OpenPGP</strong></del></span>
+<span class="inserted"><ins><em>Enigmail</em></ins></span> → 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 <span class="removed"><del><strong>Window.</strong></del></span> <span class="inserted"><ins><em>window.</em></ins></span> 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 -->
+
+<!-- ~~~~~~~~~ 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 4.a</em> Sign a key</h3>
+
+<p>In your email program's menu, go to <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> → Key Management.</p>
+
+<p>Right click on Edward's public key and select Sign Key from the context menu.</p>
+
+<p>In the window that pops up, select "I will not answer" and click ok.</p>
+
+<span class="removed"><del><strong><p>In your email program's menu, go to OpenPGP →</strong></del></span>
+
+<span class="inserted"><ins><em><p>Now you should be back at the</em></ins></span> Key Management <span class="removed"><del><strong>→</strong></del></span> <span class="inserted"><ins><em>menu. Select</em></ins></span> Keyserver → Upload Public
+Keys and hit ok.</p>
+
+<p class="notes">You've just effectively said "I trust that Edward's public key actually
+belongs to Edward." This doesn't mean much because Edward isn't a real person, but it's
+good practice.</p>
+
+<!--<div id="pgp-pathfinder">
+
+<form enctype="application/x-www-form-urlencoded" action="/mk_path.cgi" method="get">
+
+<p><strong>From:</strong>
+<input type="text" placeholder="xD41A008" name="FROM"></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 .main -->
+</div><!-- End #step-4a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-sign_real_keys" 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>
+
+</div><!-- End .main -->
+</div><!-- End #step-sign_real_keys .step-->
+</div></section><!-- End #section4 -->
+
+<!-- ~~~~~~~~~ Section 5: Use it well ~~~~~~~~~ -->
+<section id="section5" class="row"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#5</em> Use it well</h2>
+
+<p>Everyone uses GnuPG a little differently, but it's important to follow some basic
+practices to keep your email secure. Not following them, you risk the privacy of the people
+you communicate with, as well as your own, and damage the Web of Trust.</p>
+
+</div><!-- End .section-intro -->
+
+<!-- ~~~~~~~~~ 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3>When should I encrypt?</h3>
+
+<p>The more you can encrypt your messages, the better. If you only encrypt emails
+occasionally, each encrypted message could raise a red flag for surveillance systems. If all
+or most of your email is encrypted, people doing surveillance won't know where to start.</p>
+
+<p>That's not to say that only encrypting some of your email isn't helpful -- it's a great
+start and it makes bulk surveillance more difficult.</p>
+
+</div><!-- End .main -->
+</div><!-- End #step-5a .step -->
+
+<!-- ~~~~~~~~~ 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<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 <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> at the top, which
+most likely says <span class="removed"><del><strong>"OpenPGP:</strong></del></span> <span class="inserted"><ins><em>"Enigmail:</em></ins></span> 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>
+
+</div><!-- End .main -->
+</div><!-- End #step-5b .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-5c" class="step">
+<div class="main">
+
+<h3>Copy your revocation certificate to somewhere safe</h3>
+
+<p>Remember when you created your keys and saved the revocation certificate that GnuPG
+made? It's time to copy that certificate onto the safest digital storage that you have --
+the ideal thing is a flash drive, disk, or hard drive stored in a safe place in your home.</p>
+
+<p>If your private key ever gets lost or stolen, you'll need this certificate file to let
+people know that you are no longer using that keypair.</p>
+
+</div><!-- End .main -->
+</div><!-- End #step-5c .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-lost_key" class="step">
+<div class="main">
+
+<h3><em>Important:</em> act swiftly if 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. 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>
+
+</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>
+
+</div><!-- End .main </div> End #step-5d .step-->
+</div></section><!-- End #section5 -->
+
+<!-- ~~~~~~~~~ Section 6: Next steps ~~~~~~~~~ -->
+<section class="row" id="section6">
+<div id="step-click_here" class="step">
+<div class="main">
+
+<h2><a href="next_steps.html">Great job! Check out the next steps.</a></h2>
+
+</div><!-- End .main -->
+</div><!-- End #step-click_here .step-->
+</section><!-- End #section6 -->
+
+<!-- ~~~~~~~~~ FAQ ~~~~~~~~~ -->
+<!-- When un-commenting this section go to main.css and search for /* Guide Sections
+Background */ then add #faq to the desired color
+<section class="row" id="faq"><div>
+<div class="sidebar">
+
+<h2>FAQ</h2>
+
+</div>
+<div class="main">
+
+<dl>
+<dt>My key expired</dt>
+
+<dd>Answer coming soon.</dd>
+
+<dt>Who can read encrypted messages? Who can read signed ones?</dt>
+
+<dd>Answer coming soon.</dd>
+
+<dt>My email program is opening at times I don't want it to open/is now my default program
+and I don't want it to be.</dt>
+
+<dd>Answer coming soon.</dd>
+</dl>
+
+</div>
+</div>
+</section> --><!-- End #faq -->
+
+<!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
+<footer class="row" id="footer"><div>
+<div id="copyright">
+
+<h4><a href="https://u.fsf.org/ys"><img
+alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"
+/></a></h4>
+
+<p>Copyright © 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 <span class="removed"><del><strong>2.1.</strong></del></span> <span class="inserted"><ins><em>3.0.</em></ins></span> <a
+href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source
+code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU
+General Public License.</a></em></p>
+
+<p>The images on this page are under a <a
+href="https://creativecommons.org/licenses/by/4.0/">Creative Commons
+Attribution 4.0 license (or later version)</a>, and the rest of it is under
+a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons
+Attribution-ShareAlike 4.0 license (or later version)</a>. — <a
+href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+<p>Download the source package for <a href="emailselfdefense_source.zip">this
+guide</a>. Fonts used in the guide & infographic: <a
+href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a
+href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedryś, <a
+href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type,
+<a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a>
+by Florian Cramer.</p>
+
+<p> <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense"> JavaScript
+license information </a> </p>
+
+</div><!-- /#copyright -->
+
+<p class="credits"> Infographic and guide design by <a rel="external"
+href="http://jplusplus.org"><strong>Journalism++</strong> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
+alt="Journalism++" /></a> </p><!-- /.credits -->
+
+</div></footer><!-- End #footer -->
+</pre></body></html>
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>infographic-diff.html</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+
+<title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
+
+<meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+<meta name="description" content="Email surveillance violates our fundamental rights and makes
+free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
+<link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
+</head>
+
+<body>
+<header class="row centered" id="header"><div>
+
+<p class="back">← Read the <a href="index.html">full guide</a></p>
+
+<h3> <a href="https://fsf.org/share?u=https://u.fsf.org/zc&t=How public-key
+encryption works. Infographic via %40fsf"> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
+alt="[GNU Social]"> <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+class="share-logo"
+alt="[Pump.io]">
+<img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
+alt="[Reddit]"> <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
+class="share-logo"
+alt="[Hacker News]">
+Share our infographic </a> with the hashtag #EmailSelfDefense </h3>
+
+<p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/full-infographic.png"
+alt="View & share our infographic" /></p>
+
+<p class="back">← Read the <a href="index.html">full guide</a></p>
+
+</div></header><!-- End #header -->
+
+<!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
+<footer class="row" id="footer"><div>
+<div id="copyright">
+
+<h4><a href="https://u.fsf.org/ys"><img
+alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"
+/></a></h4>
+
+<p>Copyright © 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 <span class="removed"><del><strong>2.1.</strong></del></span> <span class="inserted"><ins><em>3.0.</em></ins></span> <a
+href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source
+code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU
+General Public License.</a></em></p>
+
+<p>The images on this page are under a <a
+href="https://creativecommons.org/licenses/by/4.0/">Creative Commons
+Attribution 4.0 license (or later version)</a>, and the rest of it is under
+a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons
+Attribution-ShareAlike 4.0 license (or later version)</a>. — <a
+href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+<p>Download the source packages for <a href="https://fixme.com">this guide</a> and
+for <a href="https://static.fsf.org/nosvn/enc-dev0/gnupg-infographic.zip">the
+infographic</a>. Fonts used in the guide & infographic: <a
+href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a
+href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedryś <a
+href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type,
+<a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a>
+by Florian Cramer.</p>
+
+<p> <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense"> JavaScript
+license information </a> </p>
+
+</div><!-- /#copyright -->
+
+<p class="credits"> Infographic and guide design by <a rel="external"
+href="http://jplusplus.org"><strong>Journalism++</strong> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
+alt="Journalism++" /></a> </p><!-- /.credits -->
+
+</div></footer><!-- End #footer -->
+</pre></body></html>
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>mac-diff.html</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+
+<title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
+
+<meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
+<meta name="description" content="Email surveillance violates our fundamental rights and makes
+free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
+<link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
+</head>
+
+<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"><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>
+
+<ul id="menu" class="os">
+<li class="spacer"> <a href="index.html">GNU/Linux</a> </li>
+<li> <a href="mac.html" class="current">Mac OS</a> </li>
+<li> <a href="windows.html">Windows</a> </li>
+<li class="spacer"> <a href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Email
+encryption for everyone via %40fsf"> Share <img
+src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
+alt="[GNU Social]"> <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+class="share-logo"
+alt="[Pump.io]"> <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+class="share-logo"
+alt="[Reddit]"> <img src="//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>
+
+<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&id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate"><img
+alt="Donate" src="//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 & share our infographic →" /></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>
+
+<p>In addition to using encryption, standing up to surveillance requires fighting politically
+for a <a href="http://gnu.org/philosophy/surveillance-vs-democracy.html">reduction in the
+amount of data collected on us</a>, but the essential first step is to protect yourself
+and make surveillance of your communication as difficult as possible. Let's get started!</p>
+
+</div><!-- End .intro -->
+</div></header><!-- End #header -->
+
+<!-- ~~~~~~~~~ Section 1: Get the pieces ~~~~~~~~~ -->
+<section class="row" id="section1"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#1</em> Get the pieces</h2>
+
+<p 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 Mac OS). 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 a desktop email program installed on your computer. This guide
+works with free software versions of the Thunderbird email program, and with Thunderbird
+itself. 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 <span class="removed"><del><strong>one of these,</strong></del></span> <span class="inserted"><ins><em>an email program,</em></ins></span> 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 1.a</em> Setup your email program with your email <span class="removed"><del><strong>account (if it isn't
+already)</h3></strong></del></span> <span class="inserted"><ins><em>account</h3></em></ins></span>
+
+<p>Open your email program and follow the wizard <span class="inserted"><ins><em>(step-by-step walkthrough)</em></ins></span> that sets it
+up with your email account.</p>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<span class="removed"><del><strong><dt>What's a wizard?</dt>
+
+<dd>A</strong></del></span>
+<span class="inserted"><ins><em><dt>The</em></ins></span> wizard <span class="inserted"><ins><em>doesn't launch</dt>
+
+<dd>You can launch the wizard yourself, but the menu option for doing so</em></ins></span> is <span class="removed"><del><strong>a series of windows that pop up</strong></del></span> <span class="inserted"><ins><em>named differently
+in each email programs. The button</em></ins></span> to <span class="removed"><del><strong>make</strong></del></span> <span class="inserted"><ins><em>launch</em></ins></span> it <span class="removed"><del><strong>easy to get</strong></del></span> <span class="inserted"><ins><em>will be in the program's main menu, under
+"New" or something similar, titled</em></ins></span> something <span class="removed"><del><strong>done on
+a computer,</strong></del></span> like <span class="removed"><del><strong>installing a program. You click through it, selecting options as you go.</dd>
+
+<dt>My</strong></del></span> <span class="inserted"><ins><em>"Add account" or "New/Existing</em></ins></span> email <span class="removed"><del><strong>program</strong></del></span>
+<span class="inserted"><ins><em>account."</dd>
+
+<dt>The wizard</em></ins></span> 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>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</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 GPGTools</h3>
+
+<p>GPGTools is a software package that includes GnuPG. <a
+href="https://releases.gpgtools.org/GPG%20Suite%20-%202013.10.22.dmg">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.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>
+</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>
+
+<p>If not, search "Enigmail" with the search bar in the upper right. You can take it from
+here. Restart your email program when you're done.</p>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<dt>I can't find the menu.</dt>
+
+<dd>In many new email programs, the main menu is represented by an image of three stacked
+horizontal bars.</dd>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-1c .step -->
+</div></section><!-- End #section1 -->
+
+<!-- ~~~~~~~~~ Section 2: Make your keys ~~~~~~~~~ -->
+<section class="row" id="section2"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#2</em> Make your keys</h2>
+
+<p>To use the GnuPG system, you'll need a public key and a private key (known together as a
+keypair). Each is a long string of randomly generated numbers 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 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 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 2.a</em> Make a keypair</h3>
+
+<span class="removed"><del><strong><p>In your email program's menu,</strong></del></span>
+
+<span class="inserted"><ins><em><p>The Enigmail Setup wizard may start automatically. If it doesn't,</em></ins></span> select <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> →
+Setup <span class="removed"><del><strong>Wizard.</strong></del></span> <span class="inserted"><ins><em>Wizard from your email program's menu.</em></ins></span> 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 <span class="removed"><del><strong>wizard.</p>
+
+<p>On</strong></del></span> <span class="inserted"><ins><em>wizard. Click Next with the default options selected, except in these instances:</p>
+
+<ul>
+<li>On</em></ins></span> the second screen, titled <span class="inserted"><ins><em>"Encryption," select "Encrypt all of my messages by default,
+because privacy is critical to me."</li>
+<li>On the third screen, titled</em></ins></span> "Signing," select <span class="removed"><del><strong>"No, I</strong></del></span> <span class="inserted"><ins><em>"Don't sign my messages by default."</li>
+<li>On the fourth screen, titled "Key Selection," select "I</em></ins></span> want to create <span class="removed"><del><strong>per-recipient
+rules</strong></del></span> <span class="inserted"><ins><em>a new key pair</em></ins></span>
+for <span class="removed"><del><strong>emails that need to be signed."</p>
+
+<p>Use the default options until you reach the screen titled "Create Key".</p>
+
+<p>On</strong></del></span> <span class="inserted"><ins><em>signing and encryption my email."</li>
+<li>On</em></ins></span> 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 <span class="removed"><del><strong>wasted!</p></strong></del></span> <span class="inserted"><ins><em>wasted!</li>
+</ul></em></ins></span>
+
+<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>When the <span class="removed"><del><strong>OpenPGP Confirm</strong></del></span> <span class="inserted"><ins><em>"Key Generation Completed"</em></ins></span> 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 <span class="removed"><del><strong>5</a>. The setup wizard will ask
+you to move it onto an external device, but that isn't necessary at this moment.</p></strong></del></span> <span class="inserted"><ins><em>5</a>.</p></em></ins></span>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<dt>I can't find the <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> menu.</dt>
+
+<dd>In many new email programs, the main menu is represented by an image of three stacked
+horizontal bars. <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> may be inside a section called Tools.</dd>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-2a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-2b" class="step">
+<div class="main">
+
+<h3><em>Step 2.b</em> Upload your public key to a keyserver</h3>
+
+<p>In your email program's menu, select <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> → Key Management.</p>
+
+<p>Right click on your key and select Upload Public Keys to Keyserver. Use the default
+keyserver in the popup.</p>
+
+<p class="notes">Now someone who wants to send you an encrypted message can download your
+public key from the Internet. There are multiple keyservers that you can select from the
+menu when you upload, but they are all copies of each other, so it doesn't matter which
+one you use. However, it sometimes takes a few hours for them to match each other when a
+new key is uploaded.</p>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<dt>The progress bar never <span class="removed"><del><strong>finishes.hes</dt></strong></del></span> <span class="inserted"><ins><em>finishes.</dt></em></ins></span>
+
+<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 <span class="removed"><del><strong>Show Default Keys.</dd></strong></del></span> <span class="inserted"><ins><em>"Display All Keys by Default."</dd></em></ins></span>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-2b .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="terminology" class="step">
+<div class="main">
+
+<h3>GnuPG, OpenPGP, what?</h3>
+
+<span class="removed"><del><strong><p>You're using a program called GnuPG, but the menu in your email program is called
+OpenPGP. Confusing, right? In</strong></del></span>
+
+<span class="inserted"><ins><em><p>In</em></ins></span> general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are used <span class="removed"><del><strong>interchangeably, though they all have slightly different meanings.</p></strong></del></span>
+<span class="inserted"><ins><em>interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the encryption standard,
+and GNU Privacy Guard (often shortened to GPG or GnuPG) is the program that implements the
+standard. Enigmail is a plug-in program for your email program that provides an interface
+for GnuPG.</p></em></ins></span>
+
+</div><!-- End .main -->
+</div><!-- End #terminology.step-->
+</div></section><!-- End #section2 -->
+
+<!-- ~~~~~~~~~ Section 3: Try it out ~~~~~~~~~ -->
+<section class="row" id="section3"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#3</em> Try it out!</h2>
+
+<p>Now you'll try a test correspondence with a computer program named 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>
+
+</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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 3.a</em> Send Edward your public key</h3>
+
+<p>This is a special step that you won't have to do when corresponding with real people. In
+your email program's menu, go to <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> → Key Management. You should see your key in
+the list that pops up. Right click on your key and select Send Public Keys by Email. This
+will create a new draft message, as if you had just hit the Write button.</p>
+
+<p>Address the message to edward-en@fsf.org. Put at least one word (whatever you want)
+in the subject and body of the <span class="removed"><del><strong>email, then</strong></del></span> <span class="inserted"><ins><em>email. Then</em></ins></span> hit send.</p>
+
+<span class="inserted"><ins><em><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></em></ins></span>
+
+<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>
+
+<span class="inserted"><ins><em><p>When you open Edward's reply, Enigmail may prompt you for your password before using
+your private key to decrypt it.</p></em></ins></span>
+
+</div><!-- End .main -->
+</div><!-- End #step-3a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-3b" class="step">
+<div class="main">
+
+<h3><em>Step 3.b</em> Send a test encrypted email</h3>
+
+<p>Write a new email in your email program, addressed to edward-en@fsf.org. Make the subject
+"Encryption test" or something similar and write something in the <span class="removed"><del><strong>body. Don't send it yet.</p>
+
+<p>Click the icon of the</strong></del></span> <span class="inserted"><ins><em>body.</p>
+
+<p>They</em></ins></span> key in the bottom right of the <span class="removed"><del><strong>composition</strong></del></span> window <span class="removed"><del><strong>(it</strong></del></span> should <span class="removed"><del><strong>turn
+yellow).</strong></del></span> <span class="inserted"><ins><em>be yellow, meaning encryption is
+on.</em></ins></span> This <span class="removed"><del><strong>tells Enigmail to encrypt the email.</p></strong></del></span> <span class="inserted"><ins><em>will be your default from now on.</p></em></ins></span>
+
+<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. <span class="removed"><del><strong>Select</strong></del></span> <span class="inserted"><ins><em>Check
+the box in front of</em></ins></span> Edward's key <span class="removed"><del><strong>from the list</strong></del></span> and click <span class="removed"><del><strong>Ok. If</strong></del></span> <span class="inserted"><ins><em>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</em></ins></span> the <span class="removed"><del><strong>message doesn't send automatically,</strong></del></span> <span class="inserted"><ins><em>only one with his private key, so no one
+except him — not even</em></ins></span> you <span class="inserted"><ins><em>—</em></ins></span> can <span class="removed"><del><strong>hit send now.</p></strong></del></span> <span class="inserted"><ins><em>decrypt it.</p></em></ins></span>
+
+<!-- ~~~~~~~~~ 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 <span class="removed"><del><strong>clicked.</strong></del></span> <span class="inserted"><ins><em>clicked Send.</em></ins></span> Make sure you are connected
+to the Internet and try again. If that doesn't work, repeat the process, choosing a
+different keyserver when it asks you to pick one.</dd>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-3b .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-headers_unencrypted" class="step">
+<div class="main">
+
+<h3><em>Important:</em> Security tips</h3>
+
+<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>
+
+<span class="removed"><del><strong><p>It's also good practice to click the key icon in your email composition window
+<strong>before</strong> you start to write. Otherwise, your email client could save an
+unencrypted draft on the mail server, potentially exposing it to snooping.</p></strong></del></span>
+
+</div><!-- End .main -->
+</div><!-- End #step-headers_unencrypted .step-->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-3c" class="step">
+<div class="main">
+
+<h3><em>Step 3.c</em> Receive a response</h3>
+
+<p>When Edward receives your email, he will use his private key to decrypt it, then <span class="removed"><del><strong>fetch</strong></del></span> <span class="inserted"><ins><em>use</em></ins></span>
+your public key <span class="removed"><del><strong>from a keyserver and use it</strong></del></span> <span class="inserted"><ins><em>(which you sent him in <a href="#step-3a">Step 3.A</a>)</em></ins></span> to encrypt <span class="removed"><del><strong>a response</strong></del></span> <span class="inserted"><ins><em>his
+reply</em></ins></span> to you.</p>
+
+<p <span class="removed"><del><strong>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 — not even you — can decrypt it.</p>
+
+<p</strong></del></span> 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.</p>
+
+<p>When you receive Edward's email and open it, Enigmail will automatically detect that
+it is encrypted with your public key, and then it will use your private key to decrypt it.</p>
+
+<p>Notice the bar that Enigmail shows you above the message, with information about the
+status of Edward's key.</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>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></section><!-- End #section3 -->
+
+<!-- ~~~~~~~~~ Section 4: Learn the Web of Trust ~~~~~~~~~ -->
+<section class="row" id="section4"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#4</em> Learn the Web of Trust</h2>
+
+<p>Email encryption is a powerful technology, but it has a weakness; it requires a way to
+verify that a person's 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 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'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 <span class="removed"><del><strong>OpenPGP</strong></del></span>
+<span class="inserted"><ins><em>Enigmail</em></ins></span> → 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 <span class="removed"><del><strong>Window.</strong></del></span> <span class="inserted"><ins><em>window.</em></ins></span> 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 -->
+
+<!-- ~~~~~~~~~ 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 4.a</em> Sign a key</h3>
+
+<p>In your email program's menu, go to <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> → Key Management.</p>
+
+<p>Right click on Edward's public key and select Sign Key from the context menu.</p>
+
+<p>In the window that pops up, select "I will not answer" and click ok.</p>
+
+<span class="removed"><del><strong><p>In your email program's menu, go to OpenPGP →</strong></del></span>
+
+<span class="inserted"><ins><em><p>Now you should be back at the</em></ins></span> Key Management <span class="removed"><del><strong>→</strong></del></span> <span class="inserted"><ins><em>menu. Select</em></ins></span> Keyserver → Upload Public
+Keys and hit ok.</p>
+
+<p class="notes">You've just effectively said "I trust that Edward's public key actually
+belongs to Edward." This doesn't mean much because Edward isn't a real person, but it's
+good practice.</p>
+
+<!--<div id="pgp-pathfinder">
+
+<form enctype="application/x-www-form-urlencoded" action="/mk_path.cgi" method="get">
+
+<p><strong>From:</strong>
+<input type="text" placeholder="xD41A008" name="FROM"></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 .main -->
+</div><!-- End #step-4a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-sign_real_keys" 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>
+
+</div><!-- End .main -->
+</div><!-- End #step-sign_real_keys .step-->
+</div></section><!-- End #section4 -->
+
+<!-- ~~~~~~~~~ Section 5: Use it well ~~~~~~~~~ -->
+<section id="section5" class="row"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#5</em> Use it well</h2>
+
+<p>Everyone uses GnuPG a little differently, but it's important to follow some basic
+practices to keep your email secure. Not following them, you risk the privacy of the people
+you communicate with, as well as your own, and damage the Web of Trust.</p>
+
+</div><!-- End .section-intro -->
+
+<!-- ~~~~~~~~~ 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3>When should I encrypt?</h3>
+
+<p>The more you can encrypt your messages, the better. If you only encrypt emails
+occasionally, each encrypted message could raise a red flag for surveillance systems. If all
+or most of your email is encrypted, people doing surveillance won't know where to start.</p>
+
+<p>That's not to say that only encrypting some of your email isn't helpful -- it's a great
+start and it makes bulk surveillance more difficult.</p>
+
+</div><!-- End .main -->
+</div><!-- End #step-5a .step -->
+
+<!-- ~~~~~~~~~ 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<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 <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> at the top, which
+most likely says <span class="removed"><del><strong>"OpenPGP:</strong></del></span> <span class="inserted"><ins><em>"Enigmail:</em></ins></span> 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>
+
+</div><!-- End .main -->
+</div><!-- End #step-5b .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-5c" class="step">
+<div class="main">
+
+<h3>Copy your revocation certificate to somewhere safe</h3>
+
+<p>Remember when you created your keys and saved the revocation certificate that GnuPG
+made? It's time to copy that certificate onto the safest digital storage that you have --
+the ideal thing is a flash drive, disk, or hard drive stored in a safe place in your home.</p>
+
+<p>If your private key ever gets lost or stolen, you'll need this certificate file to let
+people know that you are no longer using that keypair.</p>
+
+</div><!-- End .main -->
+</div><!-- End #step-5c .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-lost_key" class="step">
+<div class="main">
+
+<h3><em>Important:</em> act swiftly if 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. 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>
+
+</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>
+
+</div><!-- End .main <span class="removed"><del><strong></div><!--</strong></del></span> <span class="inserted"><ins><em></div></em></ins></span> End #step-5d .step-->
+</div></section><!-- End #section5 -->
+
+<!-- ~~~~~~~~~ Section 6: Next steps ~~~~~~~~~ -->
+<section class="row" id="section6">
+<div id="step-click_here" class="step">
+<div class="main">
+
+<h2><a href="next_steps.html">Great job! Check out the next steps.</a></h2>
+
+</div><!-- End .main -->
+</div><!-- End #step-click_here .step-->
+</section><!-- End #section6 -->
+
+<!-- ~~~~~~~~~ FAQ ~~~~~~~~~ -->
+<!-- When un-commenting this section go to main.css and search for /* Guide Sections
+Background */ then add #faq to the desired color
+<section class="row" id="faq"><div>
+<div class="sidebar">
+
+<h2>FAQ</h2>
+
+</div>
+<div class="main">
+
+<dl>
+<dt>My key expired</dt>
+
+<dd>Answer coming soon.</dd>
+
+<dt>Who can read encrypted messages? Who can read signed ones?</dt>
+
+<dd>Answer coming soon.</dd>
+
+<dt>My email program is opening at times I don't want it to open/is now my default program
+and I don't want it to be.</dt>
+
+<dd>Answer coming soon.</dd>
+</dl>
+
+</div>
+</div>
+</section> --><!-- End #faq -->
+
+<!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
+<footer class="row" id="footer"><div>
+<div id="copyright">
+
+<h4><a href="https://u.fsf.org/ys"><img
+alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"
+/></a></h4>
+
+<p>Copyright © 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 <span class="removed"><del><strong>2.1.</strong></del></span> <span class="inserted"><ins><em>3.0.</em></ins></span> <a
+href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source
+code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU
+General Public License.</a></em></p>
+
+<p>The images on this page are under a <a
+href="https://creativecommons.org/licenses/by/4.0/">Creative Commons
+Attribution 4.0 license (or later version)</a>, and the rest of it is under
+a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons
+Attribution-ShareAlike 4.0 license (or later version)</a>. — <a
+href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+<p>Download the source package for <a href="emailselfdefense_source.zip">this
+guide</a>. Fonts used in the guide & infographic: <a
+href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a
+href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedryś, <a
+href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type,
+<a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a>
+by Florian Cramer.</p>
+
+<p> <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense"> JavaScript
+license information </a> </p>
+
+</div><!-- /#copyright -->
+
+<p class="credits"> Infographic and guide design by <a rel="external"
+href="http://jplusplus.org"><strong>Journalism++</strong> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
+alt="Journalism++" /></a> </p><!-- /.credits -->
+
+</div></footer><!-- End #footer -->
+</pre></body></html>
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>next_steps-diff.html</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+
+<title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
+
+<meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
+<meta name="description" content="Email surveillance violates our fundamental rights and makes
+free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
+<link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
+</head>
+
+<body>
+
+<!-- ~~~~~~~~~ GnuPG Header and introduction text ~~~~~~~~~ -->
+<header class="row" id="header"><div>
+
+<h1>Great job!</h1>
+
+</div></header><!-- End #header -->
+
+<!-- ~~~~~~~~~ Section 6: Next steps ~~~~~~~~~ -->
+<section class="row" id="section6"><div>
+
+<!-- ~~~~~~~~~ section title + graphics ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#6</em> Next steps</h2>
+
+<p>You've now completed the basics of email encryption with GnuPG, taking action against
+bulk surveillance. A pat on the back to you! These next steps will help make the most of
+the work you did today.</p>
+
+</div><!-- End .section-intro -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-political" class="step">
+<div class="sidebar">
+
+<p><a id="infographic" href="infographic.html"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/en/infographic-button.png"
+alt="View & share our infographic →" /></a></p>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3>Join the movement</h3>
+
+<p>You've just taken a huge step towards protecting your privacy online. But each of us
+acting alone isn't enough. To topple bulk surveillance, we need to build a movement for the
+autonomy and freedom of all computer users. Join the Free Software Foundation's community
+to meet like-minded people and work together for change.</p>
+
+<p style="font-size:150%"> <a href="https://status.fsf.org/fsf"> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
+alt="[GNU Social]">
+ GNU Social </a> | <a href="http://microca.st/fsf"> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
+alt="[Pump.io]">
+ Pump.io </a> | <a href="https://www.twitter.com/fsf">Twitter</a> </p>
+
+<p><a href="https://www.fsf.org/twitter"><small>Read why GNU Social and Pump.io are better
+than Twitter.</small></a></p>
+
+<br /> <div class="newsletter">
+
+<p style="font-size:150%">Low-volume mailing list</p>
+
+<form method="post"
+action="https://crm.fsf.org/civicrm/profile/create&reset=1&gid=31">
+<input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail" />
+<input type="submit" value="Add me" name="_qf_Edit_next" />
+<input type="hidden" value="https://emailselfdefense.fsf.org/en/confirmation.html"
+name="postURL" />
+<input type="hidden" value="1" name="group[25]" />
+<input type="hidden" value="https://crm.fsf.org/civicrm/profile?reset=1&gid=31"
+name="cancelURL" />
+<input type="hidden" value="Edit:cancel" name="_qf_default" />
+</form>
+
+<p><small>Read our <a href="https://my.fsf.org/donate/privacypolicy.html">privacy
+policy</a>.</small></p>
+
+</div><!-- End .newsletter -->
+</div><!-- End .main -->
+</div><!-- End #step-political .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-friends" class="step">
+<div class="main">
+
+<h3>Get your friends involved</h3>
+
+<p><strong>This is the single biggest thing you can do to promote email
+encryption.</strong></p>
+
+<p>Before you close this guide, use <a
+href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Encrypt with me using Email
+Self-Defense %40fsf">our sharing page</a> to compose a message to a few friends
+and ask them to join you in using encrypted email. Remember to include your <a
+href="index.html#section4">GnuPG public key ID</a> so they can easily download your key.</p>
+
+<p>It's also great to add your public key fingerprint to your email signature so that
+people you are corresponding with know you accept encrypted email.</p>
+
+<p class="notes">We recommend you even go a step further and add it to 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>
+
+</div><!-- End .main -->
+</div><!-- End #step-friends .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-more_technologies" class="step">
+<div class="main">
+
+<h3>Protect more of your digital life</h3>
+
+<p>Learn surveillance-resistant technologies for instant messages, hard drive storage, online
+sharing, and more at <a href="https://directory.fsf.org/wiki/Collection:Privacy_pack">
+the Free Software Directory's Privacy Pack</a> and <a
+href="https://prism-break.org">prism-break.org</a>.</p>
+
+
+
+<p>If you are using Windows, Mac OS or any other proprietary operating system, we recommend
+you switch to a free software operating system like GNU/Linux. This will make it much
+harder for attackers to enter your computer through hidden back doors. Check out the Free
+Software Foundation's <a href="http://www.gnu.org/distros/free-distros.html">endorsed
+versions of GNU/Linux.</a></p>
+
+</div><!-- End .main -->
+</div><!-- End #step-more_technologies .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-better" class="step">
+<div class="sidebar">
+
+<p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section6-next-steps.png"
+alt="Section 6: Next Steps" /></p>
+
+ <br />
+
+<p class="back" style="text-align:center">← <a href="index.html">Return to the
+guide</a></p>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3>Make Email Self-Defense tools even better</h3>
+
+<p><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Leave feedback and
+suggest improvements to this guide</a>. We welcome translations, but we ask that you
+contact us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> before you start,
+so that we can connect you with other translators working in your language.</p>
+
+<p>If you like programming, you can contribute code
+to <a href="https://www.gnupg.org/">GnuPG</a> or <a
+href="https://www.enigmail.net/home/index.php">Enigmail</a>.</p>
+
+<p>To go the extra mile, support the Free Software Foundation so we can keep improving
+Email Self-Defense, and make more tools like it.</p>
+
+<p><a
+href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate"><img
+alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" /></a> </p>
+
+<br />
+</div><!-- End .main -->
+</div><!-- End #step-better .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~
+<div id="step-learn_more" class="step">
+<div class="main">
+
+<h3>Learn more about GnuPG</h3>
+
+<p>There are a lot more features of GnuPG to discover, including encrypting files on your
+computer. There are a variety of resources accessible via Google, but we recommend starting
+with the links on the <a href="https://www.gnupg.org/documentation/">GnuPG Web site</a>.</p>
+
+</div><!-- End .main -- </div><!-- End #step-learn_more .step -->
+</div></section><!-- End #section6 -->
+
+<!-- ~~~~~~~~~ FAQ ~~~~~~~~~ -->
+<!-- When un-commenting this section go to main.css and search for /* Guide Sections
+Background */ then add #faq to the desired color
+<section class="row" id="faq"><div>
+<div class="sidebar">
+
+<h2>FAQ</h2>
+
+</div>
+<div class="main">
+
+<dl>
+<dt>My key expired</dt>
+
+<dd>Answer coming soon.</dd>
+
+<dt>Who can read encrypted messages? Who can read signed ones?</dt>
+
+<dd>Answer coming soon.</dd>
+
+<dt>My email program is opening at times I don't want it to open/is now my default program
+and I don't want it to be.</dt>
+
+<dd>Answer coming soon.</dd>
+</dl>
+
+</div>
+</div>
+</section> --><!-- End #faq -->
+
+<!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
+<footer class="row" id="footer"><div>
+<div id="copyright">
+
+<h4><a href="https://u.fsf.org/ys"><img
+alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"
+/></a></h4>
+
+<p>Copyright © 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 <span class="removed"><del><strong>2.1.</strong></del></span> <span class="inserted"><ins><em>3.0.</em></ins></span> <a
+href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source
+code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU
+General Public License.</a></em></p>
+
+<p>The images on this page are under a <a
+href="https://creativecommons.org/licenses/by/4.0/">Creative Commons
+Attribution 4.0 license (or later version)</a>, and the rest of it is under
+a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons
+Attribution-ShareAlike 4.0 license (or later version)</a>. — <a
+href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+<p>Download the source package for <a href="emailselfdefense_source.zip">this
+guide</a>. Fonts used in the guide & infographic: <a
+href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a
+href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedryś <a
+href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type,
+<a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a>
+by Florian Cramer.</p>
+
+<p> <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense"> JavaScript
+license information </a> </p>
+
+</div><!-- /#copyright -->
+
+<p class="credits"> Infographic and guide design by <a rel="external"
+href="http://jplusplus.org"><strong>Journalism++</strong> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
+alt="Journalism++" /></a> </p><!-- /.credits -->
+
+</div></footer><!-- End #footer -->
+</pre></body></html>
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>windows-diff.html</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+
+<title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
+
+<meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
+<meta name="description" content="Email surveillance violates our fundamental rights and makes
+free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
+<link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
+</head>
+
+<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"><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>
+
+<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="https://fsf.org/share?u=https://u.fsf.org/zb&t=Email
+encryption for everyone via %40fsf"> Share <img
+src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
+alt="[GNU Social]"> <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+class="share-logo"
+alt="[Pump.io]"> <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+class="share-logo"
+alt="[Reddit]"> <img src="//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>
+
+<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&id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate"><img
+alt="Donate" <span class="removed"><del><strong>src="//static.fsf.org/nosvn/enc-dev0/img/es/donate.png"/></a></strong></del></span> <span class="inserted"><ins><em>src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png"/></a></em></ins></span> </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 & share our infographic →" /></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>
+
+<p>In addition to using encryption, standing up to surveillance requires fighting politically
+for a <a href="http://gnu.org/philosophy/surveillance-vs-democracy.html">reduction in the
+amount of data collected on us</a>, but the essential first step is to protect yourself
+and make surveillance of your communication as difficult as possible. Let's get started!</p>
+
+</div><!-- End .intro -->
+</div></header><!-- End #header -->
+
+<!-- ~~~~~~~~~ Section 1: Get the pieces ~~~~~~~~~ -->
+<section class="row" id="section1"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#1</em> Get the pieces</h2>
+
+<p 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 a desktop email program installed on your computer. This guide
+works with free software versions of the Thunderbird email program, and with Thunderbird
+itself. 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 <span class="removed"><del><strong>one of these,</strong></del></span> <span class="inserted"><ins><em>an email program,</em></ins></span> 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 1.a</em> Setup your email program with your email <span class="removed"><del><strong>account (if it isn't
+already)</h3></strong></del></span> <span class="inserted"><ins><em>account</h3></em></ins></span>
+
+<p>Open your email program and follow the wizard <span class="inserted"><ins><em>(step-by-step walkthrough)</em></ins></span> that sets it
+up with your email account.</p>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<span class="removed"><del><strong><dt>What's a wizard?</dt>
+
+<dd>A</strong></del></span>
+<span class="inserted"><ins><em><dt>The</em></ins></span> wizard <span class="inserted"><ins><em>doesn't launch</dt>
+
+<dd>You can launch the wizard yourself, but the menu option for doing so</em></ins></span> is <span class="removed"><del><strong>a series of windows that pop up</strong></del></span> <span class="inserted"><ins><em>named differently
+in each email programs. The button</em></ins></span> to <span class="removed"><del><strong>make</strong></del></span> <span class="inserted"><ins><em>launch</em></ins></span> it <span class="removed"><del><strong>easy to get</strong></del></span> <span class="inserted"><ins><em>will be in the program's main menu, under
+"New" or something similar, titled</em></ins></span> something <span class="removed"><del><strong>done on
+a computer,</strong></del></span> like <span class="removed"><del><strong>installing a program. You click through it, selecting options as you go.</dd>
+
+<dt>My</strong></del></span> <span class="inserted"><ins><em>"Add account" or "New/Existing</em></ins></span> email <span class="removed"><del><strong>program</strong></del></span>
+<span class="inserted"><ins><em>account."</dd>
+
+<dt>The wizard</em></ins></span> 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>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</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 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>
+</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>
+
+<p>If not, search "Enigmail" with the search bar in the upper right. You can take it from
+here. Restart your email program when you're done.</p>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<dt>I can't find the menu.</dt>
+
+<dd>In many new email programs, the main menu is represented by an image of three stacked
+horizontal bars.</dd>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-1c .step -->
+</div></section><!-- End #section1 -->
+
+<!-- ~~~~~~~~~ Section 2: Make your keys ~~~~~~~~~ -->
+<section class="row" id="section2"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#2</em> Make your keys</h2>
+
+<p>To use the GnuPG system, you'll need a public key and a private key (known together as a
+keypair). Each is a long string of randomly generated numbers 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 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 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 2.a</em> Make a keypair</h3>
+
+<span class="removed"><del><strong><p>In your email program's menu,</strong></del></span>
+
+<span class="inserted"><ins><em><p>The Enigmail Setup wizard may start automatically. If it doesn't,</em></ins></span> select <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> →
+Setup <span class="removed"><del><strong>Wizard.</strong></del></span> <span class="inserted"><ins><em>Wizard from your email program's menu.</em></ins></span> 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 <span class="removed"><del><strong>wizard.</p>
+
+<p>On</strong></del></span> <span class="inserted"><ins><em>wizard. Click Next with the default options selected, except in these instances:</p>
+
+<ul>
+<li>On</em></ins></span> the second screen, titled <span class="inserted"><ins><em>"Encryption," select "Encrypt all of my messages by default,
+because privacy is critical to me."</li>
+<li>On the third screen, titled</em></ins></span> "Signing," select <span class="removed"><del><strong>"No, I</strong></del></span> <span class="inserted"><ins><em>"Don't sign my messages by default."</li>
+<li>On the fourth screen, titled "Key Selection," select "I</em></ins></span> want to create <span class="removed"><del><strong>per-recipient
+rules</strong></del></span> <span class="inserted"><ins><em>a new key pair</em></ins></span>
+for <span class="removed"><del><strong>emails that need to be signed."</p>
+
+<p>Use the default options until you reach the screen titled "Create Key".</p>
+
+<p>On</strong></del></span> <span class="inserted"><ins><em>signing and encryption my email."</li>
+<li>On</em></ins></span> 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 <span class="removed"><del><strong>wasted!</p></strong></del></span> <span class="inserted"><ins><em>wasted!</li>
+</ul></em></ins></span>
+
+<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>When the <span class="removed"><del><strong>OpenPGP Confirm</strong></del></span> <span class="inserted"><ins><em>"Key Generation Completed"</em></ins></span> 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 <span class="removed"><del><strong>5</a>. The setup wizard will ask
+you to move it onto an external device, but that isn't necessary at this moment.</p></strong></del></span> <span class="inserted"><ins><em>5</a>.</p></em></ins></span>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<dt>I can't find the <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> menu.</dt>
+
+<dd>In many new email programs, the main menu is represented by an image of three stacked
+horizontal bars. <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> may be inside a section called Tools.</dd>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-2a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-2b" class="step">
+<div class="main">
+
+<h3><em>Step 2.b</em> Upload your public key to a keyserver</h3>
+
+<p>In your email program's menu, select <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> → Key Management.</p>
+
+<p>Right click on your key and select Upload Public Keys to Keyserver. Use the default
+keyserver in the popup.</p>
+
+<p class="notes">Now someone who wants to send you an encrypted message can download your
+public key from the Internet. There are multiple keyservers that you can select from the
+menu when you upload, but they are all copies of each other, so it doesn't matter which
+one you use. However, it sometimes takes a few hours for them to match each other when a
+new key is uploaded.</p>
+
+<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Troubleshooting</h4>
+
+<dl>
+<dt>The progress bar never <span class="removed"><del><strong>finishes.hes</dt></strong></del></span> <span class="inserted"><ins><em>finishes.</dt></em></ins></span>
+
+<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 <span class="removed"><del><strong>Show Default Keys.</dd></strong></del></span> <span class="inserted"><ins><em>"Display All Keys by Default."</dd></em></ins></span>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-2b .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="terminology" class="step">
+<div class="main">
+
+<h3>GnuPG, OpenPGP, what?</h3>
+
+<span class="removed"><del><strong><p>You're using a program called GnuPG, but the menu in your email program is called
+OpenPGP. Confusing, right? In</strong></del></span>
+
+<span class="inserted"><ins><em><p>In</em></ins></span> general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are used <span class="removed"><del><strong>interchangeably, though they all have slightly different meanings.</p></strong></del></span>
+<span class="inserted"><ins><em>interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the encryption standard,
+and GNU Privacy Guard (often shortened to GPG or GnuPG) is the program that implements the
+standard. Enigmail is a plug-in program for your email program that provides an interface
+for GnuPG.</p></em></ins></span>
+
+</div><!-- End .main -->
+</div><!-- End #terminology.step-->
+</div></section><!-- End #section2 -->
+
+<!-- ~~~~~~~~~ Section 3: Try it out ~~~~~~~~~ -->
+<section class="row" id="section3"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#3</em> Try it out!</h2>
+
+<p>Now you'll try a test correspondence with a computer program named 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>
+
+</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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 3.a</em> Send Edward your public key</h3>
+
+<p>This is a special step that you won't have to do when corresponding with real people. In
+your email program's menu, go to <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> → Key Management. You should see your key in
+the list that pops up. Right click on your key and select Send Public Keys by Email. This
+will create a new draft message, as if you had just hit the Write button.</p>
+
+<p>Address the message to edward-en@fsf.org. Put at least one word (whatever you want)
+in the subject and body of the <span class="removed"><del><strong>email, then</strong></del></span> <span class="inserted"><ins><em>email. Then</em></ins></span> hit send.</p>
+
+<span class="inserted"><ins><em><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></em></ins></span>
+
+<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>
+
+<span class="inserted"><ins><em><p>When you open Edward's reply, Enigmail may prompt you for your password before using
+your private key to decrypt it.</p></em></ins></span>
+
+</div><!-- End .main -->
+</div><!-- End #step-3a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-3b" class="step">
+<div class="main">
+
+<h3><em>Step 3.b</em> Send a test encrypted email</h3>
+
+<p>Write a new email in your email program, addressed to edward-en@fsf.org. Make the subject
+"Encryption test" or something similar and write something in the <span class="removed"><del><strong>body. Don't send it yet.</p>
+
+<p>Click the icon of the</strong></del></span> <span class="inserted"><ins><em>body.</p>
+
+<p>They</em></ins></span> key in the bottom right of the <span class="removed"><del><strong>composition</strong></del></span> window <span class="removed"><del><strong>(it</strong></del></span> should <span class="removed"><del><strong>turn
+yellow).</strong></del></span> <span class="inserted"><ins><em>be yellow, meaning encryption is
+on.</em></ins></span> This <span class="removed"><del><strong>tells Enigmail to encrypt the email.</p></strong></del></span> <span class="inserted"><ins><em>will be your default from now on.</p></em></ins></span>
+
+<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. <span class="removed"><del><strong>Select</strong></del></span> <span class="inserted"><ins><em>Check
+the box in front of</em></ins></span> Edward's key <span class="removed"><del><strong>from the list</strong></del></span> and click <span class="removed"><del><strong>Ok. If</strong></del></span> <span class="inserted"><ins><em>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</em></ins></span> the <span class="removed"><del><strong>message doesn't send automatically,</strong></del></span> <span class="inserted"><ins><em>only one with his private key, so no one
+except him — not even</em></ins></span> you <span class="inserted"><ins><em>—</em></ins></span> can <span class="removed"><del><strong>hit send now.</p></strong></del></span> <span class="inserted"><ins><em>decrypt it.</p></em></ins></span>
+
+<!-- ~~~~~~~~~ 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 <span class="removed"><del><strong>clicked.</strong></del></span> <span class="inserted"><ins><em>clicked Send.</em></ins></span> Make sure you are connected
+to the Internet and try again. If that doesn't work, repeat the process, choosing a
+different keyserver when it asks you to pick one.</dd>
+
+<dt class="feedback">Don't see a solution to your problem?</dt>
+
+<dd class="feedback">Please let us know on the <a
+href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step-3b .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-headers_unencrypted" class="step">
+<div class="main">
+
+<h3><em>Important:</em> Security tips</h3>
+
+<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>
+
+<span class="removed"><del><strong><p>It's also good practice to click the key icon in your email composition window
+<strong>before</strong> you start to write. Otherwise, your email client could save an
+unencrypted draft on the mail server, potentially exposing it to snooping.</p></strong></del></span>
+
+</div><!-- End .main -->
+</div><!-- End #step-headers_unencrypted .step-->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-3c" class="step">
+<div class="main">
+
+<h3><em>Step 3.c</em> Receive a response</h3>
+
+<p>When Edward receives your email, he will use his private key to decrypt it, then <span class="removed"><del><strong>fetch</strong></del></span> <span class="inserted"><ins><em>use</em></ins></span>
+your public key <span class="removed"><del><strong>from a keyserver and use it</strong></del></span> <span class="inserted"><ins><em>(which you sent him in <a href="#step-3a">Step 3.A</a>)</em></ins></span> to encrypt <span class="removed"><del><strong>a response</strong></del></span> <span class="inserted"><ins><em>his
+reply</em></ins></span> to you.</p>
+
+<p <span class="removed"><del><strong>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 — not even you — can decrypt it.</p>
+
+<p</strong></del></span> 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.</p>
+
+<p>When you receive Edward's email and open it, Enigmail will automatically detect that
+it is encrypted with your public key, and then it will use your private key to decrypt it.</p>
+
+<p>Notice the bar that Enigmail shows you above the message, with information about the
+status of Edward's key.</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>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></section><!-- End #section3 -->
+
+<!-- ~~~~~~~~~ Section 4: Learn the Web of Trust ~~~~~~~~~ -->
+<section class="row" id="section4"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#4</em> Learn the Web of Trust</h2>
+
+<p>Email encryption is a powerful technology, but it has a weakness; it requires a way to
+verify that a person's 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 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'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 <span class="removed"><del><strong>OpenPGP</strong></del></span>
+<span class="inserted"><ins><em>Enigmail</em></ins></span> → 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 <span class="removed"><del><strong>Window.</strong></del></span> <span class="inserted"><ins><em>window.</em></ins></span> 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 -->
+
+<!-- ~~~~~~~~~ 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3><em>Step 4.a</em> Sign a key</h3>
+
+<p>In your email program's menu, go to <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> → Key Management.</p>
+
+<p>Right click on Edward's public key and select Sign Key from the context menu.</p>
+
+<p>In the window that pops up, select "I will not answer" and click ok.</p>
+
+<span class="removed"><del><strong><p>In your email program's menu, go to OpenPGP →</strong></del></span>
+
+<span class="inserted"><ins><em><p>Now you should be back at the</em></ins></span> Key Management <span class="removed"><del><strong>→</strong></del></span> <span class="inserted"><ins><em>menu. Select</em></ins></span> Keyserver → Upload Public
+Keys and hit ok.</p>
+
+<p class="notes">You've just effectively said "I trust that Edward's public key actually
+belongs to Edward." This doesn't mean much because Edward isn't a real person, but it's
+good practice.</p>
+
+<!--<div id="pgp-pathfinder">
+
+<form enctype="application/x-www-form-urlencoded" action="/mk_path.cgi" method="get">
+
+<p><strong>From:</strong>
+<input type="text" placeholder="xD41A008" name="FROM"></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 .main -->
+</div><!-- End #step-4a .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-sign_real_keys" 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>
+
+</div><!-- End .main -->
+</div><!-- End #step-sign_real_keys .step-->
+</div></section><!-- End #section4 -->
+
+<!-- ~~~~~~~~~ Section 5: Use it well ~~~~~~~~~ -->
+<section id="section5" class="row"><div>
+
+<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
+<div class="section-intro">
+
+<h2><em>#5</em> Use it well</h2>
+
+<p>Everyone uses GnuPG a little differently, but it's important to follow some basic
+practices to keep your email secure. Not following them, you risk the privacy of the people
+you communicate with, as well as your own, and damage the Web of Trust.</p>
+
+</div><!-- End .section-intro -->
+
+<!-- ~~~~~~~~~ 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<h3>When should I encrypt?</h3>
+
+<p>The more you can encrypt your messages, the better. If you only encrypt emails
+occasionally, each encrypted message could raise a red flag for surveillance systems. If all
+or most of your email is encrypted, people doing surveillance won't know where to start.</p>
+
+<p>That's not to say that only encrypting some of your email isn't helpful -- it's a great
+start and it makes bulk surveillance more difficult.</p>
+
+</div><!-- End .main -->
+</div><!-- End #step-5a .step -->
+
+<!-- ~~~~~~~~~ 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>
+
+</div><!-- /.sidebar -->
+<div class="main">
+
+<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 <span class="removed"><del><strong>OpenPGP</strong></del></span> <span class="inserted"><ins><em>Enigmail</em></ins></span> at the top, which
+most likely says <span class="removed"><del><strong>"OpenPGP:</strong></del></span> <span class="inserted"><ins><em>"Enigmail:</em></ins></span> 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>
+
+</div><!-- End .main -->
+</div><!-- End #step-5b .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-5c" class="step">
+<div class="main">
+
+<h3>Copy your revocation certificate to somewhere safe</h3>
+
+<p>Remember when you created your keys and saved the revocation certificate that GnuPG
+made? It's time to copy that certificate onto the safest digital storage that you have --
+the ideal thing is a flash drive, disk, or hard drive stored in a safe place in your home.</p>
+
+<p>If your private key ever gets lost or stolen, you'll need this certificate file to let
+people know that you are no longer using that keypair.</p>
+
+</div><!-- End .main -->
+</div><!-- End #step-5c .step -->
+
+<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
+<div id="step-lost_key" class="step">
+<div class="main">
+
+<h3><em>Important:</em> act swiftly if 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. 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>
+
+</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>
+
+</div><!-- End .main <span class="removed"><del><strong></div><!--</strong></del></span> <span class="inserted"><ins><em></div></em></ins></span> End #step-5d .step-->
+</div></section><!-- End #section5 -->
+
+<!-- ~~~~~~~~~ Section 6: Next steps ~~~~~~~~~ -->
+<section class="row" id="section6">
+<div id="step-click_here" class="step">
+<div class="main">
+
+<h2><a href="next_steps.html">Great job! Check out the next steps.</a></h2>
+
+</div><!-- End .main -->
+</div><!-- End #step-click_here .step-->
+</section><!-- End #section6 -->
+
+<!-- ~~~~~~~~~ FAQ ~~~~~~~~~ -->
+<!-- When un-commenting this section go to main.css and search for /* Guide Sections
+Background */ then add #faq to the desired color
+<section class="row" id="faq"><div>
+<div class="sidebar">
+
+<h2>FAQ</h2>
+
+</div>
+<div class="main">
+
+<dl>
+<dt>My key expired</dt>
+
+<dd>Answer coming soon.</dd>
+
+<dt>Who can read encrypted messages? Who can read signed ones?</dt>
+
+<dd>Answer coming soon.</dd>
+
+<dt>My email program is opening at times I don't want it to open/is now my default program
+and I don't want it to be.</dt>
+
+<dd>Answer coming soon.</dd>
+</dl>
+
+</div>
+</div>
+</section> --><!-- End #faq -->
+
+<!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
+<footer class="row" id="footer"><div>
+<div id="copyright">
+
+<h4><a href="https://u.fsf.org/ys"><img
+alt="Free Software Foundation"
+<span class="removed"><del><strong>src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"/></a></h4></strong></del></span> <span class="inserted"><ins><em>src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"
+/></a></h4></em></ins></span>
+
+<p>Copyright © 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 <span class="removed"><del><strong>2.1.</strong></del></span> <span class="inserted"><ins><em>3.0.</em></ins></span> <a
+href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source
+code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU
+General Public License.</a></em></p>
+
+<p>The images on this page are under a <a
+href="https://creativecommons.org/licenses/by/4.0/">Creative Commons
+Attribution 4.0 license (or later version)</a>, and the rest of it is under
+a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons
+Attribution-ShareAlike 4.0 license (or later version)</a>. — <a
+href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
+
+<p>Download the source package for <a href="emailselfdefense_source.zip">this
+guide</a>. Fonts used in the guide & infographic: <a
+href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a
+href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedryś, <a
+href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type,
+<a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a>
+by Florian Cramer.</p>
+
+<p> <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense"> JavaScript
+license information </a> </p>
+
+</div><!-- /#copyright -->
+
+<p class="credits"> Infographic and guide design by <a rel="external"
+href="http://jplusplus.org"><strong>Journalism++</strong> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
+alt="Journalism++" /></a> </p><!-- /.credits -->
+
+</div></footer><!-- End #footer -->
+</pre></body></html>
projects / enc.git / commitdiff