From: Zak Rogoff <zak@fsf.org>
Date: Wed, 18 Jun 2014 16:12:35 +0000 (-0400)
Subject: Section 2: Adding terminology step to explain OpenPGP vs GnuPG.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=548ae59b7b930f8e3cd60e77f7f6fd3090f25dfc;p=enc-live.git

Section 2: Adding terminology step to explain OpenPGP vs GnuPG.
---

diff --git a/index.html b/index.html
index 994afc7..fed3e38 100644
--- a/index.html
+++ b/index.html
@@ -166,15 +166,15 @@
     <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 &rarr; Setup Wizard.</dd>
-    <dt>What does OpenPGP mean?</dt>
-
-                                         <dd>OpenPGP is a protocol that GnuPG uses, just like HTTP is a protocol for the Web. It's a slightly confusing name that Enigmail uses for its menus.</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-2a .step  -->
+
+				<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
 				<div id="step-2b" class="step">
 					<div class="main">
 						<h3><em>Step 2.b</em> Upload your public key to a keyserver</h3>
@@ -195,11 +195,16 @@
 
 							</dl>
 						</div><!-- /.troubleshooting -->
-
-
-
 					</div><!-- End .main -->
 				</div><!-- End #step-2a .step  -->
+				<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+				<div id="terminology" class="step">
+					<div class="main">
+						<h3>GnuPG, OpenPGP, what?</h3>
+						<p>You're using a program called GnuPG, but the menu in your email program is called OpenPGP. Confusing, right? In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are used interchangeably, though they all have slightly different meanings.</p>
+					</div><!-- End .main -->
+				</div><!-- End #terminology.step-->
+
 
 			</div>
 		</section><!-- End #section2 -->
diff --git a/mac.html b/mac.html
index c7e36ce..a0824ac 100644
--- a/mac.html
+++ b/mac.html
@@ -207,7 +207,13 @@
 
 					</div><!-- End .main -->
 				</div><!-- End #step-2a .step  -->
-
+				<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+				<div id="terminology" class="step">
+					<div class="main">
+						<h3>GnuPG, OpenPGP, what?</h3>
+						<p>You're using a program called GnuPG, but the menu in your email program is called OpenPGP. Confusing, right? In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are used interchangeably, though they all have slightly different meanings.</p>
+					</div><!-- End .main -->
+				</div><!-- End #terminology.step-->
 			</div>
 		</section><!-- End #section2 -->
 
diff --git a/windows.html b/windows.html
index 4a7abc5..5391dac 100644
--- a/windows.html
+++ b/windows.html
@@ -205,7 +205,13 @@
 
 					</div><!-- End .main -->
 				</div><!-- End #step-2a .step  -->
-
+				<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+				<div id="terminology" class="step">
+					<div class="main">
+						<h3>GnuPG, OpenPGP, what?</h3>
+						<p>You're using a program called GnuPG, but the menu in your email program is called OpenPGP. Confusing, right? In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are used interchangeably, though they all have slightly different meanings.</p>
+					</div><!-- End .main -->
+				</div><!-- End #terminology.step-->
 			</div>
 		</section><!-- End #section2 -->