commit

diff --git a/en/workshops.html b/en/workshops.html
index 7bf32568327f588c28b9e9e2982e0b83e3804540..7b08d097a8f1505259ae1b05731704e7b0ff68d9 100644 (file)
--- a/en/workshops.html
+++ b/en/workshops.html
@@ -142,51 +142,19 @@ step towards protecting their privacy with free software.
                        </div>
                </section><!-- End #section2 -->
 
-<!-- ~~~~~~~~~ Section 2: Follow The Guide  ~~~~~~~~~ -->
+<!-- ~~~~~~~~~ Section 3: Follow The Guide  ~~~~~~~~~ -->
                <section class="row" id="section3">
                        <div>
                                        <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
                                <div class="section-intro">
-                                               <h2><em>#2</em> Follow The Guide</h2>
-                                               <p>Have the participants work through the Email Self-Defense guide a step at a time on their own computers. Make sure all participants complete each step before the group moves on to the next step. Talk about each step, but be sure not to overload the participants with minutia. Pitch the bulk of your instruction to the least tech-savvy participants. Consider holding a secondary workshop afterwards for the outliers in either direction.</p>
+                                               <h2><em>#3</em> Follow the guide as a group</h2>
+                                               <p>Work through the Email Self-Defense guide a step at time as a group. Talk about the steps in detail, but make sure not to overload the participants with minutia. Pitch the bulk of your instructions to the least tech-savvy participants. Make sure all the participants complete each step before the group moves on to the next one. Consider facilitating secondary workshops afterwards for people that had trouble grasping the concepts, or those that grasped them quickly and want to learn more.</p>
+                                               <p>Even powerful surveillance systems can't break private keys when they're protected by lengthy Diceware passphrases. Make sure participants use the Diceware method, if dice are available. Stress the importance of eventually destroying the piece of paper the Diceware password is written on, and make sure all the participants back up their revocation certificates.</p>
+                                               <p>In step 2, make sure the participants upload their keys to the same keyserver so that they can immediately download each other's keys later (sometimes there is a delay in synchronization between keyservers). During Step 3, give the participants the option to send encrypted messages to each other instead of or as well as Edward. Similarly, in Step 4, encourage the participants to sign each other's keys.</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="Try it out."></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 2.a</em> Public and Private Keys key</h3>
-                                               <p>Make sure all the participants have a conceptual understanding of the relationship between public and private keys in a keypair. It's normal for people to not understand public-key cryptography on the first try. Use analogies to help explain the concept.</p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-2a .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-2b" 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>Step 2.b</em> Diceware and Passphrases</h3>
-                                                       <p>Sufficiently strong passphrases <a href="https://firstlook.org/theintercept/2015/03/26/passphrases-can-memorize-attackers-cant-guess/"> can't easily be brute forced</a>, and thus protect the private key even if it falls into the wrong hands. Recommend participants use the <a href="http://world.std.com/~reinhold/diceware.html"> diceware method </a>, and have dice and the wordlist available for them to use. Participants who choose to use diceware should keep their passphrase with them at all at all times until they memorize it. Stress the importance of creating and backing up revocation certificates, especially to participants who write down their diceware passphrases.</p>
-                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Disclaimer</h4>
-                                                       <dl>
-                                                               <dt>Diceware and Licensing</dt>
-                                                                       <dd>Something here about diceware's relationship with free software, or something.</dd>
-                                                       </dl>
-                                               </div><!-- /.troubleshooting -->
-
-                                               </div><!-- End .main -->
-                                       </div><!-- End #step-3b .step -->
-
-
                        </div>
-               </section><!-- End #section3 -->
+               </section>
 
 
 <!-- ~~~~~~~~~ Section 3: Sign Keys  ~~~~~~~~~ -->