Copying everything beneath the section 1 intro (which is different for different...
authorZak Rogoff <zak@fsf.org>
Thu, 5 Jun 2014 03:38:40 +0000 (23:38 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 5 Jun 2014 03:38:40 +0000 (23:38 -0400)
index.html
mac.html
windows.html

index aa6415cea021aa3b13c40d26e5e9fac32ec68f96..2887badbefa79cb95c4786cf317037c749d283a9 100644 (file)
 <p>You've now completed the basics of email encryption with GnuPG, taking action against bulk surveillance. A pat on the back to you! Want to do more to secure privacy for yourself and the people you communicate with?</p>
                                </div><!-- End .section-intro -->
 
+
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-keysigning_party" class="step">
                                        <div class="sidebar">
index c1764f100c98d93621a841bb9b43ebe99dc65b96..522681e9ed5cfc51e593084f632634e6888bedfb 100644 (file)
--- a/mac.html
+++ b/mac.html
                                </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>Install GnuPG</h3>
-                                               <p><a rel="external" href="https://releases.gpgtools.org/GPG%20Suite%20-%202013.10.22.dmg">Download GPG Suite</a>, a software package that includes GnuPG. Install it, clicking through the installation wizard with all the default settings. If it opens any windows after installation, you can close them.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step1b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1c" class="step">
-                               <div class="sidebar">
+                                       <div class="sidebar">
                                                <ul class="images">
                                                        <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-01-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></li>
                                                        <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-02-search.png" alt="Step 1.B: Search Add-ons" /></li>
                                                </ul>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
-                                               <h3><em>Step 1.c</em> Install the Enigmail plugin for your email program</h3>
+                                               <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
                                                <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
                                                <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                        <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>
+
+                                                               <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><!-- End #step-1b .step -->
                        </div>
                </section><!-- End #section1 -->
 
                                                <p>On the second screen, titled "Signing," select "No, I want to create per-recipient rules for emails that need to be signed."</p>
                                                <p>Use the default options until you reach the screen titled "Create Key".</p>
                                                <p>On the screen titled "Create Key," pick a strong password! Your password should be at least 12 characters and include at least one lower case and upper case letter and at least one number or punctuation symbol. Don't forget the password, or all this work will be wasted!</p>
-                                       <p>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 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 OpenPGP Confirm screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there. You'll learn more about the revocation certificate in <a href="#section5">Section 5</a>. The setup wizard will ask you to move it onto an external device, but that isn't necessary at this moment.</p>
                                                <p class="notes">After creating your key, the Enigmail set-up wizard automatically uploaded it to a keyserver, an online computer that makes everyone's keys available through the Internet.</p>
 
                                                <h3><em>Step 2.b</em> Upload your public key to a keyserver</h3>
                                                <p>In your email program's menu, select OpenPGP &rarr; 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>Now anyone who wants to send you an encrypted message can download your public key from the Internet.</b>
+<p class="notes">Now someone who wants to send you an encrypted message can download your public key from the Internet.</b>
                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                <div class="troubleshooting">
                                                        <h4>Troubleshooting</h4>
                                                        <dl>
                                                                <dt>The progress bar never finishes</dt>
                                                                                <dd>Close the upload popup, make sure you are on the Internet and try again. If that doesn't work, try again, selecting a different keyserver.</dd>
+<dt>Enigmail can't find Adele's key</dt>
+                                                                               <dd>Close the pop-ups that have appeared since you clicked. 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 -->
 
-<dt>Enigmail can't find Adele's key</dt>
-                                                                               <dd>Close the pop-ups that have appeared since you clicked. 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>
+
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-2a .step  -->
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-3a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section3-try-it-out.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section3-try-it-out.png" alt="Try it out." /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 3.a</em> Send Adele your public key</h3>
 
 <p>Put at least one word (whatever you want) in the subject and body of the email, then hit send.</p>
 
-<p>It may take two or three minutes for Adele to respond. In the meantime, you might want to skip ahead and check out the Use it well section of this guide. Once she's responded, head to the next step. From here one, you'll be doing just the same thing as when corresponding with a real person.</p>
+<p class="notes">It may take two or three minutes for Adele 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 she's responded, head to the next step. From here one, you'll be doing just the same thing as when corresponding with a real person.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-3b .step -->
 
                                                <h3><em>Step 3.c</em> Receive a response</h3>
                                                <p>When Adele receives your email, she will use her private key to decrypt it, then fetch your public key from a keyserver and use it to encrypt a response to you.</p>
                                                <p class="notes">Since you encrypted this email with Adele's public key, Adele's private key is required to decrypt it. Adele is the only one with her private key, so no one except her &mdash; not even you &mdash; can decrypt it.</p>
-                                               <p>It may take two or three minutes for Adele to respond. In the meantime, you might want to skip ahead and check out the Use it well section of this guide.</p>
+                                               <p class="notes">It may take two or three minutes for Adele 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 Adele'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 class="notes">Notice the bar that Enigmail shows you with information about the status of Adele's key.</p>
+                                               <p>Notice the bar that Enigmail shows you above the message, with information about the status of Adele's key.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-3c .step -->
 
 
 <p>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 GnuPG users, connected to each other by chains of trust expressed through signatures, into a giant Web. The more signatures a key has, and the more signatures it's signers' keys have, the more trustworthy that key is.</p>
 
+<p>People's public keys are usually identified by their key ID, which is a short string of digits like 9G6E29F7. You may also see them referred to by their key fingerprint, which is a slightly longer string of digits often prefaced with 0x, like 0x2C1008316F3E89B7.</p>
+
                                </div><!-- End .section-intro -->
 
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                                <p class="notes">You've just effectively said "I trust that Adele's public key actually belongs to Adele." This doesn't mean much because Adele isn't a real person, but it's good practice.</p>
 
 
-                                               <div id="pgp-pathfinder">
+                                               <!--<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>The more you can encrypt your messages, the better. This is because, 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. And even people that encrypt as much as they can are still limited to those of their contacts that have public keys.</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 -->
                                                <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
-                                               <h3>Be wary of invalid keys</h3>
+                                               <h3><em>Important:</em> Be wary of invalid keys</h3>
                                                <p>GnuPG makes email safer, but it's still important to watch out for invalid keys, which 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 Adele sent you. Because it was encrypted with her key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: 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 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 steal your identity. This guide doesn't cover how to revoke a key, but it only takes a minute. We recommend you Google it or seek help from a skilled friend. After you're done revoking, send an email to everyone with whom you usually use your key to make sure they know.</p>
+                                               <p>If you lose your private key or someone else gets ahold of it (say, by stealing or cracking your computer), it's important to revoke it immediately before someone else uses it to read your encrypted email. This guide doesn't cover how to revoke a key, but you can follow the <a href="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-->
 
                                <div id="step-5d" class="step">
                                        <div class="main">
                                                <h3>Make it part of your online identity</h3>
-                                               <p>Start writing your key ID anywhere someone would see your email address. Add it to your email signature, so that anyone corresponding with you knows that they can donwload your public key and verify that it's the correct one. It's also good to post it on your media profile, blog, Website, or business card.</p><p>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 ID.</p>
+                                               <p>Start writing your key ID anywhere someone would see your email address. Add it to your email signature, so that anyone corresponding with you knows that they can donwload your public key and verify that it's the correct one. It's also good to post it on your media profile, 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>.)</p><p>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 ID.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-5d .step-->
-                               
-                               
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-gnulinux" class="step">
-                                       <div class="main">
-                                               <h3>Switch to GNU/Linux</h3>
-                                               <p>Coming soon</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-gnulinux .step -->
 
 
                        </div>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Go to a keysigning party</h3>
-                                               <p>Keysigning parties are social events designed to build the Web of Trust. Participants match each others' photo IDs and Key IDs, and then get out their laptops and sign each other's public keys. They're a great way to meet likeminded people and learn about new privacy tools, as well as build up people's trust in your key. Look for keysigning at tech events, hackerspaces and nerdy parties.</p>
+                                               <p>Keysigning parties are social events designed to build the Web of Trust. Participants match each others' photo IDs and key IDs, and then get out their laptops and sign each other's public keys. They're a great way to meet likeminded people and learn about new privacy tools, as well as build up people's trust in your key. Look for keysignings at tech events, hackerspaces and nerdy parties.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #keysigning_party .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-programming" class="step">
+                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                <div id="step-gnulinux" class="step">
+                    <div class="main">
+                        <h3>Switch to GNU/Linux for maximum safety</h3>
+                        <p>Mac OS is a nonfree operating system, which means that no one but Apple gets to see the code it runs on. This makes running Mac OS risky for your privacy -- there's no way to know if it's spying on you.</p><p>To push back hard against surveillance, we recommend you switch to a free software operating system like GNU/Linux. Free operating systems are completely transparent, so anyone can find and remove dangerous code. Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
+                    </div><!-- End .main -->
+                </div><!-- End #step-gnulinux .step -->
+
+<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                               <div id="step-political" class="step">
                                        <div class="main">
-                                               <h3>Make these tools even better</h3>
-                                               <p>Like programming? Contribute code to <a href="https://www.gnupg.org/">GnuPG</a> or <a href="https://www.enigmail.net/home/index.php">Enigmail</a>. Have an idea for improving this guide? Leave us <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a>.</p>
+                                               <h3>Work for political change</h3>
+                                               <p>Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. One of the key things needed is <a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">reducing the amount of data collected about us in the first place</a>.</p><p>To learn more and participate in efforts for change, join the <a href="https://www.fsf.org/free-software-supporter/subscribe">Free Software Foundation's mailing list.</a></p>
+
                                        </div><!-- End .main -->
-                               </div><!-- End #step-programming .step -->
+                               </div><!-- End #step-political .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:PRISM"> the Free Software Directory's PRISM Collection</a> and <a href="prism-break.org">prism-break.org</a>.</p>
+                                               <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>
                                        </div><!-- End .main -->
                                </div><!-- End #step-more_technologies .step -->
 
-
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-gnulinux" class="step">
+                               <div id="step-better" class="step">
                                        <div class="main">
-                                               <h3>Switch to GNU/Linux for maximum safety</h3>
-                                               <p>Mac OS is a nonfree operating system, which means that no one but Apple gets to see the code it runs on. This makes running Mac OS risky for your privacy -- there's no way to know if it's spying on you.</p><p>To push back hard against surveillance, we recommend you switch to a free software operating system like GNU/Linux. Free operating systems are completely transparent, so anyone can find and remove dangerous code. Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
+                                               <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>, or email us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> if you'd like to help maintain or translate it.</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>If you can't do any of these, you can always <a href="https://u.fsf.org/7w">donate to the Free Software Foundation</a> so we can get Email Self-Defense into the hands of as many people as possible.</a></p>
+
                                        </div><!-- End .main -->
-                               </div><!-- End #step-gnulinux .step -->
+                               </div><!-- End #step-better .step -->
 
-                               <!-- ~~~~~~~~~ a div for each 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 .main --
                                </div><!-- End #step-learn_more .step -->
 
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-contribute" class="step">
-                                       <div class="main">
-                                               <h3>Contribute to this guide</h3>
-                                               <ul>
-                                                       <li><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Leave feedback and suggest improvements</a></li>
-                                                       <li>Email us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> if you'd like to help maintain and improve this guide, or to translate it</li>
-                                                       <li><a href="https://u.fsf.org/7w">Donate to the Free Software Foundation</a></li>
-                                               </ul>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-contribute .step -->
-                                       
+
                        </div>
                </section><!-- End #section6 -->
 
                  })();
                 </script>
                 <!-- End Piwik Code -->
