Update the JavaScript Guide tab.

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 95f0f031062694350692a50d7adca27d559d5d41..1caa1363c93b174a058995cdabc9773e123ab3bc 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

diff --git a/app/src/main/assets/en/guide_javascript.html b/app/src/main/assets/en/guide_javascript.html
index d7c3757fad2a1994993a57ff22d13473c7c9cf3d..43cc53924602e1a2a86cd30ff7840e09dc17c44d 100644 (file)
--- a/app/src/main/assets/en/guide_javascript.html
+++ b/app/src/main/assets/en/guide_javascript.html
@@ -72,7 +72,6 @@
 
         <p>Browsing the internet with JavaScript disabled, and only enabling it if needed, goes a long way to protecting user privacy. In addition, JavaScript
             is used to load much of the annoying advertisements and extra cruft that comes along with most modern websites. With it disabled, websites will
-            load faster, consume less network traffic, and contain less annoying advertisements, instead of those that do things like cover up the text of the
-            entire web page.</p>
+            load faster, consume less network traffic, and contain less annoying advertisements, like those that cover up the text of the entire web page.</p>
     </body>
 </html>
\ No newline at end of file

diff --git a/app/src/main/assets/en/guide_ssl_certificate_pinning.html b/app/src/main/assets/en/guide_ssl_certificate_pinning.html
index 429eb8da1db5247aa3e63427644df3835b58551f..df3271bbfab622bbdf56c419e504031989b28cf8 100644 (file)
--- a/app/src/main/assets/en/guide_ssl_certificate_pinning.html
+++ b/app/src/main/assets/en/guide_ssl_certificate_pinning.html
@@ -44,18 +44,18 @@
         <h3><img class="title" src="images/ic_vpn_lock_dark_blue.png"> Know Where You’re Going</h3>
 
         <p>When visiting an encrypted URL (one that begins with HTTPS), the webserver uses an SSL certificate to both encrypt the information sent to the browser and to identify the server.
-            The purpose of the server identification is to prevent a machine located between the browser and the webserver from intercepting the traffic in transit, pretending to be the server, and decrypting the information as it is passed along.
-            This type of attack is known as a Man In The Middle (MITM) attack.  SSL certificates are generated by certificate authorities: companies that verify a server’s identity and produce a certificate for a fee.
+            The purpose of the server identification is to prevent a machine located between the browser and the webserver from pretending to be the server and decrypting the information in transit.
+            This type of attack is known as a Man In The Middle (MITM) attack. SSL certificates are generated by certificate authorities: companies that verify a server’s identity and produce a certificate for a fee.
             Android has a list of trusted certificate authorities, and will accept any of their certificates for any website.
             It isn’t supposed to be possible for an organization to acquire an SSL certificate for a domain they do not control, but in practice many governments and large corporations have been able to do so.</p>
 
-        <p>The purpose of SSL certificate pinning is to tell the browser that only one specific SSL certificate is to be trusted for a particular domain.  Any other valid certificate will be rejected.</p>
+        <p>The purpose of SSL certificate pinning is to tell the browser that only one specific SSL certificate is to be trusted for a particular domain. Any other certificate, even if it is valid, will be rejected.</p>
 
         <p><img class="center" src="images/ssl_certificate_mismatch.png"></p>
 
         <p>SSL certificates expire on a specified date, so even pinned SSL certificates will legitimately need to be updated from time to time.
             As a general rule, pinning SSL certificates probably isn’t needed in the majority of cases.
-            But for those connecting to their own servers, or for those who suspect that powerful organizations may be targeting them directly, SSL certificate pinning can detect and thwart a MITM attack.</p>
+            But for those who suspect that powerful organizations may be targeting them, SSL certificate pinning can detect and thwart a MITM attack.</p>
 
         <p><img class="center" src="images/pinned_ssl_certificate.png"></p>