Merge branch 'RELENG_2_3' of git.netgate.com:pfsense/pfsense into RELENG_2_3

3 files changed, 16 insertions, 10 deletions

diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php
index fe667af..d674440 100644
--- a/src/usr/local/www/crash_reporter.php
+++ b/src/usr/local/www/crash_reporter.php
@@ -135,8 +135,10 @@ exec("/bin/cat /tmp/PHP_errors.log", $php_errors);
 		if (count($php_errors) > 0) {
 			$crash_reports .= "\nPHP Errors:\n";
 			$crash_reports .= implode("\n", $php_errors) . "\n\n";
+		} else {
+			$crash_reports .= "\nNo PHP errors found.\n";
 		}
-		if (is_array($crash_files))	{
+		if (count($crash_files) > 0) {
 			foreach ($crash_files as $cf) {
 				if (filesize($cf) < FILE_SIZE) {
 					$crash_reports .= "\nFilename: {$cf}\n";
@@ -144,7 +146,7 @@ exec("/bin/cat /tmp/PHP_errors.log", $php_errors);
 				}
 			}
 		} else {
-			echo gettext("Could not locate any crash data.");
+			$crash_reports .= "\nNo FreeBSD crash data found.\n";
 		}
 ?>
 	<div class="panel panel-default">
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index f64df7b..40acdc6 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -533,7 +533,7 @@ function genhtmltitle($title) {
 		$bc = "";
 	}
 
-	return $heading . $bc;
+	return $bc;
 }
 
 /* update the changedesc and changecount(er) variables */
diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php
index 708cbe9..a20286e 100644
--- a/src/usr/local/www/system_advanced_network.php
+++ b/src/usr/local/www/system_advanced_network.php
@@ -199,23 +199,27 @@ $section->addInput(new Form_Checkbox(
 ))->setHelp('NOTE: This does not disable any IPv6 features on the firewall, it only '.
 	'blocks traffic.');
 
-$group = new Form_Group('IPv6 over IPv4 Tunneling');
+
+$group = new Form_Group('IPv6 over IPv4');
+
 $group->add(new Form_Checkbox(
 	'ipv6nat_enable',
 	'IPv6 over IPv4 Tunneling',
-	'Enable IPv4 NAT encapsulation of IPv6 packets',
+	'Enable IPv6 over IPv4 tunneling',
 	$pconfig['ipv6nat_enable']
 ));
 
 $group->add(new Form_Input(
 	'ipv6nat_ipaddr',
-	'IP address',
+	'IPv4 address of Tunnel Peer',
 	'text',
 	$pconfig['ipv6nat_ipaddr']
-))->setHelp('Enable IPv4 NAT encapsulation of IPv6 packets. <br/>This provides an '.
-	'RFC 2893 compatibility mechanism that can be used to tunneling IPv6 packets over '.
-	'IPv4 routing infrastructures. If enabled, don\'t forget to add a firewall rule to '.
-	'permit IPv6 packets.');
+));
+
+$group->setHelp('These options create an RFC 2893 compatible mechanism for IPv4 NAT encapsulation of IPv6 packets, ' .
+	'that can be used to tunnel IPv6 packets over IPv4 routing infrastructures. ' .
+	'IPv6 firewall rules are <a href="firewall_rules.php">also required</a>, to control and pass encapsulated traffic.');
+
 
 $section->add($group);