-
        </body>
 </html>
index 45d3bc934cf6b7bf55c670d26656317aebab1650..bf5aeb2fd3ad614c8a6aad49edb7752d60aa496f 100644 (file)
                                </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>Install GnuPG</h3>
-                                               <p><a rel="external" href="http://files.gpg4win.org/gpg4win-2.2.1.exe">Download GPG4win</a>, a software package that includes GnuPG. Install it, clicking through the installation wizard with all the default settings. If it opens any windows after installation, you can close them.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step1b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1c" class="step">
-                               <div class="sidebar">
+                                       <div class="sidebar">
                                                <ul class="images">
                                                        <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-01-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></li>
                                                        <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-02-search.png" alt="Step 1.B: Search Add-ons" /></li>
                                                </ul>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
-                                               <h3><em>Step 1.c</em> Install the Enigmail plugin for your email program</h3>
+                                               <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
                                                <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
                                                <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                <div class="troubleshooting">
                                                        <h4>Troubleshooting</h4>
                                                        <dl>
-                                                               <dt>I can't find the OpenPGP menu.</dt>
-                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars. OpenPGP may be inside a section called Tools.</dd>
+                                                               <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><!-- End #step-1b .step -->
                        </div>
                </section><!-- End #section1 -->
 
-
-
 <!-- ~~~~~~~~~ Section 2: Make your keys  ~~~~~~~~~ -->
                <section class="row" id="section2">
                        <div>
                                                <p>On the second screen, titled "Signing," select "No, I want to create per-recipient rules for emails that need to be signed."</p>
                                                <p>Use the default options until you reach the screen titled "Create Key".</p>
                                                <p>On the screen titled "Create Key," pick a strong password! Your password should be at least 12 characters and include at least one lower case and upper case letter and at least one number or punctuation symbol. Don't forget the password, or all this work will be wasted!</p>
