+++ /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://gpgtools.org/#gpgsuite">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://my.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://my.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="https://www.gpg4win.org">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>
+++ /dev/null
-#!/bin/bash
-
-## assemble-all-pages -- generate a set of HTML pages with variable parts
-# for emailselfdefense.fsf.org
-
-## Synopsis: assemble-all-pages
-
-## Description
-
-# Each page is built from a template and one or several includes, as usual;
-# in addition, several versions of a page can be built from a single
-# template which contains all the variable parts, by deleting irrelevant
-# text.
-
-# The templates have inclusion markers (similar to SSI directives, except
-# for the lack of "#") to indicate where the constant parts are to be
-# inserted, and deletion markers to identify the borders of each deletion
-# and indicate which page(s) the text between those borders belongs to.
-
-# The script processes all the templates in the working directory and the
-# pages are created in the parent directory.
-
-# Ideally, any modifications should be done to the templates or includes,
-# not to the final pages.
-
-# Templates: confirmation.t.html
-# index.t.html (contains variable parts for mac and windows)
-# infographic.t.html
-# next_steps.t.html
-
-# Includes: footer.html
-# head.html (contains 2 alternate sets of keywords)
-# javascript.html
-# translist.html
-
-## Graphic-user-interface howto
-
-# - Place the script in the same directory as the templates.
-# - Display this directory in the file browser (do not just unfold the parent
-# directory) and double-click on the script.
-
-# And if anything goes wrong, you can do a git reset, right? ;-)
-
-# ===========================================================================
-
-set -e
-set -o pipefail
-
-function close_term () {
- printf '\n%s' '*** Close the terminal window or press Return.'; read OK
- test -z "$OK" && exit $1
-}
-
-# Create temporary files.
-names=$(mktemp -t aap.XXXXXX) || close_term 1
-list=$(mktemp -t aap.XXXXXX) || close_term 1
-before=$(mktemp -t aap.XXXXXX) || close_term 1
-after=$(mktemp -t aap.XXXXXX) || close_term 1
-trap 'rm -f "$names" "$list" "$before" "$after"' EXIT
-
-# List all the templates in the working directory.
-if ls *.t.html > $names 2>/dev/null; then
- sed -i 's,\.t\.html$,,' $names
-else
- echo "*** There is no template in this directory." && close_term 1
-fi
-
-## Add the includes to the templates.
-
-while read name; do
- # Make sure there is a blank line before the first include, otherwise
- # it will not be added properly.
- sed '1i\\n' $name.t.html > ../$name.html
- # List the includes.
- grep '^<!-- include virtual="' ../$name.html |
- sed 's%^.*include virtual="\([^"]\+\).*$%\1%' > $list
- # Add the includes.
- while read include; do
- sed "1,/^<!-- include virtual=\"$include\"/!d" ../$name.html > $before
- sed "1,/^<!-- include virtual=\"$include\"/d" ../$name.html > $after
- if [ -f "$include" ]; then
- cat $before $include $after > ../$name.html
- else
- echo "$include is missing." && close_term 1
- fi
- sed -i "/^<!-- include virtual=\"$include\"/d" ../$name.html
- done < $list
-done < $names
-
-## Create mac.html and windows.html from index.html.
-
-cp ../index.html ../mac.html
-cp ../index.html ../windows.html
-# add them to the list of page names.
-echo 'mac' >> $names
-echo 'windows' >> $names
-
-## Remove the irrelevant parts.
-
-while read name ; do
- # Find out which deletions apply.
- grep '^<!-- START DELETION' ../$name.html |
- grep -v "$name" > $list || true
- sed -i 's%^<!-- START DELETION \([0-9][0-9]\),.*$%\1%' $list
- # Delete.
- while read deletion; do
- sed -i "/^<!-- START DELETION $deletion/, \
- /^<!-- END DELETION $deletion/d" ../$name.html
- done < $list
- # Remove the markers and any extra blank lines at the end of the page.
- sed -i '/^<!-- [A-Z]* DELETION/d' ../$name.html
- sed -i ':a /^\n*$/ {$d; N; ba}' ../$name.html
-done < $names
-
-close_term 0
+++ /dev/null
-#!/bin/bash
-
-# NAME
-# color-wdiff - visualize differences between text files
-
-# SYNOPSIS
-# color-wdiff FILE0 FILE1
-
-# DEPENDENCIES
-# wdiff, reformat-html in $HOME/bin.
-
-# DESCRIPTION
-# 1. If the input files are HTML, they are reformatted, to remove
-# indentation among other things.
-# 2. The markup is inactivated by replacing angle brackets with the
-# corresponding entities.
-# 3. The files are compared with wdiff, using options which label
-# insertions and deletions. The labels are HTML tags with specific
-# classes.
-# 4. The diff is turned into a valid HTML page by adding the required
-# markup, plus CSS style for the insertion and deletion classes.
-#
-# The diff file is created in the directory where FILE0 resides.
-
-# ORIGIN OF THE SCRIPT
-# This script was extracted from GNUN's GNUmakefile (function
-# "mark-outdated"), and adapted.
-# GNUN (http://www.gnu.org/software/gnun/) is under GPLv3.
-
-# =============================================================================
-
-# Command-line arguments
-arg=($1 $2)
-
-set -e
-
-close_term () {
- printf '\n%s' '*** Close the terminal window or press Return.'; read OK
- test -z "$OK" && exit $1
-}
-
-f[0]=$(mktemp -t cdif.XXXXXX) || close_or_exit 1
-f[1]=$(mktemp -t cdif.XXXXXX) || close_or_exit 1
-trap 'rm -f "${f[0]}" "${f[1]}"' EXIT
-
-## Prepare the pages to be compared.
-
-for n in 0 1; do
- # Input a valid file.
- input=${arg[$n]}
- if test ! -f "$input" -o ! -s "$input"; then
- echo "*** color-wdiff - Please enter file $n."; read input
- input=${input%\'}; input=${input#\'}
- test -f "$input" -a -s "$input" \
- || (echo 1>&2 "!!! This file doesn't exist or is empty."; close_term 1)
- fi
-
- # Name the diff after file 0.
- test "$n" == "0" && diff_file=${input%.html}-diff.html
-
- # If the file is an HTML but not a diff, process it:
- if test "${input%.html}" != "$input" -a "${input%-diff.html}" == "$input";
- then
- # - Standardize the format for easier reading of the diff.
- if test -f "$HOME/bin/reformat-html"; then
- $HOME/bin/reformat-html $input ${f[$n]}
- else
- cp $input ${f[$n]}
- fi
- # - Replace chevrons with HTML entities. The page becomes simple text.
- sed -i "s/</\</g;s/>/\>/g" ${f[$n]}
- fi
-done
-
-## Build the diff page.
-
-# Add an HTML header to the wdiff output, with style for visualizing the
-# insertions and deletions, and write the title of the page.
-cat > $diff_file << EOF
-<!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>${diff_file##*\/}</title>
-<style type="text/css">
-span.removed { background-color: #f22; color: #000; }
-span.inserted { background-color: #2f2; color: #000; }
-</style></head>
-<body><pre>
-EOF
-
-# Run wdiff with options to add the proper markup at the beginning and end of
-# deletions and insertions.
-wdiff --start-delete '<span class="removed"><del><strong>' \
- --end-delete '</strong></del></span>' \
- --start-insert '<span class="inserted"><ins><em>' \
- --end-insert '</em></ins></span>' \
- ${f[0]} ${f[1]} >> $diff_file || true
-
-# Add the closing tags.
-echo '</pre></body></html>' >> ${diff_file}
-
-echo -e "\n The diff file is $diff_file."
-close_term 0
+++ /dev/null
-<!-- include virtual="head.i.html" -->
-
-<header class="row centered" id="header"><div>
-
-<p><strong>Veuillez maintenant vérifier que le lien de confirmation est arrivé dans
-votre boîte de réception. Merci d'avoir rejoint notre liste !</strong></p>
-
-<p>Si vous n'avez pas reçu le lien de confirmation, envoyez un courriel à info@fsf.org
-pour que nous vous inscrivions manuellement.</p>
-
-<br />
-
-<p><img src="//static.fsf.org/nosvn/enc-dev0/img/fr/screenshots/section3-try-it-out.png"
-alt=" [Faites un essai (Adèle envoie un message chiffré à l'ordinateur qui héberge
-Edward)] " /></p>
-
-<br />
-
-<p>Rejoignez-nous sur les services de microblogging pour des bulletins d'information
-quotidiens :</p>
-
-<p style="font-size:150%"><a href="https://status.fsf.org/fsf"><img class="share-logo"
-src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
-alt="[GNU Social]" /> GNU Social</a> |
-<a href="http://microca.st/fsf"><img class="share-logo"
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-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">Découvrez pourquoi GNU Social et Pump.io
-sont mieux que Twitter.</a></small></p>
-
-<hr />
-
-<p class="back" style="font-size:150%">← Retour à <a href="index.html">Autodéfense
-courriel</a></p>
-
-</div></header><!-- End #header -->
-
-<!-- include virtual="footer.i.html" -->
-<!-- include virtual="javascript.i.html" -->
+++ /dev/null
-
-<!-- ~~~~~~~~~ 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-2016 <a href="https://u.fsf.org/ys">Free Software Foundation</a>,
-Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Vie privée</a>. Soutenez
-notre travail en nous <a href="https://u.fsf.org/yr">rejoignant comme membre associé</a>.</p>
-
-<p><em>Traduction française par <a href="http://framasoft.org"> Framasoft</a> (projet
-Framalang : <framalang@framalistes.org>) et l'<a href="http://april.org">April</a>
-(groupe <trad-gnu@april.org>).</em></p>
-
-<p>Les illustrations de cette page sont sous licence <a
-href="https://creativecommons.org/licenses/by/4.0/deed.fr">Creative Commons attribution,
-4.0 international (CC BY 4.0) ou version ultérieure</a>, et le reste sous licence <a
-href="https://creativecommons.org/licenses/by-sa/4.0/deed.fr">Creative
-Commons attribution, partage dans les mêmes conditions, 4.0
-internationale (CC BY-SA 4.0) ou version ultérieure</a>. Téléchargez le <a
-href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz"> code
-source du robot Edward</a>, par Andrew Engelbrecht <sudoman@ninthfloor.org> et Josh
-Drake <zamnedix@gnu.org>, disponible sous la licence
-publique générale GNU (GNU General Public License). <a
-href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Pourquoi ces
-licences ?</a></p>
-
-<p>Polices utilisées dans le guide et l'infographie : <a
-href="https://www.google.com/fonts/specimen/Dosis">Dosis</a>, par Pablo Impallari ;
-<a href="http://www.google.com/fonts/specimen/Signika">Signika</a>,
-par Anna Giedryś ; <a
-href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo
-Narrow</a>, par Omnibus-Type ; <a
-href="https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls">PXL-2000</a>,
-par Florian Cramer ; <a href="http://www.google.com/fonts/specimen/Roboto">Roboto</a>,
-par Christian Robertson.</p>
-
-<p>Télécharger le paquet source de <a href="emailselfdefense_source.fr.zip">ce guide</a>,
-qui comprend les polices, les fichiers sources des illustrations et le texte des messages
-d'Edward.</p>
-
-<p>Ce site utilise des « étiquettes web » normalisées pour identifier le
-<a href="https://www.fsf.org/campaigns/freejs">JavaScript libre</a>. Consultez le <a
-href="//weblabels.fsf.org/emailselfdefense.fsf.org/" rel="jslicense">code source et la
-licence</a> du JavaScript.</p>
-
-</div><!-- /#copyright -->
-
-<p class="credits">Conception de l'infographie et du guide : <a
-rel="external" href="http://jplusplus.org"><strong>Journalism++</strong><img
-src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png"
-alt=" [Logo de Journalism++] " /></a>
-</p><!-- /.credits -->
-
-</div></footer><!-- End #footer -->
-
+++ /dev/null
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<!-- START DELETION 93, KEEP IN confirmation index infographic mac next_steps windows -->
-<title>Autodéfense courriel - un guide pour contrer la surveillance en chiffrant avec
-GnuPG</title>
-<!-- END DELETION 93 -->
-<!-- START DELETION 94, KEEP IN workshops -->
-<title>Autodéfense courriel - Initiez vos amis !</title>
-<!-- END DELETION 94 -->
-<meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, vie privée,
-confidentialité, courriel, Enigmail" />
-<meta name="description" content="La surveillance du courriel viole nos droits fondamentaux et fait planer un risque sur la liberté d'expression. En 40 minutes, ce guide vous apprendra à vous défendre avec 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" />
-<style type="text/css" media="screen">
-.main p.notes { color: #707070; }
-<!-- START DELETION 92, KEEP IN infographic -->
-img.share-logo { position: relative; bottom: 2px; }
-<!-- END DELETION 92 -->
-.dropdown > h4, .dropdown ul { width: 200px; }
-</style>
-</head>
-
-<body>
+++ /dev/null
-<!-- include virtual="head.i.html" -->
-<!-- ~~~~~~~~~ GnuPG Header and introduction text ~~~~~~~~~ -->
-<header class="row" id="header"><div>
-
-<h1>Autodéfense courriel</h1>
-
-<!-- include virtual="translist.i.html" -->
-<ul id="menu" class="os">
-<!-- START DELETION 01, KEEP IN index -->
-<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>
-<!-- END DELETION 01 -->
-<!-- START DELETION 02, KEEP IN mac -->
-<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>
-<!-- END DELETION 02 -->
-<!-- START DELETION 03, KEEP IN windows -->
-<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>
-<!-- END DELETION 03 -->
-<li class="spacer"><a href="workshops.html">Initiez vos amis</a></li>
-<li class="spacer"><a
-href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Chiffrement du courriel pour tous avec %40fsf">
-Partagez <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> Nous défendons les droits des utilisateurs d'ordinateurs et soutenons le développement
-de logiciels libres. Résister à la surveillance de masse est très important pour nous. </p>
-
-<p><strong> Faites un don pour soutenir Autodéfense courriel. Nous devons continuer à
-l'améliorer et écrire d'autres tutoriels du même genre pour aider les gens de tous les
-pays à faire le premier pas vers la protection de leur vie privée.</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="[Faites un don]" src="//static.fsf.org/nosvn/enc-dev0/img/fr/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/fr/infographic-button.png"
-alt="Regardez et partagez notre infographie →" /></a> La surveillance de masse viole
-nos droits fondamentaux et fait planer un risque sur la liberté d'expression. Ce guide
-vous apprendra les bases d'une méthode d'autodéfense contre la surveillance :
-le chiffrement du courriel. Une fois que vous l'aurez assimilée, vous serez en mesure
-d'envoyer et recevoir des courriels brouillés, et ainsi faire en sorte qu'un outil de
-surveillance ou un voleur qui les intercepterait ne puisse pas les lire. Tout ce dont
-vous avez besoin, c'est d'un ordinateur doté d'une connexion à Internet, d'un compte de
-courriel et d'environ 40 minutes.</p>
-
-<p>Même si vous n'avez rien à cacher, l'utilisation du chiffrement vous aidera à protéger
-la vie privée des personnes avec qui vous communiquez et rendra la tâche plus difficile
-aux systèmes de surveillance de masse. Si en revanche vous avez quelque chose d'important
-à cacher, vous serez en bonne compagnie ; les lanceurs d'alertes utilisent ces outils
-pour protéger leur identité alors qu'ils exposent au grand jour les atteintes aux droits
-de l'homme, la corruption et autres crimes.</p>
-
-<p>Outre l'utilisation du chiffrement, s'opposer à la surveillance exige un combat
-politique visant à <a href="http://gnu.org/philosophy/surveillance-vs-democracy.html">
-réduire la quantité de données amassées à notre sujet</a>, mais la première étape,
-qui est essentielle, est de nous protéger de manière à rendre la surveillance de
-nos communications aussi difficile que possible. Ce guide vous aide à le faire. Il est
-destiné aux débutants, mais si vous avez déjà une connaissance de base de GnuPG ou
-une certaine expérience du logiciel libre, vous apprécierez les conseils d'utilisation
-avancée et le <a href="workshops.html"> guide pour initier vos amis</a>.</p>
-
-<p>Note de traduction : la plupart des pages mises en lien sur ce site sont en
-anglais.</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> Rassemblez les outils</h2>
-
-<!-- START DELETION 04, KEEP IN index -->
-
-<p class="notes">Ce guide repose sur des
-<a href="https://www.gnu.org/philosophy/free-sw.en.html">logiciels sous licence
-libre</a> ; ils sont complètement transparents et n'importe qui peut les copier ou
-en faire sa propre version. Cela les rend plus sûrs vis-à-vis de la surveillance que
-les logiciels
-privateurs (propriétaires) comme Windows ou Mac OS. Apprenez-en plus sur le logiciel
-libre en parcourant <a
-href="https://u.fsf.org/ys">fsf.org</a> ou bien, en français, <a
-href="https://www.framasoft.net">framasoft.net</a> et <a
-href="https://www.april.org">april.org</a>.</p>
-
-<p>La plupart des systèmes d'exploitation GNU/Linux disposent déjà de GnuPG, vous n'avez
-donc pas à le télécharger. Toutefois, avant de configurer GnuPG, vous aurez besoin
-d'installer sur votre ordinateur le programme de courriel IceDove (que nous appellerons par
-la suite « logiciel de messagerie » ou « programme de messagerie »,
-sachant qu'il s'agit ici de courriel et non de messagerie instantanée). Dans la
-plupart des distributions GNU/Linux, IceDove est installé par défaut (souvent sous
-le nom de Thunderbird), sinon vous le trouverez dans les dépôts (quelquefois appelés
-logithèque). Les logiciels de messagerie sont un moyen alternatif d'accéder aux comptes
-de courriel (comme GMail) auxquels vous accédez habituellement via votre navigateur,
-mais proposent des fonctionnalités supplémentaires.</p>
-<!-- END DELETION 04 -->
-
-<!-- START DELETION 05, KEEP IN mac windows -->
-
-<p class="notes">Ce guide repose sur des logiciels sous licence libre ; ils
-sont complètement transparents et n'importe qui peut les copier ou en faire sa propre
-version. Cela les rend plus sûrs vis-à-vis de la surveillance que les logiciels privateurs
-(propriétaires) comme Windows ou Mac OS. Pour défendre votre
-liberté et vous protéger de la surveillance, nous vous recommandons de migrer vers
-un système d'exploitation libre comme GNU/Linux. Découvrez le logiciel libre sur <a
-href="https://u.fsf.org/ys">fsf.org</a> ou bien, en français, <a
-href="https://www.framasoft.net">framasoft.net</a> et <a
-href="https://www.april.org">april.org</a>.</p>
-
-<p>Pour commencer, vous aurez besoin d'installer le programme de courriel IceDove (que
-nous appellerons par la suite « logiciel de messagerie » ou « programme
-de messagerie », sachant qu'il s'agit ici de courriel et non de messagerie
-instantanée). Dans votre système, ce logiciel est probablement connu sous son autre nom,
-Thunderbird. Les logiciels de messagerie sont un moyen alternatif d'accéder aux comptes
-de courriel (comme GMail) auxquels vous accédez habituellement via votre navigateur,
-mais proposent des fonctionnalités supplémentaires.</p>
-<!-- END DELETION 05 -->
-
-<p>Si vous avez déjà un logiciel de messagerie, vous pouvez passer à l'<a
-href="#step-1b">étape 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/fr/screenshots/step1a-install-wizard.png"
-alt=" [Étape 1.A : Assistant d'installation (copie d'écran)] " /></p>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3><em>Étape 1.A</em> Configurez votre logiciel de messagerie avec votre compte de
-courriel</h3>
-
-<p>Lancez votre programme de messagerie et suivez les indications de l'assistant, qui vous
-guidera pas à pas pour le configurer avec votre compte de courriel.</p>
-
-<p>Cherchez les sigles SSL, TLS ou STARTTLS à la droite des serveurs lorsque vous
-configurez votre compte. Si vous ne les trouvez pas, vous pourrez tout de même utiliser
-le chiffrement, mais cela signifie que les personnes gérant votre système de courriel
-sont en retard sur les standards de l'industrie en ce qui concerne la protection de votre
-sécurité et de votre vie privée. Nous vous recommandons de leur envoyer un courriel
-amical leur demandant d'activer SSL, TLS ou STARTTLS sur le serveur. Ils sauront de quoi
-vous parlez ; cela vaut donc la peine d'en faire la demande, même si vous n'êtes
-pas expert(e) en sécurité informatique.</p>
-
-<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
-<div class="troubleshooting">
-
-<h4>Résolution de problèmes</h4>
-
-<dl>
-<dt>L'assistant ne démarre pas</dt>
-
-<dd>Vous pouvez lancer l'assistant vous-même, mais l'option qui permet de le faire a un
-nom différent dans chaque programme de messagerie. Vous la trouverez dans la rubrique
-« [Fichier/]Nouveau » du menu principal (ou quelque chose d'approchant),
-sous un nom du genre « Ajouter un compte » ou « Compte
-courrier existant ».</dd>
-
-<dt>Mon programme de messagerie ne trouve pas mon compte ou ne télécharge pas mes
-courriels.</dt>
-
-<dd>Avant de chercher sur le web, nous vous conseillons de commencer par demander à
-d'autre personnes qui utilisent le même système de messagerie de vous indiquer les bons
-paramètres.</dd>
-
-<dt class="feedback">Vous ne trouvez pas de solution à votre problème ?</dt>
-
-<dd class="feedback">Merci de nous le faire savoir sur <a
-href="https://libreplanet.org/wiki/GPG_guide/Public_Review">la page de commentaires</a>.</dd>
-</dl>
-
-</div><!-- /.troubleshooting -->
-</div><!-- End .main -->
-</div><!-- End #step1-a .step -->
-<!-- START DELETION 06, KEEP IN mac -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="step-1b" class="step">
-<div class="main">
-
-<h3><em>Étape 1.B</em> Procurez-vous GnuPG en téléchargeant GPGTools</h3>
-
-<p>GPGTools est un logiciel qui inclut GnuPGP. <a href= "https://gpgtools.org/#gpgsuite">
-Téléchargez-le</a>, et installez-le en choisissant les options par défaut. Ensuite,
-vous pouvez fermer toutes les fenêtres créées par l'installateur.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step1-b .step -->
-<!-- END DELETION 06 -->
-<!-- START DELETION 07, KEEP IN windows -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="step-1b" class="step">
-<div class="main">
-
-<h3><em>Étape 1.B</em> Procurez-vous GnuPG en téléchargeant GPG4Win</h3>
-
-<p>GPG4Win est un logiciel qui inclut GnuPGP. <a
-href="https://www.gpg4win.org"> Téléchargez-le</a>, et installez-le
-en choisissant les options par défaut. Ensuite, vous pouvez fermer toutes les fenêtres
-créées par l'installateur.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step1-b .step -->
-<!-- END DELETION 07 -->
-<!-- START DELETION 08, KEEP IN index -->
-
-<!-- ~~~~~~~~~ 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/fr/screenshots/step1b-01-tools-addons.png"
-alt=" [Étape 1.B : Outils -> Modules complémentaires (copie d'écran)] " /></li>
-<li><img src="//static.fsf.org/nosvn/enc-dev0/img/fr/screenshots/step1b-02-search.png"
-alt=" [Étape 1.B : Rechercher dans tous les modules (copie d'écran)] " /></li>
-<li><img src="//static.fsf.org/nosvn/enc-dev0/img/fr/screenshots/step1b-03-install.png"
-alt=" [Étape 1.B : Installer un module (copie d'écran)] " /></li>
-</ul>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3><em>Étape 1.B</em> Installez le module Enigmail pour votre programme de messagerie</h3>
-
-<!-- END DELETION 08 -->
-<!-- START DELETION 09, KEEP IN mac windows -->
-
-<!-- ~~~~~~~~~ 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/fr/screenshots/step1b-01-tools-addons.png"
-alt=" [Étape 1.C : Outils -> Modules complémentaires (copie d'écran)] " /></li>
-<li><img src="//static.fsf.org/nosvn/enc-dev0/img/fr/screenshots/step1b-02-search.png"
-alt=" [Étape 1.C : Rechercher dans tous les modules (copie d'écran)] " /></li>
-<li><img src="//static.fsf.org/nosvn/enc-dev0/img/fr/screenshots/step1b-03-install.png"
-alt=" [Étape 1.C : Installer un module (copie d'écran)] " /></li>
-</ul>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3><em>Étape 1.C</em> Installez le module Enigmail pour votre programme de messagerie</h3>
-
-<!-- END DELETION 09 -->
-
-<p>Dans le menu de votre programme de messagerie, sélectionnez
-« Modules complémentaires » (qui devrait se trouver dans la section
-« Outils »). Assurez-vous qu'« Extensions » est sélectionné sur
-la gauche. Voyez-vous « Enigmail » ? Si oui, passez à
-l'étape suivante.</p>
-
-<p>Sinon, faites une recherche sur « Enigmail » dans la partie supérieure
-droite de la fenêtre. Vous pouvez le récupérer par ce moyen. Redémarrez votre programme
-de messagerie lorsque vous aurez terminé.</p>
-
-<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
-<div class="troubleshooting">
-
-<h4>Résolution de problèmes</h4>
-
-<dl>
-<dt>Je ne trouve pas le menu.</dt>
-
-<dd>Dans beaucoup de logiciels de messagerie récents, le menu principal est représenté
-par trois barres horizontales.</dd>
-
-<dt>Mon courriel à l'air bizarre</dt>
-
-<dd>Enigmail ne fait pas bon ménage avec le HTML utilisé pour la mise en page des courriels,
-donc il se peut qu'il le désactive automatiquement. Pour envoyer un courriel au format HTML
-sans chiffrement ni signature, maintenez la touche Maj enfoncée en sélectionant Écrire. De
-cette façon, vous pouvez rédiger un message comme si Enigmail n'était pas là.</dd>
-
-<dt class="feedback">Vous ne trouvez pas de solution à votre problème ?</dt>
-
-<dd class="feedback">Merci de nous le faire savoir sur <a
-href="https://libreplanet.org/wiki/GPG_guide/Public_Review">la page de commentaires</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> Fabriquez vos clefs</h2>
-
-<p>Pour utiliser le système GnuPG, vous allez avoir besoin d'une clef publique et d'une
-clef privée (l'ensemble des deux est appelé « paire de clefs »). Chacune
-d'elles est une longue suite de chiffres et de lettres, générés aléatoirement, qui
-vous est propre. Vos clefs publique et privée sont liées entre elles par une fonction
-mathématique spécifique.</p>
-
-<p>Votre clef publique n'est pas comme une clef physique, car elle est stockée dans un
-répertoire en ligne ouvert à tous, appelé « serveur de clefs ». Les gens
-téléchargent et utilisent votre clef publique, au travers de GnuPG, pour chiffrer les
-courriels qu'ils vous envoient. Vous pouvez vous représenter le serveur de clefs comme
-un annuaire ; les gens qui souhaitent vous envoyer un courriel chiffré peuvent le
-consulter pour trouver votre clef publique.</p>
-
-<p>Votre clef privée se rapproche plus d'une clef physique, parce que vous la gardez pour
-vous (sur votre ordinateur). Vous utilisez GnuPG et votre clef privée pour décoder les
-courriels chiffrés que les autres personnes vous envoient. <span style="font-weight:
-bold;">Vous ne devez en aucun cas communiquer votre clef privée à qui que ce
-soit.</span></p>
-
-<p>À part chiffrer et déchiffrer, ces clés peuvent vous servir à signer des messages
-et à vérifier l'authenticité des signatures d'autres personnes. Nous y reviendrons dans
-la prochaine section.</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/fr/screenshots/step2a-01-make-keypair.png"
-alt=" [Étape 2.A : créez une paire de clefs (Edward le robot brandit ses deux clefs
-avec un grand sourire)] " /></p>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3><em>Étape 2.A</em> Créez une paire de clefs</h3>
-
-<p>L'assistant d'installation d'Enigmail démarrera peut-être automatiquement. Si ce n'est
-pas le cas, selectionnez « Enigmail → Assistant de configuration » dans
-le menu de votre logiciel de messagerie. Vous n’avez pas besoin de lire le texte dans la
-fenêtre pop-up, sauf si vous le souhaitez, mais c’est une bonne idée de lire ce qui
-apparaît dans les fenêtres suivantes. Si vous avez plusieurs comptes de courriel, une
-fenêtre intitulée « Sélectionnez une identité » vous demandera de choisir
-à quel compte (quelle adresse de courriel) cette configuration doit s'appliquer. Ensuite,
-cliquez sur « Suivant » en acceptant les options par défaut, sauf dans les
-fenêtres suivantes (citées dans l'ordre où elles se présenteront).</p>
-
-<ul>
-<li>Dans la fenêtre « Chiffrement », choisissez « Chiffrer tous mes
-messages par défaut car la vie privée est critique pour moi ».</li>
-
-<li>Dans la fenêtre « Signature », choisissez « Ne pas signer mes messages
-par défaut ».</li>
-
-<li>Dans la fenêtre « Sélection de clef », choisissez « Je veux créer
-une nouvelle paire de clefs pour signer et chiffrer mes messages ».</li>
-
-<li>Dans la fenêtre « Créer une clef », choisissez un mot de passe
-solide ! Vous pouvez le faire manuellement ou utiliser la méthode Diceware. La
-méthode manuelle est plus rapide mais moins sûre. Utiliser Diceware est plus long et
-nécessite des dés, mais crée un mot de passe que d'éventuels attaquants auront plus
-de mal à deviner. La méthode est expliquée dans le paragraphe « Make a secure
-passphrase with Diceware » (Fabriquez un mot de passe sûr avec Diceware) de <a
-href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/">
-cet article</a>, écrit par Micah Lee.</li>
-</ul>
-
-<p>Si vous voulez choisir vous-même votre mot de passe, trouvez quelque chose dont
-vous puissiez vous souvenir et qui ait douze caractères au minimum, dont au moins une
-lettre minuscule, une majuscule et un chiffre ou caractère non conventionnel (signe
-de ponctuation, par exemple). Ne reprenez jamais un mot de passe qui a vous déjà servi
-ailleurs et n'utilisez pas de motif reconnaissable (date de naissance, numéro de téléphone,
-nom du chien, paroles de chanson, citation de livre, etc.)</p>
-
-<p class="notes">Le programme prendra un peu de temps pour terminer l’étape suivante
-dans la fenêtre « Création de la clef ». Pendant que vous attendez, faites
-quelque chose avec votre ordinateur, comme regarder un film ou naviguer sur le web. Plus
-vous utilisez votre ordinateur pendant ce temps, plus vite ira la création de la clef.</p>
-
-<p>Quand vous verrez apparaître « Génération de la clef terminée ! »,
-sélectionnez « Générer le certificat » et choisissez de le sauvegarder
-dans un endroit sûr de votre ordinateur (nous vous recommandons de créer un dossier
-« certificat de révocation » dans votre répertoire personnel pour le
-conserver). Cette étape est essentielle pour l'autodéfense de votre courriel, comme vous
-le verrez dans la <a href="#section5">section 5</a>.</p>
-
-<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
-<div class="troubleshooting">
-
-<h4>Résolution de problèmes</h4>
-
-<dl>
-<dt>Je ne trouve pas le menu d'Enigmail.</dt>
-
-<dd>Dans beaucoup de logiciels de messagerie récents, le menu principal est
-représenté par trois barres horizontales. Enigmail peut être dans la section appelée
-« Outils ».</dd>
-<!-- START DELETION 10, KEEP IN index -->
-<dt>L'assistant d'installation ne trouve pas GnuPG.</dt>
-
-<dd>Ouvrez votre programme d'installation de logiciel (ou logithèque) préféré et cherchez
-GnuPG, puis installez-le. Enfin relancez l'assistant en allant dans « Enigmail →
-Assistant de configuration ».</dd>
-<!-- END DELETION 10 -->
-<dt>Mon courriel a l'air bizarre</dt>
-
-<dd>Enigmail ne fait pas bon ménage avec le HTML utilisé pour la mise en page des courriels,
-donc il se peut qu'il le désactive automatiquement. Pour envoyer un courriel au format HTML
-sans chiffrement ni signature, maintenez la touche Maj enfoncée en sélectionant Écrire. De
-cette façon, vous pouvez rédiger le message comme si Enigmail n'était pas là.</dd>
-
-<dt>Ressources supplémentaires</dt>
-
-<dd>Si vous avez des difficultés avec notre tutoriel ou que vous
-voulez simplement en savoir plus, consultez dans le wiki d'Enigmail la <a
-href="https://enigmail.wiki/Key_Management#Generating_your_own_key_pair"> marche à suivre
-pour générer une paire de clefs</a>.</dd>
-
-<dt class="feedback">Vous ne trouvez pas de solution à votre problème ?</dt>
-
-<dd class="feedback">Merci de nous le faire savoir sur <a
-href="https://libreplanet.org/wiki/GPG_guide/Public_Review">la page de commentaires</a>.</dd>
-</dl>
-
-</div><!-- /.troubleshooting -->
-<!-- ~~~~~~~~~ Advanced ~~~~~~~~~ -->
-<div class="troubleshooting">
-<h4>Utilisation avancée</h4>
-
-<dl>
-<dt>Génération de clef en ligne de commande</dt>
-
-<dd>Si vous préférez utiliser la ligne de commande pour avoir
-un meilleur contrôle, vous pouvez suivre la documentation du <a
-href="https://www.gnupg.org/gph/en/manual/c14.html#AEN25">GNU Privacy Handbook</a> (Manuel
-de GnuPG). Gardez l'option « RSA et RSA » (sélectionnée par défaut), parce
-que cette méthode est plus récente et mieux sécurisée que les algorithmes recommandés
-dans la documentation. Assurez-vous également que votre clef soit d'au moins 2048 bits,
-ou même 4096 pour une dose de sécurité supplémentaire.</dd>
-
-<dt>Paires de clefs évoluées</dt>
-
-<dd>Lorsque GnuPG crée une nouvelle paire de clefs, il sépare la
-fonction de chiffrement de la fonction de signature grâce à des <a
-href="https://wiki.debian.org/Subkeys">sous-clefs</a>. En utilisant
-correctement les sous-clefs, vous pouvez mieux sécuriser votre identité
-GnuPG et vous remettre d'une clef compromise beaucoup plus rapidement. <a
-href="https://alexcabal.com/creating-the-perfect-gpg-keypair/">Alex Cabal</a> et le <a
-href="http://keyring.debian.org/creating-key.html">Wiki Debian</a> proposent de bons guides
-pour mettre en place une configuration de sous-clefs sûre.</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>Étape 2.B</em> Envoyez votre clef publique sur un serveur de clefs</h3>
-
-<p>Dans le menu de votre programme de messagerie, sélectionnez « Enigmail →
-Gestion de clefs ».</p>
-
-<p>Faites un clic droit sur votre clef et sélectionnez « Envoyer les clefs publiques
-vers un serveur de clefs ». Utilisez le serveur proposé par défaut.</p>
-
-<p class="notes">À partir de maintenant, si quelqu’un souhaite vous envoyer un message
-chiffré, il peut télécharger votre clef publique depuis Internet. Dans le menu, il y
-a le choix entre plusieurs serveurs où envoyer votre clef, mais ce sont des copies l'un
-de l'autre, donc vous pouvez utiliser n'importe lequel. Cependant, il leur faut parfois
-quelques heures pour s'aligner l'un sur l'autre quand une nouvelle clef est envoyée.</p>
-
-<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
-<div class="troubleshooting">
-
-<h4>Résolution de problèmes</h4>
-
-<dl>
-<dt>La barre de progression n'en finit pas.</dt>
-
-<dd>Fermez la fenêtre d'envoi vers le serveur, assurez-vous d’être sur Internet
-et réessayez. Si cela ne marche pas, réessayez en sélectionnant un serveur de clefs
-différent.</dd>
-
-<dt>Ma clef n’apparaît pas dans la liste.</dt>
-
-<dd>Essayez de cocher « Afficher toutes les clefs par défaut ».</dd>
-
-<dt>Documentation supplémentaire</dt>
-
-<dd>Si vous avez des difficultés avec nos instructions ou
-que voulez simplement en savoir plus, jetez un coup d'œil à la <a
-href="https://www.enigmail.net/documentation/quickstart-ch2.php#id2533620"> documentation
-d'Enigmail</a>.</dd>
-
-<dt class="feedback">Vous ne trouvez pas de solution à votre problème ?</dt>
-
-<dd class="feedback">Merci de nous le faire savoir sur <a
-href="https://libreplanet.org/wiki/GPG_guide/Public_Review">la page de commentaires</a>.</dd>
-</dl>
-
-</div><!-- .troubleshooting -->
-<!-- ~~~~~~~~~ Advanced ~~~~~~~~~ -->
-<div class="troubleshooting">
-
-<h4>Utilisation avancée</h4>
-
-<dl>
-<dt>Téléverser une clef en ligne de commande</dt>
-
-<dd>Vous pouvez envoyer vos clefs sur un serveur à l'aide de la [<a
-href="https://www.gnupg.org/gph/en/manual/x457.html">ligne de commande</a>. <a
-href="https://sks-keyservers.net/overview-of-pools.php"> Le site sks-keyserver.net</a>
-tient à jour une liste de serveurs de clés hautement interconnectés. Vous pouvez aussi
-<a href="https://www.gnupg.org/gph/en/manual/x56.html#AEN64"> exporter directement vos
-clés</a> sous forme de fichier sur votre ordinateur.</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, c'est quoi tout ça ?</h3>
-
-<p>En général, les termes GnuPG, GPG, GNU Privacy Guard, OpenPGP et PGP sont utilisés
-de manière interchangeable. Techniquement, OpenPGP <cite>(Pretty Good Privacy)</cite>
-est la norme de chiffrement et GNU Privacy Guard (qu'on abrège souvent en GPG ou GnuPG)
-est le programme qui la met en œuvre. Enigmail est un module, un petit programme associé
-à votre logiciel de messagerie, qui fait l'interface avec GnuPG.</p>
-
-</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> Essayez !</h2>
-
-<p>Maintenant vous allez faire un essai : correspondre avec un programme nommé Edward
-qui sait comment utiliser le chiffrement. Sauf indication contraire, ces étapes sont les
-mêmes que lorsque vous correspondrez avec un personne vivante.</p>
-
-<!--
-
-<p>NOTE: Edward is currently having some technical difficulties, so he may take a long
-time to respond, or not respond at all. We're sorry about this and we're working hard to
-fix it. Your key will still work even without testing with Edward.</p>
-
--->
-</div><!-- End .section-intro -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="step-3a" class="step">
-<div class="sidebar">
-
-<p><img src="//static.fsf.org/nosvn/enc-dev0/img/fr/screenshots/section3-try-it-out.png"
-alt=" [Faites un essai (Adèle envoie un message chiffré à l'ordinateur qui héberge
-Edward)] " /></p>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3><em>Étape 3.A</em> Envoyez votre clef publique à Edward</h3>
-
-<p>C’est une étape un peu particulière que vous n’aurez pas à faire quand vous
-correspondrez avec de vraies personnes. Dans le menu de votre logiciel de messagerie,
-allez à « Enigmail → Gestion de clefs ». Vous devriez voir votre clef
-dans la liste qui apparaît. Faites un clic droit dessus et sélectionnez
-« Envoyer des clefs publiques par courrier électronique ». Cela créera un
-nouveau brouillon de message, comme si vous aviez juste cliqué sur le bouton Écrire.</p>
-
-<p>Remplissez le champ d’adresse du destinataire avec l’adresse <a
-href="mailto:edward-en@fsf.org">edward-en@fsf.org</a>. Mettez au moins un mot (ce que vous
-souhaitez) dans le sujet et le corps du message. Ne l'envoyez pas tout de suite.</p>
-
-<p>L'icône en forme de clef en haut à gauche devrait être jaune, ce qui signifie
-que le chiffrement est activé. Comme nous ne voulons pas que ce premier message très
-spécial pour Edward soit chiffré, cliquez une fois sur cette clef pour désactiver
-le chiffrement. La clef devrait devenir grise, avec un point bleu pour signaler que le
-réglage a été modifié. Après avoir désactivé le chiffrement, cliquez sur Envoyer.</p>
-
-<p class="notes">Cela peut prendre deux ou trois minutes à Edward pour
-répondre. Entre-temps, vous pourriez aller voir la section de ce guide intitulée « <a
-href="#section5">Les bonnes pratiques</a> ». Une fois qu’Edward aura répondu,
-allez à l’étape suivante. Désormais, vous aurez simplement à faire la même chose
-lorsque vous correspondrez avec une vraie personne.</p>
-
-<p>Lorsque vous ouvrirez la réponse d'Edward, GnuPG vous demandera peut-être votre mot
-de passe avant d'utiliser votre clef privée pour le déchiffrer.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step-3a .step -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="step-3b" class="step">
-<div class="main">
-
-<h3><em>Étape 3.B</em> Envoyez un courriel de test chiffré</h3>
-
-<p>Dans votre logiciel de messagerie, préparez un nouveau courriel adressé à
-<a href="mailto:edward-en@fsf.org">edward-en@fsf.org</a>. Écrivez « Test de
-chiffrement » ou quelque chose d’approchant dans le champ de sujet, et mettez
-quelque chose dans le corps du message.</p>
-
-<p>La clef en haut à gauche devrait être jaune, ce qui veut dire que le chiffrement est
-activé. À partir de maintenant, ce sera votre réglage par défaut.</p>
-
-<p class="notes">À côté de la clef, vous remarquerez l'icône d'un crayon. Nous allons
-y revenir.</p>
-
-<p>Cliquez sur Envoyer. Enigmail fera apparaître une fenêtre indiquant « Le
-destinataire est invalide, n'est pas de confiance ou n'a pas été trouvé. »</p>
-
-<p>Pour envoyer un courriel chiffré à Edward, vous aurez besoin de sa clef publique,
-donc vous devez maintenant la faire télécharger par Enigmail depuis un serveur de
-clefs. Cliquez sur « Télécharger les clefs manquantes » et utilisez le
-serveur par défaut dans la fenêtre qui vous demande de choisir un serveur. Une fois
-les clefs trouvées, vérifiez la première (son identifiant commence par C), puis cliquez
-sur OK. Cliquez sur OK dans la fenêtre suivante.</p>
-
-<p>Maintenant que vous êtes de retour à la fenêtre « Le destinataire est invalide,
-n'est pas de confiance ou n'a pas été trouvé », sélectionnez la clef d’Edward
-dans la liste et cliquez sur Envoyer.</p>
-
-<p class="notes">Puisque vous avez chiffré ce courriel avec la clef publique d'Edward, la
-clef privée d'Edward est nécessaire pour le déchiffrer. Edward est le seul à posséder
-cette clef privée, donc personne à part lui ne peut le déchiffrer.</p>
-
-<!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
-<div class="troubleshooting">
-
-<h4>Résolution de problèmes</h4>
-
-<dl>
-<dt>Enigmail ne trouve pas la clef d'Edward.</dt>
-
-<dd>Fermez les fenêtres qui sont apparues quand vous avez cliqué sur Envoyer. Assurez-vous
-que vous êtes connecté à Internet et réessayez. Si cela ne marche pas, répétez
-le processus en choisissant un serveur de clefs différent quand il vous demande d'en
-choisir un.</dd>
-
-<dt>Messages déchiffrés dans le dossier Envoyés</dt>
-
-<dd>Bien que vous ne puissiez pas déchiffrer les messages chiffrés avec la clef publique
-de quelqu'un d'autre, votre client de courriel en enregistrera automatiquement une copie
-chiffrée avec votre propre clef publique. Vous pourrez la voir dans le dossier Envoyés,
-comme n'importe quel autre courriel. Ceci est normal et ne signifie pas que votre message
-a été envoyé non chiffré.</dd>
-
-<dt>Ressources supplémentaires</dt>
-
-<dd>Si vous rencontrez toujours des soucis avec nos instructions ou
-que vous souhaitez simplement en apprendre plus, jetez un œil au <a
-href="https://enigmail.wiki/Signature_and_Encryption#Encrypting_a_message">wiki
-d'Enigmail</a>.</dd>
-
-<dt class="feedback">Vous ne trouvez pas de solution à votre problème ?</dt>
-
-<dd class="feedback">Merci de nous le faire savoir sur <a
-href="https://libreplanet.org/wiki/GPG_guide/Public_Review">la page de commentaires</a>.</dd>
-</dl>
-
-</div><!-- /.troubleshooting -->
-<!-- ~~~~~~~~~ Advanced ~~~~~~~~~ -->
-<div class="troubleshooting">
-
-<h4>Utilisation avancée</h4>
-
-<dl>
-<dt>Chiffrer des messages en ligne de commande</dt>
-
-<dd>Vous pouvez également chiffrer et déchiffrer messages ou fichiers en <a
-href="https://www.gnupg.org/gph/en/manual/x110.html">ligne de commande</a> si vous le
-préférez. L'option « --armor » renvoie le résultat chiffré en utilisant
-le jeu de caractères courant.</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> Conseils pour votre sécurité</h3>
-
-<p>Même si vous chiffrez vos courriels, le sujet n'est pas chiffré, donc évitez d'y
-mettre des informations sensibles. Comme les adresses des émetteurs et destinataires
-ne sont pas chiffrées non plus, un système espion peut déterminer qui communique avec
-qui. De plus, les services de surveillance sauront que vous utilisez GnuPG, même s'ils ne
-peuvent pas comprendre ce que vous dites. Quand vous enverrez une pièce jointe, Enigmail
-vous donnera le choix de la chiffrer ou non, indépendemment du message lui-même.</p>
-
-</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>Étape 3.C</em> Recevez une réponse</h3>
-
-<p>Quand Edward recevra votre courriel, il utilisera sa clef privée pour le
-déchiffrer, puis votre clef publique (celle que vous lui avez envoyée à l'<a
-href="#step-3a">étape 3.A</a>) pour chiffrer la réponse qu'il va vous adresser.</p>
-
-<p class="notes">Cela peut prendre deux ou trois minutes à Edward pour vous
-répondre. Pendant ce temps, vous pouvez aller plus avant dans ce guide et consulter la
-section « <a href="#section5">Les bonnes pratiques</a> ».</p>
-
-<p>Quand vous allez recevoir le courriel d'Edward et l'ouvrir, Enigmail va automatiquement
-détecter qu'il est chiffré avec votre clef publique, et il va utiliser votre clef privée
-pour le déchiffrer.</p>
-
-<p>Remarquez la barre qu’Enigmail affiche au-dessus du message, montrant les informations
-concernant le statut de la clef d’Edward.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step-3c .step -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="step-3d" class="step">
-<div class="main">
-
-<h3><em>Étape 3.D</em> Envoyez un courriel de test signé</h3>
-
-<p>GnuPG inclut un moyen de signer vos messages et vos fichiers. Ces signatures attestent
-qu'ils proviennent bien de vous et qu'ils n'ont pas été altérés en chemin. Elles
-sont plus solides que leurs cousines d'encre et de papier car elles sont impossibles à
-imiter. Il est en effet impossible de les créer sans votre clef privée (encore une bonne
-raison de conserver cette dernière bien à l'abri !)</p>
-
-<p>Vous pouvez signer tous les messages, quel que soit le destinataire ; c'est donc
-un excellent moyen de faire savoir aux gens que vous utilisez GnuPG et qu'ils peuvent
-communiquer avec vous en toute sécurité. S'ils n'ont pas GnuPG, ils pourront tout de
-même lire votre message et voir votre signature. S'ils utilisent GnuPG, ils pourront
-également vérifier que votre signature est authentique.</p>
-
-<p>Pour signer un courriel destiné à Edward, écrivez un message à son intention et
-cliquez sur l'icône du crayon à côté du cadenas. Elle deviendra jaune. Si vous signez
-un message, GnuPG vous demandera peut-être votre mot de passe avant l'envoi car il a
-besoin de déverrouiller votre clef privée pour le signer.</p>
-
-<p>Avec les icônes du cadenas et du stylo, vous pouvez choisir si le message doit être
-chiffré, signé, chiffré et signé, ou bien rester tel quel.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step-3d .step -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="step-3e" class="step">
-<div class="main">
-
-<h3><em>Étape 3.E</em> Recevez une réponse</h3>
-
-<p>Quand Edward recevra votre courriel, il utilisera votre clef publique (que vous lui
-avez envoyée à la <a href="#step-3a"> Section 3.A</a>) pour vérifier que votre
-signature est authentique et que le message n'a pas été altéré.</p>
-
-<p class="notes">Cela peut prendre deux ou trois minutes à Edward pour vous
-répondre. Pendant ce temps, vous pouvez aller plus avant dans ce guide et consulter la
-section « <a href="#section5">Les bonnes pratiques</a> ».</p>
-
-<p>La réponse d'Edward arrivera chiffrée, parce qu'il préfère utiliser le chiffrement dans
-la mesure du possible. Si tout se passe comme prévu, le message doit contenir « Votre
-signature a été vérifiée. » Si votre courriel de test était également chiffré,
-il le mentionnera en premier.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step-3e .step -->
-</div></section>
-
-<!-- ~~~~~~~~~ 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> Découvrez la « toile de confiance »</h2>
-
-<p>Le chiffrement de courriel est une technologie puissante, mais il a une faiblesse ;
-il requiert un moyen de vérifier que la clef publique d'une personne est effectivement
-la sienne. Autrement, il n'y aurait aucun moyen d'empêcher un attaquant de créer une
-adresse de courriel avec le nom d'un de vos amis, et des clefs assorties permettant de se
-faire passer pour lui. C'est pourquoi les programmeurs de logiciel libre qui ont développé
-le chiffrement de courriel ont créé la signature de clef et la toile de confiance.</p>
-
-<p>En signant la clef de quelqu'un, vous dites publiquement qu'après vérification vous
-êtes sûr qu'elle lui appartient à lui et à personne d'autre.</p>
-
-<p>La signature des clefs et la signature des messages font appel au même genre d'opération
-mathématique, mais ont des implications très différentes. C'est une bonne pratique de
-signer vos courriels d'une manière générale, mais si vous signez les clefs d'autres
-personnes sans faire attention, vous pouvez accidentellement vous porter garant de
-l'identité d'un imposteur.</p>
-
-<p>Les gens qui utilisent votre clef publique peuvent voir qui l'a signée. Lorsque
-vous aurez utilisé GnuPG assez longtemps, votre clef aura peut-être des centaines de
-signatures. Vous pouvez considérer une clef comme d'autant plus fiable qu'elle porte les
-signatures de nombreuses personnes à qui vous faites confiance. La toile de confiance est
-une constellation d'utilisateurs de GnuPG reliés entre eux par des chaînes de confiance
-exprimées au travers des signatures.</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/fr/screenshots/section4-web-of-trust.png"
-alt="[Section 4 : la toile de confiance]" /></p>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3><em>Étape 4.A</em> Signez une clef</h3>
-
-<p>Dans le menu de votre logiciel de messagerie, allez à « Enigmail → Gestion
-de clefs ».</p>
-
-<p>Faites un clic droit sur la clef publique d'Edward et sélectionnez « Signer la
-clef » dans le menu contextuel.</p>
-
-<p>Dans la fenêtre pop-up, choisissez « Je ne souhaite pas répondre » et
-cliquez sur OK.</p>
-
-<p>Maintenant, vous devriez être de retour au menu « Gestion de
-clefs ». Sélectionner « Serveur de clefs → Envoyer les clefs
-publiques » et cliquez sur OK.</p>
-
-<p class="notes">Vous venez juste de dire « Je crois que la clef publique d'Edward
-appartient effectivement à Edward. » Cela ne signifie pas grand chose étant donné
-qu'Edward n'est pas une personne réelle, mais c'est un bon entraînement.</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-identify_keys" class="step">
-<div class="main">
-
-<h3>Identification des clefs : empreinte and ID</h3>
-
-<p>Les clefs publiques sont généralement identifiées par leur empreinte, une suite de
-caractères du genre F357AA1A5B1FA42CFD9FE52A9FF2194CC09A61E8 (pour la clef d'Edward). Pour
-voir l'empreinte de votre clef publique et des autres clefs publiques stockées dans votre
-ordinateur allez à « Enigmail → Gestion de clefs » dans le menu
-de votre programme de messagerie, puis faites un clic droit sur la clef en question
-et choisissez « Propriétés de la clef ». Il est bon de communiquer votre
-empreinte de clef en même temps que votre adresse de courriel, pour que les gens puissent
-vérifier qu'ils ont la bonne clef publique lorsqu'ils la téléchargent d'un serveur.</p>
-
-<p class="notes">Vous verrez qu'on peut aussi désigner une clef publique par son identifiant
-(ID). Il s'agit simplement des huit derniers caractères de son empreinte (C09A61E8
-pour celle d'Edward). On peut voir l'ID des clefs dans la fenêtre de « Gestion de
-clefs ». C'est un peu comme le prénom d'une personne (un raccourci pratique,
-mais qui n'est pas spécifique d'une clef donnée), tandis que l'empreinte identifie la
-clef de manière unique sans possibilité de confusion. Si vous n'avez que l'ID, vous pouvez
-tout de même rechercher la clef (ainsi que que son empreinte) comme à l'étape 3.B,
-mais s'il y a plusieurs options, vous aurez besoin de l'empreinte de clef de la personne
-avec laquelle vous communiquez pour vérifier laquelle utiliser.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step-identify_keys .step-->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="check-ids-before-signing" class="step">
-<div class="main">
-
-<h3><em>Important :</em>Ce qu'il faut regarder quand on signe des clefs</h3>
-
-<p>Avant de signer la clef d'une personne, vous devez vous assurer que cette clef lui
-appartient vraiment et qu'elle est bien qui elle prétend être. L'idéal serait que
-cette confiance s'établisse au fil du temps par des interactions et des conversations,
-ainsi que par l'observation de ses interactions avec les autres. Lorsque vous signez
-une clef, demandez à voir l'empreinte complète de la clef publique (et non pas l'ID,
-plus courte). Si vous estimez important de signer la clef d'une personne rencontrée
-pour la première fois, demandez-lui également de vous montrer une pièce d'identité et
-assurez-vous que le nom correspond bien à celui du propriétaire de la clef publique. Dans
-la fenêtre pop-up d'Enigmail, répondez honnêtement à la question « Avec quel soin
-avez-vous vérifié que la clef que vous vous apprêtez à signer appartient effectivement
-à la personne citée ci-dessus ? » </p>
-
-<!-- ~~~~~~~~~ Advanced ~~~~~~~~~ -->
-<div class="troubleshooting">
-
-<h4>Utilisation avancée</h4>
-
-<dl>
-<dt>Maîtrisez le réseau de confiance</dt>
-
-<dd>Malheureusement, la confiance ne se propage pas entre utilisateurs
-<a href="http://fennetic.net/irc/finney.org/~hal/web_of_trust.html"> de la manière
-qu'imaginent beaucoup de gens</a>. Une des meilleures façons de renforcer la communauté
-GnuPG est de <a href="https://www.gnupg.org/gph/en/manual/x334.html">comprendre</a> en
-profondeur le réseau de confiance et de signer autant de clefs d'autres personnes que le
-permettent les circonstances.</dd>
-
-<dt>Spécifiez des niveaux de confiance</dt>
-
-<dd>Si vous estimez qu'une personne est suffisamment fiable dans sa manière de valider les
-clefs des autres, vous pouvez lui attribuer un niveau de confiance grâce à l'interface
-de gestion de clefs d'Enigmail. Faites un clic droit sur la clef de cette personne, allez
-dans le menu « Sélectionnez le niveau de confiance », sélectionnez un des
-niveaux et cliquez sur OK. Ne faites cela que lorsque vous sentez que vous avez une bonne
-compréhension du réseau de confiance.</dd>
-</dl>
-
-</div><!-- /.troubleshooting -->
-</div><!-- End .main -->
-</div><!-- End #check-ids-before-signing .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> Les bonnes pratiques</h2>
-
-<p>Chaque personne utilise GnuPGP à sa manière, mais il est important de suivre certaines
-pratiques de base pour garantir la sécurité de vos courriels. Ne pas les suivre peut
-constituer un risque pour la vie privée des personnes avec qui vous communiquez, de même
-que pour la vôtre, et peut être dommageable pour la toile de confiance.</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/fr/screenshots/section5-01-use-it-well.png"
-alt=" [Section 5 : Les bonnes pratiques (carte de visite comportant une empreinte de
-clef)] " /></p>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3>Quand dois-je chiffrer ? Quand dois-je signer ?</h3>
-
-<p>Plus vous chiffrez de messages, mieux c'est. En effet, si vous ne chiffrez
-qu'occasionnellement votre courriel, chaque message chiffré pourrait alerter les systèmes de
-surveillance. Si tout votre courriel est chiffré, ou presque, les gens qui vous espionnent
-ne sauront pas par où commencer. Cela ne signifie pas que chiffrer uniquement certains
-de vos messages soit inutile. C'est un excellent début et cela complique la surveillance
-de masse.</p>
-
-<p>À moins que vous ne souhaitez pas révéler votre identité (ce qui requiert d'autres
-mesures de protection), il n'y a aucune raison de ne pas signer tous vos messages, chiffrés
-ou non. Non seulement cela permet aux utilisateurs de GnuPG de vérifier que ce message
-provient bien de vous, mais c'est aussi une méthode non intrusive de rappeler à chacun
-que vous utilisez GnuPG et de promouvoir les communications sécurisées. Si vous envoyez
-régulièrement des courriels signés à des persones non familières de GnuPG, il est
-bon d'ajouter un lien vers ce guide à votre signature (celle qui fait partie du message,
-pas la signature cryptographique).</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/fr/screenshots/section5-02-use-it-well.png"
-alt=" [Section 5 : les bonnes pratiques (mot de passe et enveloppe)] " /></p>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3>Soyez attentif aux clefs non valides</h3>
-
-<p>GnuPG rend le courriel plus sûr, mais il est tout de même important de faire attention
-aux clefs non valides, qui ont pu tomber entre de mauvaises mains. Un message chiffré
-avec une clef non valide est lisible par des programmes de surveillance.</p>
-
-<p>Dans votre logiciel de messagerie, revenez au premier courriel chiffré qu'Edward vous
-a envoyé. Comme il l'a chiffré avec votre clef publique, il y a un message d'Enigmail
-au début, qui dit généralement « Début contenu chiffré ou signé ».</p>
-
-<p><b>Lorsque vous utilisez GnuPG, prenez l'habitude de jeter un coup d'œil à cette
-barre. C'est là que vous verrez une alerte si vous recevez un courriel chiffré avec une
-clef non fiable.</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>Sauvegardez votre certificat de révocation en lieu sûr</h3>
-
-<p>Vous vous souvenez de l'étape où vous avez créé vos clefs et enregistré le certificat
-de révocation produit par GnuPG ? Il est maintenant temps de copier ce certificat
-sur l'équipement de stockage numérique le plus sûr que vous ayez. L'idéal serait un
-périphérique flash, disque ou clef USB, ou bien un disque dur stocké dans un endroit
-sûr de votre maison, pas un appareil que vous gardez sur vous habituellement.</p>
-
-<p>Si jamais votre clef privée devait être perdue ou volée, vous auriez besoin de ce
-certificat pour prévenir les gens que vous n'utilisez plus cette paire de clefs.</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> agissez rapidement si quelqu'un s'empare de votre clef
-privée</h3>
-
-<p>Si vous perdez votre clef privée ou si quelqu'un s'en empare (par vol ou
-intrusion dans votre ordinateur), il est important de la révoquer immédiatement
-avant qu'un inconnu ne l'utilise pour lire vos courriels chiffrés ou imiter votre
-signature. Ce guide ne couvre pas la révocation de clef, mais vous pouvez suivre ces <a
-href="https://www.hackdiary.com/2004/01/18/revoking-a-gpg-key/"> instructions</a>. Une
-fois la révocation faite, créez une nouvelle clef et envoyez-la à chaque personne avec
-qui vous aviez l'habitude d'utiliser l'ancienne, en leur disant que cette dernière n'est
-plus valable.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step-lost_key .step-->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<!---<div id="transfer-key" class="step">
-<div class="main">
-
-<h3>Transferring you key</h3>
-
-<p>You can use Enigmail's <a href="https://www.enigmail.net/documentation/keyman.php">key
-management window</a> to import and export keys. If you want to be able to read your
-encrypted email on a different computer, you will need to export your secret key from
-here. Be warned, if you transfer the key without <a
-href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">encrypting</a>
-the drive it's on the transfer will be dramatically less secure.</p>
-
-</div> --> <!-- End .main </div> --> <!-- End #transfer-key .step-->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="webmail-and-GnuPG" class="step">
-<div class="main">
-
-<h3>GnuPG et le webmail</h3>
-
-<p>Lorsque vous accédez à vos courriels depuis un navigateur, vous utilisez un
-webmail, un programme de courriel localisé sur un site distant. Au contraire du webmail,
-votre programme de messagerie tourne sur votre ordinateur. Bien que le webmail ne puisse
-déchiffrer le courriel chiffré, il l'affichera quand même sous forme chiffrée. Si vous
-utilisez majoritairement un webmail, vous saurez ainsi que c'est le moment de lancer votre
-logiciel de messagerie pour lire le message en clair.</p>
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~
-<div id="transfer-key" 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 #webmail-and-GnuPG .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">Excellent travail ! Et maintenant, voyons la suite...</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 -->
-<!-- include virtual="footer.i.html" -->
-<!-- include virtual="javascript.i.html" -->
+++ /dev/null
-<!-- include virtual="head.i.html" -->
-<header class="row centered" id="header"><div>
-
-<p class="back">← Lisez le <a href="index.html">guide complet</a></p>
-
-<h3><a
-href="https://fsf.org/share?u=https://u.fsf.org/zc&t=Le chiffrement, comment ça marche. Infographie via %40fsf"><img
-class="share-logo" src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
-alt="[GNU Social]" /> <img class="share-logo"
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-alt="[Pump.io]" /> <img class="share-logo"
-src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
-alt="[Reddit]" /> <img class="share-logo"
-src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
-alt="[Hacker News]" /> Partagez notre infographie</a> avec le hashtag
-#AutodefenseCourriel</h3>
-
-<p><img src="//static.fsf.org/nosvn/enc-dev0/img/fr/full-infographic.png"
-alt="[Regardez et partagez notre infographie]" /></p>
-
-<p class="back">← Lisez le <a href="index.html">guide complet</a></p>
-
-</div></header><!-- End #header -->
-<!-- include virtual="footer.i.html" -->
-<!-- include virtual="javascript.i.html" -->
+++ /dev/null
-
-<script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
-<script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
-
-<!-- Piwik -->
-<script type="text/javascript" >
-// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-try {
- var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 13);
- piwikTracker.trackPageView();
- piwikTracker.enableLinkTracking();
-} catch( err ) {}
-// @license-end
-</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=13" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Tracking Code -->
-
-</body>
-</html>
-
+++ /dev/null
-<!-- include virtual="head.i.html" -->
-
-<!-- ~~~~~~~~~ GnuPG Header and introduction text ~~~~~~~~~ -->
-<header class="row" id="header"><div>
-
-<h1>Pour aller plus loin</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> Prochaines étapes</h2>
-
-<p>Vous avez maintenant appris les bases du chiffrement de courriel avec GnuPG et, ce
-faisant, agi concrètement contre la surveillance de masse. Les étapes suivantes vous
-aideront à tirer le meilleur parti du travail que vous avez accompli.</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/fr/infographic-button.png"
-alt="Regardez et partagez notre infographie →" /></a></p>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3>Rejoignez le mouvement</h3>
-
-<p>Vous venez juste de faire un pas immense pour la protection de votre vie privée en
-ligne. Mais que chacun de nous agisse seul n'est pas suffisant. Pour abattre la surveillance
-de masse, nous devons lancer un mouvement pour l'autonomie et la liberté de tous les
-utilisateurs d'ordinateurs. Rejoignez la communauté de la Free Software
-Foundation pour rencontrer des gens qui partagent les mêmes idées et œuvrer ensemble
-pour le changement.</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>Découvrez <a href="https://www.fsf.org/twitter"> pourquoi GNU Social et
-Pump.io sont mieux que Twitter</a> et <a href="http://www.fsf.org/facebook"> pourquoi nous
-n'utilisons pas Facebook</a>.</small></p>
-
-<br /> <div class="newsletter">
-
-<p style="font-size:150%">Liste de diffusion à faible trafic</p>
-
-<form method="post" action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=391">
-<input type="text" placeholder="Mon adresse de courriel..." name="email-Primary"
-id="frmEmail" />
-<input type="submit" value="Inscrivez-moi" 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://my.fsf.org/civicrm/profile?reset=1&gid=391"
-name="cancelURL" />
-<input type="hidden" value="Edit:cancel" name="_qf_default" />
-</form>
-
-<p><small>Consultez nos <a href="https://my.fsf.org/donate/privacypolicy.html"> règles
-concernant la vie privée</a>.</small></p>
-
-</div><!-- End .newsletter -->
-</div><!-- End .main -->
-</div><!-- End #step-political .step -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="teach-friends" class="step">
-<div class="main">
-
-<h3>Faites connaître Autodéfense courriel à d'autres</h3>
-
-<p>Comprendre et configurer le chiffrement du courriel est une tâche colossale pour
-beaucoup de gens. Montrez-vous accueillant(e) en leur permettant de trouver facilement
-votre clef publique et en leur proposant votre aide. Voici quelques suggestions.</p>
-
-<ul>
-<li>Animez un atelier d'autodéfense du courriel pour vos amis et votre communauté,
-en utilisant notre <a href="workshops.html"> guide de l'animateur d'atelier</a>.</li>
-<li>Utilisez <a href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Merci de chiffrer
-le courriel qui m'est destiné avec GnuPG %40fsf"> notre formulaire de partage</a> pour
-écrire un message à quelques amis leur demandant de se joindre à vous dans l'utilisation
-du courriel chiffré. Souvenez-vous d'y inclure l'empreinte de votre clef GnuPG publique
-afin qu'ils puissent facilement la télécharger.</li>
-<li>Ajoutez votre empreinte de clef à votre adresse de courriel, partout où cette dernière
-apparaît. Voici de bons endroits : votre signature (celle qui fait partie du message,
-pas la signature cryptographique), vos profils sur les média sociaux, et aussi vos blogs,
-sites web et cartes de visite. À la <cite>Free Software Foundation</cite>, nous mettons
-les nôtres sur les pages présentant nos équipes.</li>
-</ul>
-
-</div><!-- End .main -->
-</div><!-- End #step-friends .step -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="step-more_technologies" class="step">
-<div class="main">
-
-<h3>Protégez encore mieux votre vie numérique</h3>
-
-<p>Apprenez à utiliser des technologies résistant à la surveillance pour la messagerie
-instantanée, le stockage sur disque dur, le partage en ligne et plus encore, dans
-le <a href="https://directory.fsf.org/wiki/Collection:Privacy_pack"> « Pack vie
-privée » du Répertoire du logiciel libre</a> <cite>(Free Software Directory's Privacy
-Pack)</cite> et sur <a href="https://prism-break.org"><em>prism-break.org</em></a>.</p>
-
-<p>Si vous utilisez Windows, Mac OS ou un autre système d'exploitation privateur, le plus
-grand pas que vous puissiez faire est de migrer vers un système d'exploitation libre tel
-que GNU/Linux. Il sera alors bien plus difficile aux attaquants de s'introduire dans votre
-ordinateur par des portes dérobées. Allez voir les <a
-href="https://www.gnu.org/distros/free-distros.html"> versions de GNU/Linux cautionnées</a>
-par la Free Software Foundation.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step-more_technologies .step -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<div id="privacy-tor" class="step">
-<div class="main">
-
-<h3>Facultatif : Avec Tor, donnez une protection supplémentaire à votre courriel</h3>
-
-<p><a href="https://www.torproject.org/about/overview.html.en"><abbr title="The Onion
-Router">Tor</abbr>, le « réseau de routage en onion »</a>, entoure les
-communications sur Internet de multiples couches de chiffrement et les font rebondir
-plusieurs fois autour du globe. Utilisé correctement, Tor est source de confusion pour les
-systèmes de surveillance, qu'il s'agisse du personnel de terrain ou des équipements. Vous
-obtiendrez les meilleurs résultats en combinant Tor avec le chiffrement par GnuPG.</p>
-
-<p>Pour que votre programme de messagerie envoie et reçoive du courriel en passant par Tor,
-installez le <a href="https://addons.mozilla.org/en-us/thunderbird/addon/torbirdy/">module
-Torbirdy</a> de la même façon que vous avez installé Enigmail, en passant par le
-sous-menu « <tt>Modules complémentaires</tt> ».</p>
-
-<p>Avant de commencer à utiliser Tor pour relever
-votre boîte aux lettres, assurez-vous de bien comprendre <a
-href="https://www.torproject.org/docs/faq.html.en#WhatProtectionsDoesTorProvide">
-les compromis sur la sécurité que cela implique</a>. Cette <a
-href="https://www.eff.org/pages/tor-and-https"> infographie</a>, proposée par nos amis
-de l'<cite>Electronic Frontier Foundation</cite>, montre comment Tor vous protège. </p>
-
-</div><!-- End .main -->
-</div><!-- End #privacy-tor .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/fr/screenshots/section6-next-steps.png"
-alt=" [Symboles des 5 éléments indispensables : GnuPG, courriel chiffré/déchiffré,
-2 clefs] " /></p>
-
-<br />
-
-<p class="back" style="text-align:center">← <a href="index.html"> Retour au guide</a></p>
-
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3>Rendez les outils d'Autodéfense courriel encore plus performants</h3>
-
-<p><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Laissez
-vos commentaires et vos idées pour améliorer ce guide</a>. Nous accueillons
-volontiers les traductions, mais nous vous demandons de nous contactez à <a
-href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> avant de commencer afin que nous
-puissions vous mettre en contact avec d'autres traducteurs travaillant dans votre langue.</p>
-
-<p>Si vous aimez programmer, vous pouvez contribuer au
-code de <a href="https://www.gnupg.org/">GnuPG</a> ou <a
-href="https://www.enigmail.net/home/index.php">Enigmail</a>.</p>
-
-<p>Faites un petit effort supplémentaire, soutenez la Free Software Foundation pour que
-nous puissions continuer à améliorer Autodéfense courriel et créer plus d'outils de
-ce type.</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="[Faites un don]" src="//static.fsf.org/nosvn/enc-dev0/img/fr/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 -->
-<!-- include virtual="footer.i.html" -->
-<!-- include virtual="javascript.i.html" -->
+++ /dev/null
-#!/bin/bash
-
-# NAME
-# reformat-html - reformat HTML files from emailselfdefense.fsf.org
-
-# SYNOPSIS
-# reformat-html /PATH/TO/NAME.html
-
-# GRAPHIC INTERFACE HOWTO
-# * Launch the script by double-clicking on it; a terminal will open.
-# * At the prompt, drag and drop the input file into the terminal.
-#
-# Alternatively (in Gnome, KDE, XFCE, etc.)
-# * create a launcher for the application menu;
-# * launch the script from the contextual menu of the HTML file.
-#
-# The reformatted file is created in the directory where the input file
-# resides, and its name is NAME-r.html.
-
-#==============================================================================
-
-set -e
-
-# Test whether the script is called from color-wdiff
-p=$(pidof -x color-wdiff) || true
-test "$p" == "$PPID" && called_from_color_wdiff=1
-
-function close_or_exit () {
-# turns off interactivity and lets the terminal close normally if the script
-# is called from color-wdiff.
-
-if test "$called_from_color_wdiff" == "1"; then
- exit $1
-else
- if test "$1" == "1"; then
- echo -e 1>&2 "\n!!! $input doesn't exist or is not an HTML."
- fi
- echo -e '\n*** Close the terminal window or press Return.'; read OK
- test -z "$OK" && exit $1
-fi
-}
-
-# Get a valid HTML as input.
-input=$1
-if test ! -f "$input" -o ! -s "$input"; then
- echo -e "\n*** reformat-html - Please enter the HTML file."
- read input
- input=${input%\'}; input=${input#\'}
- test -f "$input" -a "${input%.html}" != "$input" || close_or_exit 1
-fi
-
-# Define the output file.
-if test "$called_from_color_wdiff" == "1"; then
- output=$2
-else
- output=${input%.html}-r.html
-fi
-
-tmp=$(mktemp -t ref.XXXXXX) || close_or_exit 1
-trap "rm -f $tmp" EXIT
-
-cp $input $tmp
-
-# Remove javascript, which shouldn't be reformatted, leading and trailing
-# spaces/tabs, multiple spaces, LF after </a> and <li>.
-sed -i -e '/jquery-1.11.0.min.js/,$d' \
- -e 's,\t, ,g' \
- -e 's,^ *,,' \
- -e 's, *, ,g' \
- -e 's, *$,,' $tmp
-sed -i -e '/<\/a>$/ {N; s,<\/a>\n<,<\/a> <,}' $tmp
-sed -i -e '/^<li/ {N; s,>\n<a ,> <a ,}' $tmp
-
-# One string per paragraph, header or list item.
-for tag in li p strong a h3; do
- sed -i "/<$tag[^>]*>$/ {N; s,\\n, ,}" $tmp
-done
-for tag in a strong; do
- sed -i "/<\\/$tag>$/ {N; s,\\n, ,}" $tmp
-done
-# This command may need to be repeated. Adjust the number of repeats. This
-# could be done by looping back to a sed marker, but a while loop seems
-# quicker.
-i=0
-while (( i < 2 )); do
- sed -i '/[^<>]$/ {N; s,\([^<>]\)\n,\1 ,}' $tmp
- let i=i+1
-done
-sed -i -e '/ \/>$/ {N; s,\( \/>\)\n,\1 ,}' \
- -e '/ <a[^>]*>$/ {N; s,\(<a[^>]*>\)\n\([^<]\),\1 \2,}' $tmp
-
-# Make sure there is only one paragraph per string. This command may need to
-# be repeated. Adjust the number of repeats.
-i=0
-while (( i < 2 )); do
- sed -i 's,</p>\(.\+\)$,</p>\n\1,' $tmp
- let i=i+1
-done
-
-# Single out the tags which include p (will also work for pre).
-sed -i 's,\(.\)<p,\1\n<p,' $tmp
-
-# Single-out input meta and link.
-for tag in input meta link link; do
- sed -i "s,> <$tag,>\n<$tag," $tmp
-done
-
-# Remove leading and trailing spaces, double spaces and blank lines.
-# Fuse comment with </p>; separate truncated "~~~" comment from fused tag.
-sed -i -e 's,^ *,,' \
- -e 's, *$,,' \
- -e 's, , ,g' \
- -e '/^$/d' \
- -e '/<\/p>$/ {N;s,\n\(<!-- [^~]\),\1,}' \
- -e 's,~~~[ ]\?[-]\?[-]\?[ ]\?<,~~~\n<,' $tmp
-
-# Fuse header, section and footer with the corresponding div.
-for tag in header section footer; do
- sed -i "/^<$tag/ {N; s,\\(<$tag[^>]*>\\)\\n<div>,\\1<div>,}" $tmp
- sed -i "/^<\\/div>$/ {N; s,<\\/div>\\n\\(<\\/$tag>\\),</div>\\1,}" $tmp
-done
-
-# Add LF before main sections and commented-out parts.
-sed -i 's,<!-- ~~,\n<!-- ~~,' $tmp
-sed -i '/COMMENTED OUT/ s,^,\n,' $tmp
-
-# Make the text more readable.
-for tag in p h1 h2 h3 h4 dl title form; do
- sed -i "s,<$tag,\\n&," $tmp
-done
-for tag in p dl ul h1 h2 h3 h4 title head footer form script; do
- sed -i "/<\\/$tag>/s,$,\\n," $tmp
-done
-sed -i '/<\/dd>/ {N; s,</dd>\n<dt,</dd>\n\n<dt,}' $tmp
-sed -i '/<\/dt>/ {N; s,</dt>\n<dd,</dt>\n\n<dd,}' $tmp
-sed -i -e 's,</p></span>$,</p>\n</span>,' \
- -e 's, alt=,\nalt=,g' \
- -e 's, | , |\n,g' $tmp
-
-# Remove extra LFs, if any.
-sed -i ':a /^$/ {N; s,\n$,,; ba}' $tmp
-sed -i ':a /^\n*$/ {$d; N; ba}' $tmp
-
-# Wrap the text.
-fmt -s -w 95 $tmp > $output
-
-close_or_exit 0
+++ /dev/null
-<!-- Language list for browsers that do not have JS enabled -->
-<ul id="languages" class="os">
-<li><a href="/en">English – v4.0</a></li>
-<!--<li><a href="/ar">العربية</a></li>-->
-<li><a href="/de">Deutsch – v3.0</a></li>
-<li><a href="/el">ελληνικά – v3.0</a></li>
-<li><a href="/es">español – v3.0</a></li>
-<li><a class="current" href="/fr">français – v4.0</a></li>
-<li><a href="/it">italiano – v3.0</a></li>
-<li><a href="/ja">日本語 – v3.0</a></li>
-<!--<li><a href="/ko">한국어</a></li>-->
-<!--<li><a href="/ml">മലയാളം</a></li>-->
-<li><a href="/pt-br">português do Brasil – v3.0</a></li>
-<li><a href="/ro">română – v3.0</a></li>
-<li><a href="/ru">русский – v4.0</a></li>
-<li><a href="/sq">Shqip – v4.0</a></li>
-<li><a href="/tr">Türkçe – v4.0</a></li>
-</ul>
+++ /dev/null
-<!-- include virtual="head.i.html" -->
-
-<!-- ~~~~~~~~~ GnuPG Header and introduction text ~~~~~~~~~ -->
-<header class="row" id="header"><div>
-
-<h1>Autodéfense courriel</h1>
-
-<!-- Language list for browsers that do not have JS enabled -->
-<ul id="languages" class="os">
-<li><a href="/en/workshops.html">English</a></li>
-<!--<li><a href="/ar/workshops.html">العربية</a></li>-->
-<!--<li><a href="/de/workshops.html">Deutsch</a></li>-->
-<!--<li><a href="/el/workshops.html">ελληνικά</a></li>-->
-<!--<li><a href="/es/workshops.html">español</a></li>-->
-<li><a class="current" href="/fr/workshops.html">français</a></li>
-<!--<li><a href="/it/workshops.html">italiano</a></li>-->
-<!--<li><a href="/ja/workshops.html">日本語</a></li>-->
-<!--<li><a href="/ko/workshops.html">한국어</a></li>-->
-<!--<li><a href="/ml/workshops.html">മലയാളം</a></li>-->
-<!--<li><a href="/pt-br/workshops.html">português do Brasil</a></li>-->
-<!--<li><a href="/ro/workshops.html">română</a></li>-->
-<li><a href="/ru/workshops.html">русский</a></li>
-<!--<li><a href="/sq/workshops.html">Shqip</a></li>-->
-<li><a href="/tr/workshops.html">Türkçe</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">Windows</a></li>
-<li class="spacer"><a href="workshops.html" class="current">Initiez vos amis</a></li>
-<li class="spacer"><a
-href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Chiffrement du courriel pour tous avec %40fsf">
-Partagez <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> Nous souhaitons traduire ce guide en d'autres langues et en faire une version pour
-le chiffrement sur mobile. Merci de faire un don pour aider les gens de tous les pays à
-faire le premier pas vers la protection de leur vie privée. </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="Faites un don" src="//static.fsf.org/nosvn/enc-dev0/img/fr/donate.png" /></a> </p>
-
-</div><!-- End #fsf-intro -->
-
-<!-- ~~~~~~~~~ Guide Introduction ~~~~~~~~~ -->
-<div class="intro">
-
-<p> <a id="infographic" href="https://emailselfdefense.fsf.org/fr/infographic.html"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/fr/infographic-button.png"
-alt="Regardez et partagez notre infographie →" /></a>
-Comprendre et configurer le chiffrement du courriel est une tâche colossale pour nombre
-de gens. C'est pourquoi l'aide que vous apportez à vos amis dans l'utilisation de GnuPG
-joue un rôle si important dans la diffusion de cette technique. Même si une seule personne
-vient à votre atelier, c'est toujours une de plus qui utilisera le chiffrement. Vous avez
-le pouvoir d'aider vos amis à préserver la confidentialité de leurs lettres d'amour
-électroniques et de leur apprendre l'importance du logiciel libre. Si vous utilisez
-GnuPG pour envoyer et recevoir des courriels chiffrés, vous êtes un candidat idéal à
-l'animation d'ateliers !</p>
-
-</div><!-- End .intro -->
-</div></header><!-- End #header -->
-
-<!-- ~~~~~~~~~ Section 1: Get your friends or community interested> ~~~~~~~~~ -->
-<section style="padding-top: 0px;" class="row" id="section1">
-<div style="padding-top: 0px;">
-
-<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
-<div class="section-intro">
-
-<p style="margin-top: 0px;" class="image"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/fr/screenshots/workshop-section1.png" /></p>
-
-<h2><em>#1</em> Éveillez l'intérêt de vos amis ou de votre communauté </h2>
-
-<p>Si vous entendez vos amis se plaindre du manque de respect pour les données personnelles,
-demandez-leur si ça les intéresse de participer à un atelier sur l'autodéfense du courriel.
-S'ils ne pestent pas au sujet des données personnelles, ils ont peut-être besoin
-d'explications. Vous pourriez même entendre l'argument classique contre l'usage du
-chiffrement : « Si vous n'avez rien à cacher, vous n'avez rien à craindre ».</p>
-
-<p>Voici quelques sujets de conversation qui les aideront à comprendre pourquoi cela vaut
-la peine d'apprendre à utiliser GnuPG. Piochez dans cette liste ce qui aura du sens pour
-votre communauté.</p>
-
-</div><!-- End .section-intro -->
-<div id="step-aa" class="step">
-<div class="sidebar">
-<!-- Workshops image commented out from here, to be used above instead.
-
-<p><img id="workshops-image"
-src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/workshop-section1.png"
-alt="Workshop icon"></p>
-
--->
-</div><!-- /.sidebar -->
-<div class="main">
-
-<h3>La force du nombre</h3>
-
-<p>Chacune des personne qui choisit de résister à la surveillance de masse avec le
-chiffrement permet aux autres de résister plus facilement. Démocratiser l'utilisation d'un
-chiffrement fort a des effets puissants et multiples : cela signifie que ceux qui ont
-le plus besoin de confidentialité, lanceurs d'alerte et activistes potentiels par exemple,
-ont de meilleures chances d'apprendre l'existence du chiffrement. L'utilisation du
-chiffrement par plus de gens et l'extension de son domaine d'application rendent plus
-difficile pour les systèmes de surveillance d'identifier ceux qui ne peuvent pas se
-permettre d'être découverts, et montre votre solidarité avec eux.</p>
-
-</div><!-- End .main -->
-<div class="main">
-
-<h3>Des gens que vous respectez utilisent peut-être déjà le chiffrement</h3>
-
-<p>De nombreux journalistes, lanceurs d'alerte, activistes et chercheurs utilisent
-GNuPG ; vos amis, sans le savoir, peuvent donc avoir entendu parler de quelques
-personnes qui l'utilisent déjà. Une recherche avec « BEGIN PUBLIC KEY BLOCK »,
-+ un autre mot-clé, peut vous aider à faire une liste de personnes et d'organisations
-que votre communauté est susceptible de reconnaître.</p>
-
-</div><!-- End .main -->
-<div class="main">
-
-<h3>Respectez la vie privée de vos amis</h3>
-
-<p>Il n'y a aucun moyen objectif d'évaluer le caractère privé d'une correspondance. Par
-conséquent, il vaut mieux ne pas partir du principe que le courriel destiné à votre
-ami, inoffensif à votre avis, le sera aussi pour lui (ou d'ailleurs pour un service de
-surveillance !) Montrez du respect à vos amis en chiffrant votre correspondance
-avec eux.</p>
-
-</div><!-- End .main -->
-<div class="main">
-
-<h3>Les techniques de protection de la vie privée sont normales dans le monde physique</h3>
-
-<p>Dans l'espace physique, nous trouvons normal de protéger notre vie privée au moyen
-de volets, d'enveloppes et de portes fermées. Pourquoi l'espace numérique serait-il
-différent ?</p>
-
-</div><!-- End .main -->
-<div class="main">
-
-<h3>Nous ne devrions pas avoir à confier nos données personnelles à nos fournisseurs de
-messagerie</h3>
-
-<p>Certains fournisseurs de messagerie sont tout à fait dignes de confiance, mais nombreux
-sont ceux qui ont avantage à ne pas protéger nos données personnelles et notre sécurité. Pour
-devenir des cybercitoyens en pleine possession de leurs moyens, nous devons prendre en mains
-notre propre sécurité.</p>
-
-</div><!-- End .main -->
-</div><!-- End #step-2a .step -->
-</div></section><!-- End #section1 -->
-
-<!-- ~~~~~~~~~ Section 2: Plan The Workshop ~~~~~~~~~ -->
-<section class="row" id="section2"><div>
-
-<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
-<div class="section-intro" style="border: none; padding-bottom: 0px; margin-bottom: 0px;">
-
-<h2><em>#2</em> Organisez l'atelier</h2>
-
-<p>Une fois que vous aurez éveillé l'intérêt d'au moins un ami, choisissez une date et
-commencez à organiser l'atelier. Dites aux participants d'apporter leur ordinateur et leur
-carte d'identité (pour se signer mutuellement leurs clefs). Si vous souhaitez leur rendre
-plus facile l'utilisation de Diceware pour le choix des mots de passe, procurez-vous à
-l'avance un jeu de dés. Assurez-vous que le lieu choisi pour l'atelier ait une connexion
-internet facilement accessible et prévoyez un plan B au cas où la connexion cesserait
-de fonctionner le jour de l'atelier. Les bibliothèques, cafés et centres socio-culturels
-sont des lieux bien adaptés. Essayez d'obtenir que tous les participants installent
-avant l'événement un client de messagerie compatible avec Enigmail. Conseillez-leur de
-s'adresser au service technique de leur fournisseur de messagerie ou de lire sa documentation
-s'ils rencontrent des erreurs.</p>
-
-<p> </p>
-
-<p>Comptez que l'atelier durera au moins quarante minutes, plus dix minutes par participant.
-Prévoyez du temps en plus pour les questions et les accrocs techniques.</p>
-
-<p>Pour que l'atelier soit couronné de succès, il vous faudra comprendre l'environnement
-culturel et les besoins particuliers de chaque groupe de participants. Les ateliers
-doivent rester de taille modeste pour que chacun reçoive une formation individualisée.
-Si plus d'une poignée de gens veulent participer, recrutez d'autres animateurs pour
-minimiser le nombre de participants par animateur, ou bien animez plusieurs ateliers.
-Les petits ateliers entre amis fonctionnent à merveille !</p>
-
-</div><!-- End .section-intro -->
-</div></section><!-- End #section2 -->
-
-<!-- ~~~~~~~~~ Section 3: Follow The Guide ~~~~~~~~~ -->
-<section class="row" id="section3"><div>
-
-<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
-<div class="section-intro" style="border: none; padding-bottom: 0px; margin-bottom: 0px;">
-
-<h2><em>#3</em> Suivez le guide en groupe</h2>
-
-<p>Travaillez en groupe chaque étape du guide Autodéfense courriel. Décrivez précisément
-chaque étape, mais ne submergez pas les participants de petits détails. Ajustez l'essentiel
-de vos explications au niveau technique des participants les moins avancés. Assurez-vous
-après chaque étape que tous les participants l'ont menée à bien avant de passer à l'étape
-suivante. N'hésitez pas à organiser des ateliers secondaires après coup pour les
-personnes qui ont eu du mal à comprendre les concepts, ou pour celles qui les ont compris
-mais veulent en savoir plus.</p>
-
-<p>À la <a href="index.html#section2">section 2</a> du guide, assurez-vous que les
-participants envoient tous leurs clefs sur le même serveur, afin que chacun puisse
-télécharger les clefs des autres tout de suite après (il y a quelquefois un retard de
-synchronisation entre les serveurs). À la <a href="index.html#section3">section 3</a>,
-donnez aux participants le choix de s'envoyer mutuellement des messages au lieu (ou en plus)
-de les envoyer à Edward. À la <a href="index.html#section4">section 4</a>, encouragez
-les participants à se signer mutuellement leurs clefs. Et à la fin, rappelez-leur de
-mettre en lieu sûr une copie de leur certificat de révocation.</p>
-
-</div><!-- End .section-intro -->
-</div></section>
-
-<!-- ~~~~~~~~~ Section 4: Explain the pitfalls ~~~~~~~~~ -->
-<section class="row" id="section4"><div>
-
-<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
-<div class="section-intro" style="border: none; padding-bottom: 0px; margin-bottom: 0px;">
-
-<h2><em>#4</em> Expliquez les pièges</h2>
-
-<p>Rappelez aux participants que le chiffrement ne marche que s'il est utilisé de manière
-explicite ; ils ne seront pas en mesure d'envoyer un courriel chiffré à une personne
-qui n'a pas encore configuré le chiffrement. Rappelez-leur également de bien vérifier
-l'icône de chiffrement avant de cliquer sur Envoyer, et aussi que le sujet et l'horodatage
-ne sont jamais chiffrés.</p>
-
-<p> Expliquez les <a href="https://www.gnu.org/proprietary/proprietary.html">
-dangers qu'implique l'usage d'un système privateur</a> et faites-vous
-l'avocat du logiciel libre, parce que sans lui nous ne pouvons pas <a
-href="https://www.fsf.org/bulletin/2013/fall/how-can-free-software-protect-us-from-surveillance">
-résister valablement aux atteintes à notre vie privée et notre autonomie
-numériques</a>.</p>
-
-</div><!-- End .section-intro -->
-</div></section><!-- End #section4 -->
-
-<!-- ~~~~~~~~~ Section 5: Explain The Pitfalls ~~~~~~~~~ -->
-<section id="section5" class="row"><div>
-
-<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
-<div class="section-intro" style="border: none; padding-bottom: 0px; margin-bottom: 0px;">
-
-<h2><em>#5</em> Partagez d'autres ressources</h2>
-
-<p>Les options avancées de GnuPG sont beaucoup trop complexes pour les traiter
-dans un seul atelier. Si les participants veulent en savoir plus, signalez-leur
-les sous-sections « Utilisation avancée » du guide et envisagez
-d'organiser un autre atelier. Vous pouvez aussi les orienter vers la documentation
-officielle de <a href="https://www.gnupg.org/documentation/index.html">GnuPG</a> et d'<a
-href="https://www.enigmail.net/documentation/index.php">Enigmail</a>, ainsi que vers les
-listes de discussion. Les sites de nombreuses distributions GNU/Linux contiennent également
-une page expliquant les fonctions avancées de GnuPG.</p>
-
-</div><!-- End .section-intro -->
-</div></section><!-- End #section5 -->
-
-<!-- ~~~~~~~~~ Section 6: Next steps ~~~~~~~~~ -->
-<section class="row" id="section6"><div>
-
-<!-- ~~~~~~~~~ section introduction: interspersed text ~~~~~~~~~ -->
-<div class="section-intro" style="border: none; padding-bottom: 0px; margin-bottom: 0px;">
-
-<h2><em>#6</em> Effectuez un suivi</h2>
-
-<p>Assurez-vous que tout le monde a partagé son adresse de courriel et l'empreinte de
-sa clef avec les autres avant de partir. Encouragez les participants à s'envoyer des
-messages pour acquérir de l'expérience avec GnuPG, et envoyez-leur à chacun un message
-chiffré une semaine après l'atelier, pour leur rappeler d'ajouter l'empreinte de leur
-clef publique à leur adresse de courriel, partout où cette dernière apparaît.</p>
-
-<p>Si vous avez des suggestions pour améliorer ce guide de l'animateur d'atelier, merci
-de nous les communiquer à <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a>.</p>
-
-</div><!-- End .section-intro -->
-</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 -->
-<!-- include virtual="footer.i.html" -->
-<!-- include virtual="javascript.i.html" -->
projects / enc-live.git / commitdiff