I don't understand what I am committing.

diff --git a/index.html b/index.html
index cd4cfa8adce4d343f1b9b881da161939d36a2a1f..01e6ba1aff6f77dc9c8386a1c02bf53082b69a90 100644 (file)
--- a/index.html
+++ b/index.html
@@ -180,6 +180,29 @@
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
                                </div><!-- End #step-2a .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 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>
+                                               <!-- ~~~~~~~~~ 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 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  -->
+
                        </div>
                </section><!-- End #section2 -->
 
@@ -231,6 +254,15 @@
                                                </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> Subject lines are not encrypted</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.</p>
+                                       </div><!-- End .main -->
+                               </div><!-- End #step-headers_unencrypted .step-->
+
+
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-3c" class="step">
                                        <div class="main">