-                                       <p>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 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 OpenPGP Confirm screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there. You'll learn more about the revocation certificate in <a href="#section5">Section 5</a>. The setup wizard will ask you to move it onto an external device, but that isn't necessary at this moment.</p>
                                                <p class="notes">After creating your key, the Enigmail set-up wizard automatically uploaded it to a keyserver, an online computer that makes everyone's keys available through the Internet.</p>
 
                                                <h3><em>Step 2.b</em> Upload your public key to a keyserver</h3>
                                                <p>In your email program's menu, select OpenPGP &rarr; 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>Now anyone who wants to send you an encrypted message can download your public key from the Internet.</b>
+<p class="notes">Now someone who wants to send you an encrypted message can download your public key from the Internet.</b>
                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                <div class="troubleshooting">
                                                        <h4>Troubleshooting</h4>
                                                        <dl>
                                                                <dt>The progress bar never finishes</dt>
                                                                                <dd>Close the upload popup, make sure you are on the Internet and try again. If that doesn't work, try again, selecting a different keyserver.</dd>
+<dt>Enigmail can't find Adele's key</dt>
+                                                                               <dd>Close the pop-ups that have appeared since you clicked. 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 -->
 
-<dt>Enigmail can't find Adele's key</dt>
-                                                                               <dd>Close the pop-ups that have appeared since you clicked. 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>
+
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-2a .step  -->
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-3a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section3-try-it-out.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section3-try-it-out.png" alt="Try it out." /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 3.a</em> Send Adele your public key</h3>
 
 <p>Put at least one word (whatever you want) in the subject and body of the email, then hit send.</p>
 
