summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2013-08-01 21:56:41 -0500
committerChris Buechler <cmb@pfsense.org>2013-08-01 21:57:16 -0500
commite2967ba637e67f8dd3a264fda87b3fd52358c178 (patch)
tree6409a6fd81b455e5e866d1df68e8e1b6e0f7feaa /etc
parentdde3cae3dcbd7b64757c66acc4b56f1183831ede (diff)
downloadpfsense-e2967ba637e67f8dd3a264fda87b3fd52358c178.zip
pfsense-e2967ba637e67f8dd3a264fda87b3fd52358c178.tar.gz
fix text - s/occured/occurred/
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/filter.inc2
-rw-r--r--etc/inc/simplepie/simplepie.inc2
-rwxr-xr-xetc/rc.filter_synchronize6
3 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 7a31e24..afb484b 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -320,7 +320,7 @@ function filter_configure_sync($delete_states_if_needed = true) {
echo "pfctl done at $mt\n";
}
/*
- * check for a error while loading the rules file. if an error has occured
+ * check for a error while loading the rules file. if an error has occurred
* then output the contents of the error to the caller
*/
if($rules_loading <> 0) {
diff --git a/etc/inc/simplepie/simplepie.inc b/etc/inc/simplepie/simplepie.inc
index 8fd3c62..7052eb4 100644
--- a/etc/inc/simplepie/simplepie.inc
+++ b/etc/inc/simplepie/simplepie.inc
@@ -1817,7 +1817,7 @@ function embed_wmedia(width, height, link) {
}
/**
- * Return the error message for the occured error
+ * Return the error message for the occurred error
*
* @access public
* @return string Error message
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index c5362c3..318eaf4 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -107,7 +107,7 @@ function carp_check_version($url, $username, $password, $port = 80, $method = 'p
/* send our XMLRPC message and timeout after 240 seconds */
$resp = $cli->send($msg, "240");
if(!is_object($resp)) {
- $error = "A communications error occured while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
+ $error = "A communications error occurred while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
} elseif($resp->faultCode()) {
$error = "An error code was received while attempting XMLRPC sync with username {$username} {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
} else {
@@ -247,7 +247,7 @@ function carp_sync_xml($url, $username, $password, $sections, $port = 80, $metho
/* send our XMLRPC message and timeout after 240 seconds */
$resp = $cli->send($msg, "240");
if(!is_object($resp)) {
- $error = "A communications error occured while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
+ $error = "A communications error occurred while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
log_error($error);
file_notice("sync_settings", $error, "Settings Sync", "");
} elseif($resp->faultCode()) {
@@ -420,7 +420,7 @@ if (is_array($config['hasync'])) {
$resp = $cli->send($msg, "900");
if (!is_object($resp)) {
- $error = "A communications error occured while attempting Filter sync with username {$username} {$synchronizetoip}:{$port}.";
+ $error = "A communications error occurred while attempting Filter sync with username {$username} {$synchronizetoip}:{$port}.";
log_error($error);
file_notice("sync_settings", $error, "Settings Sync", "");
} elseif($resp->faultCode()) {
OpenPOWER on IntegriCloud