From 348327b7c0d7f9707c7b82b7763ad403e3673e35 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Tue, 8 Jan 2008 02:40:59 +0000
Subject: touch up text

Ticket #1569
---
 usr/local/pkg/sasyncd.xml                                | 4 ++--
 usr/local/www/fbegin.inc                                 | 4 ++--
 usr/local/www/guiconfig.inc                              | 2 +-
 usr/local/www/widgets/include/ipsec.inc                  | 2 +-
 usr/local/www/widgets/widgets/ipsec.widget.php           | 8 ++++----
 usr/local/www/widgets/widgets/services_status.widget.php | 2 +-
 usr/local/www/wizards/traffic_shaper_wizard.inc          | 8 ++++----
 usr/local/www/wizards/traffic_shaper_wizard.xml          | 6 +++---
 8 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'usr')

diff --git a/usr/local/pkg/sasyncd.xml b/usr/local/pkg/sasyncd.xml
index 94d3fe4..99b650c 100644
--- a/usr/local/pkg/sasyncd.xml
+++ b/usr/local/pkg/sasyncd.xml
@@ -10,7 +10,7 @@
 	<!-- Menu is where this packages menu will appear -->
 	<menu>
 	    <name>VPN failover</name>
-	    <tooltiptext>The sasyncd daemon synchronizes IPSec SA and SPD information between a number of failover IPsec gateways.  The most typical scenario is to run sasyncd on hosts also running isakmpd and sharing a common IP-address using carp.</tooltiptext>
+	    <tooltiptext>The sasyncd daemon synchronizes IPsec SA and SPD information between a number of failover IPsec gateways.  The most typical scenario is to run sasyncd on hosts also running isakmpd and sharing a common IP-address using carp.</tooltiptext>
 	    <section>Services</section>
 	    <configfile>sasyncd.xml</configfile>
 	</menu>
@@ -42,7 +42,7 @@
 		<url>vpn_ipsec_ca.php</url>
 	    </tab>
 	    <tab>
-		<text>Failover IPSEC</text>
+		<text>Failover IPsec</text>
 		<url>/pkg_edit.php?xml=sasyncd.xml&amp;id=0</url>
 		<active/>
 	    </tab>
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index e87a61c..6500b88 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -187,7 +187,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 					<li class="drop">
 						<div>VPN</div>
 						<ul class="subdrop">
-							<?=output_menu_item("/vpn_ipsec.php", "IPSec");?>
+							<?=output_menu_item("/vpn_ipsec.php", "IPsec");?>
 							<?=output_menu_item("/pkg.php?xml=openvpn.xml", "OpenVPN");?>
 							<?=output_menu_item("/vpn_pptp.php", "PPTP");?>
 							<?php echo return_ext_menu("VPN"); ?>
@@ -204,7 +204,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 							<?=output_menu_item("/diag_dhcp_leases.php", "DHCP Leases");?>
 							<?=output_menu_item("/status_filter_reload.php", "Filter Reload");?>
 							<?=output_menu_item("/status_interfaces.php", "Interfaces");?>