-<p>It may take two or three minutes for Adele to respond. In the meantime, you might want to skip ahead and check out the Use it well section of this guide. Once she's responded, head to the next step. From here one, you'll be doing just the same thing as when corresponding with a real person.</p>
+<p class="notes">It may take two or three minutes for Adele 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 she's responded, head to the next step. From here one, you'll be doing just the same thing as when corresponding with a real person.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-3b .step -->
 
                                                <h3><em>Step 3.c</em> Receive a response</h3>
                                                <p>When Adele receives your email, she will use her private key to decrypt it, then fetch your public key from a keyserver and use it to encrypt a response to you.</p>
                                                <p class="notes">Since you encrypted this email with Adele's public key, Adele's private key is required to decrypt it. Adele is the only one with her private key, so no one except her &mdash; not even you &mdash; can decrypt it.</p>
-                                               <p>It may take two or three minutes for Adele to respond. In the meantime, you might want to skip ahead and check out the Use it well section of this guide.</p>
+                                               <p class="notes">It may take two or three minutes for Adele 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 Adele'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 class="notes">Notice the bar that Enigmail shows you with information about the status of Adele's key.</p>
+                                               <p>Notice the bar that Enigmail shows you above the message, with information about the status of Adele's key.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-3c .step -->
 
 
 <p>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 GnuPG users, connected to each other by chains of trust expressed through signatures, into a giant Web. The more signatures a key has, and the more signatures it's signers' keys have, the more trustworthy that key is.</p>
 
+<p>People's public keys are usually identified by their key ID, which is a short string of digits like 9G6E29F7. You may also see them referred to by their key fingerprint, which is a slightly longer string of digits often prefaced with 0x, like 0x2C1008316F3E89B7.</p>
+
                                </div><!-- End .section-intro -->
 
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                                <p class="notes">You've just effectively said "I trust that Adele's public key actually belongs to Adele." This doesn't mean much because Adele isn't a real person, but it's good practice.</p>
 
 
-                                               <div id="pgp-pathfinder">
+                                               <!--<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>The more you can encrypt your messages, the better. This is because, 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. And even people that encrypt as much as they can are still limited to those of their contacts that have public keys.</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 -->
                                                <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
-                                               <h3>Be wary of invalid keys</h3>
+                                               <h3><em>Important:</em> Be wary of invalid keys</h3>
                                                <p>GnuPG makes email safer, but it's still important to watch out for invalid keys, which 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 Adele sent you. Because it was encrypted with her key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: 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 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 steal your identity. This guide doesn't cover how to revoke a key, but it only takes a minute. We recommend you Google it or seek help from a skilled friend. After you're done revoking, send an email to everyone with whom you usually use your key to make sure they know.</p>
+                                               <p>If you lose your private key or someone else gets ahold of it (say, by stealing or cracking your computer), it's important to revoke it immediately before someone else uses it to read your encrypted email. This guide doesn't cover how to revoke a key, but you can follow the <a href="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-->
 
                                <div id="step-5d" class="step">
                                        <div class="main">
                                                <h3>Make it part of your online identity</h3>
