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

diff --cc index.html
index 040c87d0fc4561f2347b53936ae495e7ac9e80fe,e03cdf6eb25974bfed3510521257a64af6404689..2061d68446f1d80ea32fd490ce5e482d37433109
--- 1/index.html
--- 2/index.html
+++ b/index.html
@@@ -305,13 -305,13 +306,16 @@@
  
                                <!-- ~~~~~~~~~ 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><em>Step 5a</em> When should I encrypt? When should I sign?</h3>
-                                               <p>Everyone uses GnuPG a little differently. Encryption is most important for messages involving finances, personal information, politically sensitive conversations and anything else that you wouldn't want to fall into the wrong hands. Signing is best for when you think there might be concern about your identity, or as a way of demonstrating that you know how to use GnuPG and will be able to decrypt emails. If you're already encrypting, there's no reason not to sign as well, to give the recipient added assurance that the message is from you.</p>
-                                               <p>If you're using your email program (or wherever you have GnuPG set up) often, we recommend that you sign all outgoing messages because it turns you into an ambassador for GnuPG. Anyone can read a signed email, so it doesn't matter if the recipient doesn't yet know how to use email encryption. The more you encrypt the better, but you won't be able to do so unless the recipient has a public key. However, if you've set it up for an email program on your computer, but you primarily use email through your phone, then you'll only want to fire up the email program and use GnuPG for special occasions. If this describes you, we recommend you use </p>
+                                               <h3>When should I encrypt?</h3>
+ 
+                                               <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>
+                                       
                                        </div><!-- End .main -->
                                </div><!-- End #step-5a .step -->