en: reword warnings about security flaws; move Enigmail warning to step 1.c in mac...

diff --git a/en/index.html b/en/index.html
index bc5bb4b324bfaa63a2b48b451c37efbdb71fad06..884079ac11f52726a8cca698b7d420cc78b68065 100644 (file)
--- a/en/index.html
+++ b/en/index.html
@@ -238,9 +238,12 @@ so, skip this step.</p>
 <p>If not, search "Enigmail" with the search bar in the upper right. You
 can take it from here. Restart your email program when you're done.</p>
 
-<p>There are major security flaws in Enigmail (prior to 2.0.7), GnuPG (prior to 2.2.8), and GPGTools (prior to 2018.3). Make sure you have the most recent version of Enigmail, GnuPG, and GPGTools.</p>
+<p>There are major security flaws in versions of GnuPG prior to 2.2.8, and
+Enigmail prior to 2.0.7. Make sure you have GnuPG 2.2.8 and Enigmail 2.0.7,
+or later versions.</p>
 
-<p>Note: As of June 18, 2018 GnuPG 2.2.8 is unavailable for Debian stable and testing.</p>
+<p>Note: As of June 18, 2018, GnuPG 2.2.8 is unavailable for Debian stable and
+testing.</p>
 
 
 <!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->

diff --git a/en/mac.html b/en/mac.html
index 3fda506325d8cea0708459a83cdef5aa8453b7e0..5456f1f0ff660919f538e145ca417025eebf8697 100644 (file)
--- a/en/mac.html
+++ b/en/mac.html
@@ -210,7 +210,8 @@ href="https://gpgtools.org/#gpgsuite">Download</a> and install it, choosing
 default options whenever asked. After it's installed, you can close any
 windows that it creates.</p>
 
-<p>There are major security flaws in GPGTools prior to version 2018.3. Make sure you have 2018.3 or a more recent version of GPGTools installed.
+<p>There are major security flaws in versions of GnuPG provided by GPGTools
+prior to 2018.3. Make sure you have GPGTools 2018.3 or later.</p>
 
 </div><!-- End .main -->
 </div><!-- End #step1-b .step -->
@@ -243,7 +244,8 @@ so, skip this step.</p>
 <p>If not, search "Enigmail" with the search bar in the upper right. You
 can take it from here. Restart your email program when you're done.</p>
 
-<p>There are major security flaws in Enigmail (prior to 2.0.7) and GnuPG (prior to 2.2.8). Make sure you have the most recent version of Enigmail and GnuPG.</p>
+<p>There are major security flaws in Enigmail prior to version 2.0.7. Make
+sure you have Enigmail 2.0.7 or later.</p>
 
 <!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
 <div class="troubleshooting">

diff --git a/en/windows.html b/en/windows.html
index b0a400d7c22e5de4a6aa8995a1e843f5ad7b751b..362b61a8b8b9b7423be19e9f0bd51572f74dbbbc 100644 (file)
--- a/en/windows.html
+++ b/en/windows.html
@@ -210,7 +210,8 @@ href="https://www.gpg4win.org/">Download</a> and install it, choosing default
 options whenever asked. After it's installed, you can close any windows that
 it creates.</p>
 
-<P>There are major security flaws in verions of GPG4Win prior to 3.1.2. Make sure you have 3.1.2 or higher installed.
+<p>There are major security flaws in versions of GnuPG provided by GPG4Win
+prior to 3.1.2. Make sure you have GPG4Win 3.1.2 or later.</p>
 
 </div><!-- End .main -->
 </div><!-- End #step1-b .step -->
@@ -243,7 +244,8 @@ so, skip this step.</p>
 <p>If not, search "Enigmail" with the search bar in the upper right. You
 can take it from here. Restart your email program when you're done.</p>
 
-<p>There are major security flaws in Enigmail (prior to 2.0.7) and GnuPG (prior to 2.2.8). Make sure you have the most recent version of Enigmail, GnuPG, and GPGTools.</p>
+<p>There are major security flaws in Enigmail prior to version 2.0.7. Make
+sure you have Enigmail 2.0.7 or later.</p>
 
 <!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
 <div class="troubleshooting">