touch up text

Ticket #1569

4 files changed, 16 insertions, 16 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 2a8a773..61361dd 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1004,7 +1004,7 @@ function convert_config() {
 		$rule_item['type'] = "pass";
 		$rule_item['source']['any'] = true;
 		$rule_item['destination']['any'] = true;
-		$rule_item['descr'] = "Permit IPSEC traffic.";
+		$rule_item['descr'] = "Permit IPsec traffic.";
 		$rule_item['statetype'] = "keep state";
 		$a_filter[] = $rule_item;
 		$config['version'] = "2.9";
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index b235f54..114c25d 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2898,7 +2898,7 @@ EOD;
 			foreach ($config['ipsec']['tunnel'] as $tunnel) {
 				if(isset($tunnel['disabled']))
 					continue;
-				update_filter_reload_status("Creating IPSEC tunnel items {$tunnel['descr']}...");
+				update_filter_reload_status("Creating IPsec tunnel items {$tunnel['descr']}...");
 				/* if tunnel is disabled, lets skip to next item */
 				$ipsec_ips = array(get_current_wan_address($tunnel['interface']));
 				/* is this a dynamic dns hostname? */
@@ -2921,15 +2921,15 @@ EOD;
 							continue;
 						if(!$remote_gateway) 
 							continue;
-						$ipfrules .= "pass out quick on \${$iface} proto udp from any to {$remote_gateway} port = 500 keep state label \"IPSEC: {$tunnel['descr']} - outbound isakmp\"\n";
-						$ipfrules .= "pass in quick on \${$iface} proto udp from {$remote_gateway} to any port = 500 keep state label \"IPSEC: {$tunnel['descr']} - inbound isakmp\"\n";
+						$ipfrules .= "pass out quick on \${$iface} proto udp from any to {$remote_gateway} port = 500 keep state label \"IPsec: {$tunnel['descr']} - outbound isakmp\"\n";
+						$ipfrules .= "pass in quick on \${$iface} proto udp from {$remote_gateway} to any port = 500 keep state label \"IPsec: {$tunnel['descr']} - inbound isakmp\"\n";
 						if ($tunnel['p2']['protocol'] == 'esp') {
-							$ipfrules .= "pass out quick on \${$iface} proto esp from any to {$remote_gateway} keep state label \"IPSEC: {$tunnel['descr']} - outbound esp proto\"\n";
-							$ipfrules .= "pass in quick on \${$iface} proto esp from {$remote_gateway} to any keep state label \"IPSEC: {$tunnel['descr']} - inbound esp proto\"\n";
+							$ipfrules .= "pass out quick on \${$iface} proto esp from any to {$remote_gateway} keep state label \"IPsec: {$tunnel['descr']} - outbound esp proto\"\n";
+							$ipfrules .= "pass in quick on \${$iface} proto esp from {$remote_gateway} to any keep state label \"IPsec: {$tunnel['descr']} - inbound esp proto\"\n";
 						}
 						if ($tunnel['p2']['protocol'] == 'ah') {
-							$ipfrules .= "pass out quick on \${$iface} proto ah from any to {$remote_gateway} keep state label \"IPSEC: {$tunnel['descr']} - outbound ah proto\"\n";
-							$ipfrules .= "pass in quick on \${$iface} proto ah from {$remote_gateway} to any keep state label \"IPSEC: {$tunnel['descr']} - inbound ah proto\"\n";
+							$ipfrules .= "pass out quick on \${$iface} proto ah from any to {$remote_gateway} keep state label \"IPsec: {$tunnel['descr']} - outbound ah proto\"\n";
+							$ipfrules .= "pass in quick on \${$iface} proto ah from {$remote_gateway} to any keep state label \"IPsec: {$tunnel['descr']} - inbound ah proto\"\n";
 						}
 					}
 				}
@@ -2942,9 +2942,9 @@ EOD;
 		$ipseccfg = $config['ipsec'];
 		if (isset($ipseccfg['mobileclients']['enable'])) {
 			foreach($ifdescrs as $iface) {
-				$ipfrules .= "pass in quick on \${$iface} proto udp from any to any port = 500 keep state label \"IPSEC: Mobile - inbound isakmp\"\n";
-				$ipfrules .= "pass in quick on \${$iface} proto esp from any to any keep state label \"IPSEC: Mobile - inbound esp proto\"\n";
-				$ipfrules .= "pass in quick on \${$iface} proto ah from any to any  keep state label \"IPSEC: Mobile - inbound ah proto\"\n";
+				$ipfrules .= "pass in quick on \${$iface} proto udp from any to any port = 500 keep state label \"IPsec: Mobile - inbound isakmp\"\n";
+				$ipfrules .= "pass in quick on \${$iface} proto esp from any to any keep state label \"IPsec: Mobile - inbound esp proto\"\n";
+				$ipfrules .= "pass in quick on \${$iface} proto ah from any to any  keep state label \"IPsec: Mobile - inbound ah proto\"\n";
 			}
 		}
 	}
@@ -3067,7 +3067,7 @@ function create_firewall_outgoing_rules_to_itself() {
 		$ints = array();
 		$int = filter_translate_type_to_real_interface($ifname);
 		/* if the interface is pppoe, set the ng0 interface */
-		update_filter_reload_status("Creating IPSEC tunnel items {$tunnel['descr']}...");
+		update_filter_reload_status("Creating IPsec tunnel items {$tunnel['descr']}...");
 		$ip = find_interface_ip($int);
 		if ($config['interfaces'][$ifname]['ipaddr'] == "pppoe")
 			$int = " { " . filter_translate_type_to_real_interface($ifname) . " ng0 } ";
@@ -3154,7 +3154,7 @@ function create_firewall_outgoing_rules_to_itself() {
 	}
 
 	/* permit internal ipsec outbound traffic */
-	$rule .="pass out quick on \$enc0 keep state label \"IPSEC internal host to host\"";
+	$rule .="pass out quick on \$enc0 keep state label \"IPsec internal host to host\"";
 
 	return $rule;
 }
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 8a51674..2b64b80 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -3049,7 +3049,7 @@ function enable_rrd_graphing() {
 		);
 		$ifdescrs = get_interface_list(true, true, $vfaces);
 		$ifdescrs['enc0']['friendly'] = "ipsec";
-		$ifdescrs['enc0']['descr'] = "IPSEC";
+		$ifdescrs['enc0']['descr'] = "IPsec";
 		$ifdescrs['enc0']['up'] = true;
 
 		foreach ($ifdescrs as $realif => $ifdescr) {
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 0ecd43d..2a6ecf0 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1316,7 +1316,7 @@ EOD;
 	return 0;
 }
 
-/* Forcefully restart IPSEC
+/* Forcefully restart IPsec
  * This is required for when dynamic interfaces reload
  * For all other occasions the normal vpn_ipsec_configure()
  * will gracefully reload the settings without restarting
@@ -1341,7 +1341,7 @@ function vpn_ipsec_force_reload() {
 
 	/* if ipsec is enabled, start up again */
 	if (isset($ipseccfg['enable'])) {
-		log_error("Forcefully reloading IPSEC racoon daemon");
+		log_error("Forcefully reloading IPsec racoon daemon");
 		vpn_ipsec_configure();
 	}