Merge branch 'master' of vcs.fsf.org:enc

diff --git a/index.html b/index.html
index e03cdf6eb25974bfed3510521257a64af6404689..2061d68446f1d80ea32fd490ce5e482d37433109 100644 (file)
--- a/index.html
+++ b/index.html
@@ -114,9 +114,10 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-1b" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-01-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></p>
                                                <ul class="images">
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-02-search.png" alt="Step 1.B: Search Add-ons" /></li><li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-03-install.png" alt="Step 1.B: Install Add-ons" /></li>
+                                                       <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>
+                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-03-install.png" alt="Step 1.B: Install Add-ons" /></li>
                                                </ul>
 
                                        </div><!-- /.sidebar -->
@@ -172,7 +173,7 @@
                                                                        <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>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  Engimail setup wizard by going to OpenPGP -> Setup Wizard.</dd>
+                                         <dd>Open whatever program you usually use for installing  software, and search for GnuPG, then install it. Then restart the  Engimail setup wizard by going to OpenPGP &rarr; Setup Wizard.</dd>
                                                                <dt class="feedback">Don't see a solution to your problem?</dt>
                                                                        <dd class="feedback">Please let us know on the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>
                                                        </dl>
@@ -198,7 +199,7 @@
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3><em>Step 3.a</em> Send Adele 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 OpenPGP -> 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>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 OpenPGP &rarr; 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>Put at least one word (whatever you want) in the subject and body of the email, then hit send.</p>
 
@@ -305,6 +306,9 @@
 
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5a" class="step">
+                                       <div class="sidebar">
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                       </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>When should I encrypt?</h3>