updated ESD taking into account feedback from translator list on organization of...

diff --git a/en/index.html b/en/index.html
index 6f99749d12b4b8e2967f1eb3dc8ff272e833dfb7..d7c1bc526fc16f20073874fa5db194fb11181046 100644 (file)
--- a/en/index.html
+++ b/en/index.html
@@ -157,9 +157,6 @@ but provide extra features.</p>
 <p>If you already have an email program, you can skip to <a
 href="#step-1b">Step 1.b</a>.</p>
 
-<p class="notes">There are serious security flaws in GnuPG versions prior to 2.2.8. Install GnuPG versions 2.2.8 or 1.4.23 or later. There are also known issues with GPGTools prior to 2018.3. Make sure you have the most recent version of GPGTools.</p>
-
-
 </div><!-- End .section-intro -->
 
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
@@ -241,7 +238,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>Enigmail versions prior to 2.0.7 have serious security issues. Make sure to install version 2.0.7 or later.</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>
+
 
 <!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
 <div class="troubleshooting">

diff --git a/en/mac.html b/en/mac.html
index 65f03fdda97cd3c08894eb9408b9b4d6f1e311a3..3fda506325d8cea0708459a83cdef5aa8453b7e0 100644 (file)
--- a/en/mac.html
+++ b/en/mac.html
@@ -155,8 +155,6 @@ you can access in a browser (like Gmail), but provide extra features.</p>
 <p>If you already have an email program, you can skip to <a
 href="#step-1b">Step 1.b</a>.</p>
 
-<p class="notes">There are serious security flaws in GnuPG versions prior to 2.2.8. Install GnuPG versions 2.2.8 or 1.4.23 or later. There are also known issues with GPGTools prior to 2018.3. Make sure you have the most recent version of GPGTools.</p>
-
 </div><!-- End .section-intro -->
 
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
@@ -212,6 +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.
+
 </div><!-- End .main -->
 </div><!-- End #step1-b .step -->
 
@@ -243,7 +243,7 @@ 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>Enigmail versions prior to 2.0.7 have serious security issues. Make sure to install version 2.0.7 or later.</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>
 
 <!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
 <div class="troubleshooting">

diff --git a/en/windows.html b/en/windows.html
index a031a8d50c3c24e6b2e825e1ade28550a339c491..b0a400d7c22e5de4a6aa8995a1e843f5ad7b751b 100644 (file)
--- a/en/windows.html
+++ b/en/windows.html
@@ -155,8 +155,6 @@ you can access in a browser (like Gmail), but provide extra features.</p>
 <p>If you already have an email program, you can skip to <a
 href="#step-1b">Step 1.b</a>.</p>
 
-<p class="notes">There are serious security flaws in GnuPG versions prior to 2.2.8. Install GnuPG versions 2.2.8 or 1.4.23 or later. There are also known issues with GPGTools prior to 2018.3. Make sure you have the most recent version of GPGTools.</p>
-
 </div><!-- End .section-intro -->
 
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
@@ -212,6 +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.
+
 </div><!-- End .main -->
 </div><!-- End #step1-b .step -->
 
@@ -243,7 +243,7 @@ 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>Enigmail versions prior to 2.0.7 have serious security issues. Make sure to install version 2.0.7 or later.</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>
 
 <!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
 <div class="troubleshooting">