Improve - System - General - DNS Server Settings descriptions

- Add missing DNS Resolver references
- Nuke PPTP VPN mentions
- Use letter case consistently.

The "Disable DNS Forwarder" option naming is rather unfortunate as well (would be much better with something like "Use local DNS server"), but changing that would require documentation changes.
(cherry picked from commit a56e37ca671873418e82382a8466b8014bf4bc83)

1 files changed, 7 insertions, 6 deletions

diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php
index c44851f..5da9bae 100644
--- a/src/usr/local/www/system.php
+++ b/src/usr/local/www/system.php
@@ -423,7 +423,8 @@ for ($i=1; $i<5; $i++) {
 	))->setHelp(($i == 4) ? 'Address':null);
 
 	$help = "Enter IP addresses to be used by the system for DNS resolution. " .
-		"These are also used for the DHCP service, DNS forwarder and for PPTP VPN clients.";
+		"These are also used for the DHCP service, DNS Forwarder and DNS Resolver " .
+		"(if it has DNS Query Forwarding enabled).";
 
 	if ($multiwan)	{
 		$options = array('none' => 'none');
@@ -465,18 +466,18 @@ $section->addInput(new Form_Checkbox(
 	$pconfig['dnsallowoverride']
 ))->setHelp(sprintf(gettext('If this option is set, %s will use DNS servers '.
 	'assigned by a DHCP/PPP server on WAN for its own purposes (including '.
-	'the DNS forwarder). However, they will not be assigned to DHCP and PPTP '.
-	'VPN clients.'), $g['product_name']));
+	'the DNS Forwarder/DNS Resolver). However, they will not be assigned to DHCP '.
+	'clients.'), $g['product_name']));
 
 $section->addInput(new Form_Checkbox(
 	'dnslocalhost',
 	'Disable DNS Forwarder',
-	'Do not use the DNS Forwarder as a DNS server for the firewall',
+	'Do not use the DNS Forwarder/DNS Resolver as a DNS server for the firewall',
 	$pconfig['dnslocalhost']
 ))->setHelp('By default localhost (127.0.0.1) will be used as the first DNS '.
 	'server where the DNS Forwarder or DNS Resolver is enabled and set to '.
-	'listen on Localhost, so system can use the local DNS service to perform '.
-	'lookups. Checking this box omits localhost from the list of DNS servers.');
+	'listen on localhost, so system can use the local DNS service to perform '.
+	'lookups. Checking this box omits localhost from the list of DNS servers in resolv.conf.');
 
 $form->add($section);