-							<?=output_menu_item("/diag_ipsec.php", "IPSec");?>
+							<?=output_menu_item("/diag_ipsec.php", "IPsec");?>
 							<?=output_menu_item("/status_slbd_pool.php", "Load Balancer");?>
 							<?php if($g['platform'] == "pfSense"): ?>
 							<?=output_menu_item("/diag_pkglogs.php", "Package Logs");?>
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 5d22844..41edb6e 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -135,7 +135,7 @@ $wkports = array(3389 => "MS RDP",
 	1813 => "Radius-accounting",
 	3000 => "HBCI",
 	3478 => "STUN",
-	4500 => "IPSec NAT-T",
+	4500 => "IPsec NAT-T",
 	5004 => "RTP",
 	5060 => "SIP",
 	5190 => "ICQ",
diff --git a/usr/local/www/widgets/include/ipsec.inc b/usr/local/www/widgets/include/ipsec.inc
index f850e28..6f1a8c1 100644
--- a/usr/local/www/widgets/include/ipsec.inc
+++ b/usr/local/www/widgets/include/ipsec.inc
@@ -1,6 +1,6 @@
 <?php
 //set variable for custom title
-$ipsec_title = "IPSec";
+$ipsec_title = "IPsec";
 
 function get_ipsec_tunnel_sad() {
 	/* query SAD */
diff --git a/usr/local/www/widgets/widgets/ipsec.widget.php b/usr/local/www/widgets/widgets/ipsec.widget.php
index 2020093..4442468 100644
--- a/usr/local/www/widgets/widgets/ipsec.widget.php
+++ b/usr/local/www/widgets/widgets/ipsec.widget.php
@@ -103,7 +103,7 @@ require_once("/usr/local/www/widgets/include/ipsec.inc");
 			              Note:<br />
 			            </strong>
 			          </span>
-			          You can configure your IPSEC 
+			          You can configure your IPsec 
 			          <a href="vpn_ipsec.php">here</a>.
 				</span>
 		      </p>
@@ -176,7 +176,7 @@ require_once("/usr/local/www/widgets/include/ipsec.inc");
 	              Note:<br />
 	            </strong>
 	          </span>
-	          You can configure your IPSEC 
+	          You can configure your IPsec 
 	          <a href="vpn_ipsec.php">here</a>.
 	        </span>
 	      </p>
@@ -196,10 +196,10 @@ else { ?>
 	        <span class="vexpl">
 	          <span class="red">
 	            <strong>
-	              Note: There are no configured IPSec Tunnels<br />
+	              Note: There are no configured IPsec Tunnels<br />
 	            </strong>
 	          </span>
-	          You can configure your IPSEC 
+	          You can configure your IPsec 
 	          <a href="vpn_ipsec.php">here</a>.
 	        </span>
 	      </p>
diff --git a/usr/local/www/widgets/widgets/services_status.widget.php b/usr/local/www/widgets/widgets/services_status.widget.php
index 9370c0f..8e687ca 100644
--- a/usr/local/www/widgets/widgets/services_status.widget.php
+++ b/usr/local/www/widgets/widgets/services_status.widget.php
@@ -118,7 +118,7 @@ if($config['installedpackages']['miniupnpd']['config'][0]['enable']) {
 
 if (isset($config['ipsec']['enable'])) {
     $pconfig2['name'] = "racoon";
-    $pconfig2['description'] = gettext("IPSEC VPN");
+    $pconfig2['description'] = gettext("IPsec VPN");
     $services[] = $pconfig2;
     unset($pconfig2);
 }
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc
index fe571c7..9626c43 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard.inc
@@ -936,10 +936,10 @@ function step7_stepsubmitphpaction() {
                 }
 
 		if($_POST['ipsec'] != "") {
-		    /* IPSEC */
-		    $othersplist[] = array('IPSEC', 'udp', '500', '500', 'both', $_POST['ipsec']);
-		    $othersplist[] = array('IPSEC', 'ah', '', '', 'both', $_POST['ipsec']);
-		    $othersplist[] = array('IPSEC', 'esp', '', '', 'both', $_POST['ipsec']);
+		    /* IPsec */
+		    $othersplist[] = array('IPsec', 'udp', '500', '500', 'both', $_POST['ipsec']);
+		    $othersplist[] = array('IPsec', 'ah', '', '', 'both', $_POST['ipsec']);
+		    $othersplist[] = array('IPsec', 'esp', '', '', 'both', $_POST['ipsec']);
 		}
 
 		if($_POST['streamingmp3'] != "") {
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml
index 24e2267..e98bf3d 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard.xml
@@ -684,7 +684,7 @@
                         <type>checkbox</type>
                         <typehint>Other networking protocols</typehint>
                         <description>This will help raise or lower the priority of other protocols higher than most traffic.</description>
-			<enablefields>AIM,AppleRemoteDesktop,DNS,HTTP,ICMP,ICQ,IMAP,IPSEC,IRC,Jabber,LotusNotes,MSN,MSRDP,MySqlServer,PCAnywhere,POP3,PPTP,RTSP,SMB,SMTP,SNMP,StreamingMP3,TeamSpeak,VNC,NNTP,CVSUP,HBCI</enablefields>
+			<enablefields>AIM,AppleRemoteDesktop,DNS,HTTP,ICMP,ICQ,IMAP,IPsec,IRC,Jabber,LotusNotes,MSN,MSRDP,MySqlServer,PCAnywhere,POP3,PPTP,RTSP,SMB,SMTP,SNMP,StreamingMP3,TeamSpeak,VNC,NNTP,CVSUP,HBCI</enablefields>
 			<donotdisable>true</donotdisable>
 			<bindstofield>ezshaper->step7->enable</bindstofield>
                 </field>
@@ -925,7 +925,7 @@
 			<typehint>Microsoft Point to Point tunneling protocol</typehint>
                 </field>
                 <field>
-                        <name>IPSEC</name>
+                        <name>IPsec</name>
 			<type>select</type>
 			<bindstofield>ezshaper->step7->ipsec</bindstofield>
 			<options>
@@ -942,7 +942,7 @@
 					<value>L</value>
 				</option>
 			</options>
-			<typehint>IPSEC VPN traffic</typehint>
+			<typehint>IPsec VPN traffic</typehint>
                 </field>
                 <field>
                         <name>Multimedia/Streaming</name>
-- 
cgit v1.1