-                                               <p>Start writing your key ID anywhere someone would see your email address. Add it to your email signature, so that anyone corresponding with you knows that they can donwload your public key and verify that it's the correct one. It's also good to post it on your media profile, blog, Website, or business card.</p><p>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 ID.</p>
+                                               <p>Start writing your key ID anywhere someone would see your email address. Add it to your email signature, so that anyone corresponding with you knows that they can donwload your public key and verify that it's the correct one. It's also good to post it on your media profile, 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>.)</p><p>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 ID.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-5d .step-->
 
 <p>You've now completed the basics of email encryption with GnuPG, taking action against bulk surveillance. A pat on the back to you! Want to do more to secure privacy for yourself and the people you communicate with?</p>
                                </div><!-- End .section-intro -->
 
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-gnulinux" class="step">
-                                       <div class="main">
-                                               <h3>Switch to GNU/Linux for maximum safety</h3>
-                                               <p>Windows is a nonfree operating system, which means that no one but Microsoft gets to see the code it runs on. This makes running Windows risky for your privacy -- there's no way to know if it's spying on you.</p> <p>To push back hard against surveillance, we recommend you switch to a free software operating system like GNU/Linux. Free operating systems are completely transparent, so anyone can find and remove dangerous code. Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-gnulinux .step -->
-
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-keysigning_party" class="step">
                                        <div class="sidebar">
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Go to a keysigning party</h3>
-                                               <p>Keysigning parties are social events designed to build the Web of Trust. Participants match each others' photo IDs and Key IDs, and then get out their laptops and sign each other's public keys. They're a great way to meet likeminded people and learn about new privacy tools, as well as build up people's trust in your key. Look for keysigning at tech events, hackerspaces and nerdy parties.</p>
+                                               <p>Keysigning parties are social events designed to build the Web of Trust. Participants match each others' photo IDs and key IDs, and then get out their laptops and sign each other's public keys. They're a great way to meet likeminded people and learn about new privacy tools, as well as build up people's trust in your key. Look for keysignings at tech events, hackerspaces and nerdy parties.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #keysigning_party .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-programming" class="step">
+                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                <div id="step-gnulinux" class="step">
+                    <div class="main">
+                        <h3>Switch to GNU/Linux for maximum safety</h3>
+                        <p>Mac OS is a nonfree operating system, which means that no one but Apple gets to see the code it runs on. This makes running Mac OS risky for your privacy -- there's no way to know if it's spying on you.</p><p>To push back hard against surveillance, we recommend you switch to a free software operating system like GNU/Linux. Free operating systems are completely transparent, so anyone can find and remove dangerous code. Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
+                    </div><!-- End .main -->
+                </div><!-- End #step-gnulinux .step -->
+<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                               <div id="step-political" class="step">
                                        <div class="main">
-                                               <h3>Make these tools even better</h3>
-                                               <p>Like programming? Contribute code to <a href="https://www.gnupg.org/">GnuPG</a> or <a href="https://www.enigmail.net/home/index.php">Enigmail</a>. Have an idea for improving this guide? Leave us <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback</a>.</p>
+                                               <h3>Work for political change</h3>
+                                               <p>Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. One of the key things needed is <a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">reducing the amount of data collected about us in the first place</a>.</p><p>To learn more and participate in efforts for change, join the <a href="https://www.fsf.org/free-software-supporter/subscribe">Free Software Foundation's mailing list.</a></p>
+
                                        </div><!-- End .main -->
-                               </div><!-- End #step-programming .step -->
+                               </div><!-- End #step-political .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:PRISM"> the Free Software Directory's PRISM Collection</a> and <a href="prism-break.org">prism-break.org</a>.</p>
+                                               <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>
                                        </div><!-- End .main -->
                                </div><!-- End #step-more_technologies .step -->
 
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                               <div id="step-better" class="step">
+                                       <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>, or email us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> if you'd like to help maintain or translate it.</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>If you can't do any of these, you can always <a href="https://u.fsf.org/7w">donate to the Free Software Foundation</a> so we can get Email Self-Defense into the hands of as many people as possible.</a></p>
+
+                                       </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 .main --
                                </div><!-- End #step-learn_more .step -->
 
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-contribute" class="step">
-                                       <div class="main">
-                                               <h3>Contribute to this guide</h3>
-                                               <ul>
-                                                       <li><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Leave feedback and suggest improvements</a></li>
-                                                       <li>Email us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> if you'd like to help maintain and improve this guide, or to translate it</li>
-                                                       <li><a href="https://u.fsf.org/7w">Donate to the Free Software Foundation</a></li>
-                                               </ul>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-contribute .step -->
 
                        </div>
                </section><!-- End #section6 -->
                 <!-- End Piwik Code -->
        </body>
 </html>
-
-