From 5dfab7cdc2355e14c90b059499184de44ff61145 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Wed, 23 Nov 2016 11:59:18 +0100
Subject: [PATCH] Incorporate @Mcat12's comments

---
 help.php          | 29 +++++++++++++----------------
 js/pihole/help.js |  4 ++--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/help.php b/help.php
index fc6130e7..8c416647 100644
--- a/help.php
+++ b/help.php
@@ -29,7 +29,7 @@
     </ul>
     <h4>Top right: About</h4>
     <ul>
-        <li>GitHub: Link to pi-hole repository</li>
+        <li>GitHub: Link to the Pi-hole repository</li>
         <li>Details: Link to Jacob Salmela's blog with some more details, describing also the concept of the Pi-hole</li>
         <li>Updates: Link to list of releases</li>
         <li>Update notifications: If updates are available, a link will be shown here.</li>
@@ -39,14 +39,14 @@
 <div class="row">
     <div class="col-md-12">
     <h2>Main page</h2>
-    <p>On the main page, various statistics of pi-hole are shown to the user:</p>
+    <p>On the main page, you can see various Pi-hole statistics:</p>
     <ul>
-        <li>Summary: A summary of statistics showing how many out of how many total DNS queries have been blocked today, how that translates into a percentage and how many domains are on the blacklist. This graph is updated every 10 seconds. Changes are highlighted.</li>
-        <li>Queries over time: Diagram showing DNS queries (total and blocked) over 10 minute time intervals. More information can be acquired by hovering over the lines.</li>
-        <li>Query Types: Shows which types of query have been processed:
+        <li>Summary: A summary of statistics showing how many total DNS queries have been blocked today, what percentage of DNS queries have been blocked, and how many domains are in the compiled ad list. This summary is updated every 10 seconds.</li>
+        <li>Queries over time: Graph showing DNS queries (total and blocked) over 10 minute time intervals. More information can be acquired by hovering over the lines.</li>
+        <li>Query Types: Identifies the types of processed queries:
             <ul>
-                <li>A: IPv4 address lookup (most commonly used to map hostnames to an IP address of the host)</li>
-                <li>AAAA: IPv6 address lookup (most commonly used to map hostnames to an IP address of the host)</li>
+                <li>A: address lookup (most commonly used to map hostnames to an IPv4 address of the host)</li>
+                <li>AAAA: address lookup (most commonly used to map hostnames to an IPv6 address of the host)</li>
                 <li>PTR: most common use is for implementing reverse DNS lookups</li>
                 <li>SRV: Service locator (often used by XMPP, SIP, and LDAP)</li>
                 <li>and others</li>
@@ -55,14 +55,14 @@
         <li>Query Types: Shows to which upstream DNS the permitted requests have been forwarded to.</li>
         <li>Top Domains: Ranking of requested sites by number of DNS lookups.</li>
         <li>Top Advertisers: Ranking of requested advertisements by number of DNS lookups.</li>
-        <li>Top Clients: Ranking of total DNS requests separated by clients on the local network.</li>
+        <li>Top Clients: Ranking of how many DNS requests each client has made on the local network.</li>
     </ul>
     </div>
 </div>
 <div class="row">
     <div class="col-md-12">
     <h2>Query Log</h2>
-    <p>Shows the recent queries after parsing the pi-hole log files. It is possible to search through the whole list by using the "Search" input field. If the status is reported as "OK", then the DNS request has been permitted. Otherwise ("Pi-holed") it has been blocked. By clicking on the buttons under "Action" the corresponding domains can quickly be added to the white-/blacklist. The status of this action will be reported on this page.</p>
+    <p>Shows the recent queries by parsing Pi-hole's log. It is possible to search through the whole list by using the "Search" input field. If the status is reported as "OK", then the DNS request has been permitted. Otherwise ("Pi-holed") it has been blocked. By clicking on the buttons under "Action" the corresponding domains can quickly be added to the white-/blacklist. The status of the action will be reported on this page.</p>
     </div>
 </div>
 <div class="row">
@@ -80,13 +80,13 @@
 <div class="row">
     <div class="col-md-12">
     <h2>Disable / Enable</h2>
-    Disables resp. enables Pi-Hole DNS Blocking completely. The change will be reflected by a changed status (top left)
+    Disables/enables Pi-Hole blocking completely. You may have to wait a few minutes for the changes to reach all of your devices. The change will be reflected by a changed status (top left)
     </div>
 </div>
 <div class="row">
     <div class="col-md-12">
     <h2>Donate</h2>
-    If you like Pi-Hole, please consider a small donation. Keep in mind that Pi-hole is free, but powered by your donations
+    Keep in mind that Pi-hole is free. If you like Pi-hole, please consider a small donation to help support its development
     </div>
 </div>
 <div class="row">
@@ -104,7 +104,7 @@
 <div class="row">
     <div class="col-md-12">
     <h2>Emergency help</h2>
-    In case the web UI does not work properly anymore (i.e. timeout errors or diagrams not showing up) you can try to flush the Pi-hole config file by clicking <a href="#" id="flush">FLUSH</a>. Note that your statistics will be reset and you loose the statistics of the day until now.
+    In case the web UI does not work properly anymore (i.e. timeout errors or diagrams not showing up) you can try to flush the Pi-hole config file by clicking <a href="#" id="flush">FLUSH</a>. Note that your statistics will be reset and you lose the statistics up to this point.
     </div>
 </div>
 
@@ -112,10 +112,7 @@
     // Web based flushing of pi-hole log file
     if (isset($_GET["flush"]))
     {
-        if($_GET["flush"] == "true")
-        {
-            exec("sudo pihole -f");
-        }
+        exec("sudo pihole -f");
     }
 
     require "footer.php";
diff --git a/js/pihole/help.js b/js/pihole/help.js
index 8264b88c..086759a0 100644
--- a/js/pihole/help.js
+++ b/js/pihole/help.js
@@ -1,6 +1,6 @@
 $( "#flush" ).click(function() {
-    if (confirm("Are you sure you want to flush the pi-hole log file?")) {
-        document.location.href="help.php?flush=true";
+    if (confirm("Are you sure you want to flush the Pi-hole log file?")) {
+        document.location.href="help.php?flush";
     } else {
         // Do nothing!
     }