diff options
author | Phil Davis <phil.davis@inf.org> | 2015-02-11 12:52:14 +0545 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2015-02-11 07:02:30 -0200 |
commit | 1444c08e3e38123925f59fe297bc526f0d4755b5 (patch) | |
tree | 8932c011890ec32940e868b9730670884382959a | |
parent | 4ab7f8f4e8517fb4dfba4706327b992a9676a521 (diff) | |
download | pfsense-1444c08e3e38123925f59fe297bc526f0d4755b5.zip pfsense-1444c08e3e38123925f59fe297bc526f0d4755b5.tar.gz |
Random text typos
that I noticed.
-rw-r--r-- | etc/inc/captiveportal.inc | 2 | ||||
-rw-r--r-- | etc/inc/interfaces.inc | 16 | ||||
-rw-r--r-- | etc/inc/system.inc | 6 | ||||
-rw-r--r-- | etc/inc/upgrade_config.inc | 6 | ||||
-rw-r--r-- | etc/inc/voucher.inc | 16 | ||||
-rw-r--r-- | usr/local/www/system_camanager.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_certmanager.php | 2 |
7 files changed, 25 insertions, 25 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index a0da275..f6c0930 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -795,7 +795,7 @@ function captiveportal_prune_old() { captiveportal_prune_old_automac(); if ($voucher_needs_sync == true) - /* Triger a sync of the vouchers on config */ + /* Trigger a sync of the vouchers on config */ send_event("service sync vouchers"); /* write database */ diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 16ad94c..7903f6a 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -171,7 +171,7 @@ function interface_netgraph_needed($interface = "wan") { pfSense_ngctl_detach("{$realif}:", $realif); } /* NOTE: We make sure for this on interface_ppps_configure() - * no need to do it here agan. + * no need to do it here again. * else * pfSense_ngctl_attach(".", $realif); */ @@ -1507,7 +1507,7 @@ function interface_ppps_configure($interface) { } break; default: - log_error(sprintf(gettext("Unkown %s configured as ppp interface."), $type)); + log_error(sprintf(gettext("Unknown %s configured as ppp interface."), $type)); break; } } @@ -2113,7 +2113,7 @@ function interface_carp_configure(&$vip) { if ($vip['mode'] != "carp") return; - /* NOTE: Maybe its useless nowdays */ + /* NOTE: Maybe its useless nowadays */ $realif = get_real_interface($vip['interface']); if (!does_interface_exist($realif)) { file_notice("CARP", sprintf(gettext("Interface specified for the virtual IP address %s does not exist. Skipping this VIP."), $vip['subnet']), "Firewall: Virtual IP", ""); @@ -2369,7 +2369,7 @@ function interface_wireless_configure($if, &$wl, &$wlcfg) { $wlcmd[] = "-mediaopt adhoc"; } - /* Not neccesary to set BSS mode as this is default if adhoc and/or hostap is NOT set */ + /* Not necessary to set BSS mode as this is default if adhoc and/or hostap is NOT set */ /* handle hide ssid option */ if(isset($wlcfg['hidessid']['enable'])) { @@ -3120,10 +3120,10 @@ function interface_track6_configure($interface = "lan", $wancfg, $linkupevent = case "dhcp6": if ($linkupevent == true) { /* - * NOTE: Usually come here from rc.linkup calling so just call directly intead of generating event + * NOTE: Usually come here from rc.linkup calling so just call directly instead of generating event * Instead of disrupting all other v4 configuration just restart DHCPv6 client for now * - * XXX: Probably DHCPv6 client should handle this autmagically itself? + * XXX: Probably DHCPv6 client should handle this automagically itself? */ $parentrealif = get_real_interface($wancfg['track6-interface']); $pidv6 = find_dhcp6c_process($parentrealif); @@ -3907,7 +3907,7 @@ function DHCP_Config_File_Substitutions($wancfg, $wanif, $dhclientconf) { $res = stripos($dhclientconf, $various_mac_type . $various_mac_case . $various_mac_delimiter); if ($res !== false) { - /* Get MAC Address as ASCII String With Colon (:) Celimiters */ + /* Get MAC Address as ASCII String With Colon (:) delimiters */ if ("$various_mac_case" == "U") $dhcpclientconf_mac = strtoupper(get_interface_mac($wanif)); if ("$various_mac_case" == "L") $dhcpclientconf_mac = strtolower(get_interface_mac($wanif)); @@ -4214,7 +4214,7 @@ function get_real_interface($interface = "wan", $family = "all", $realv6iface = $wanif = "ppp"; break; default: - // If a real interface was alread passed simply + // If a real interface was already passed simply // pass the real interface back. This encourages // the usage of this function in more cases so that // we can combine logic for more flexibility. diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 205515c..3f81e0e 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -939,7 +939,7 @@ function system_webgui_create_certificate() { 'organizationName' => "{$g['product_name']} webConfigurator Self-Signed Certificate", 'emailAddress' => "admin@{$config['system']['hostname']}.{$config['system']['domain']}", 'commonName' => "{$config['system']['hostname']}-{$cert['refid']}"); - $old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warings directly to a page screwing menu tab */ + $old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warnings directly to a page screwing menu tab */ if (!cert_create($cert, null, 2048, 2000, $dn, "self-signed", "sha256")){ while($ssl_err = openssl_error_string()){ log_error("Error creating WebGUI Certificate: openssl library returns: " . $ssl_err); @@ -1235,7 +1235,7 @@ mimetype.assign = ( url.access-deny = ( "~", ".inc" ) -######### Options that are good to be but not neccesary to be changed ####### +######### Options that are good to be but not necessary to be changed ####### ## bind to port (default: 80) @@ -1746,7 +1746,7 @@ function system_ntp_configure($start_ntpd=true) { } } - /* open configuration for wrting or bail */ + /* open configuration for writing or bail */ if (!@file_put_contents("{$g['varetc_path']}/ntpd.conf", $ntpcfg)) { log_error("Could not open {$g['varetc_path']}/ntpd.conf for writing"); return; diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 690db45..59f12e8 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -1869,7 +1869,7 @@ function upgrade_052_to_053() { if (!is_array($config['cert'])) $config['cert'] = array(); - /* migrate advanced admin page webui ssl to certifcate mngr */ + /* migrate advanced admin page webui ssl to certificate manager */ if ($config['system']['webgui']['certificate'] && $config['system']['webgui']['private-key']) { @@ -2631,7 +2631,7 @@ function upgrade_078_to_079() { function upgrade_079_to_080() { global $config; - /* Upgrade config in 1.2.3 specifying a username other than admin for synching. */ + /* Upgrade config in 1.2.3 specifying a username other than admin for syncing. */ if (!empty($config['system']['username']) && is_array($config['installedpackages']['carpsettings']) && is_array($config['installedpackages']['carpsettings']['config'])) { $config['installedpackages']['carpsettings']['config'][0]['username'] = $config['system']['username']; @@ -2985,7 +2985,7 @@ function upgrade_088_to_089() { if (!is_array($config['cert'])) $config['cert'] = array(); - /* migrate captive portal ssl to certifcate mngr */ + /* migrate captive portal ssl to certificate manager */ if (is_array($config['captiveportal'])) { foreach ($config['captiveportal'] as $id => &$setting) { if (isset($setting['httpslogin'])) { diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc index f9b41b3..f6b7248 100644 --- a/etc/inc/voucher.inc +++ b/etc/inc/voucher.inc @@ -284,7 +284,7 @@ function voucher_expire($voucher_received) { $unsetindexes[] = $cpentry[5]; } } else - captiveportal_syslog("$voucher ($roll/$nr): not found on any registererd Roll"); + captiveportal_syslog("$voucher ($roll/$nr): not found on any registered Roll"); } else // hmm, thats weird ... not what I expected captiveportal_syslog("$voucher invalid: {$output[0]}!!"); @@ -296,7 +296,7 @@ function voucher_expire($voucher_received) { voucher_write_active_db($roll, $active); unset($active_vouchers); - /* Triger a sync of the vouchers on config */ + /* Trigger a sync of the vouchers on config */ send_event("service sync vouchers"); } @@ -412,8 +412,8 @@ function voucher_auth($voucher_received, $test = 0) { } } } else { - $test_result[] = "$voucher ($roll/$nr): not found on any registererd Roll"; - captiveportal_syslog("$voucher ($roll/$nr): not found on any registererd Roll"); + $test_result[] = "$voucher ($roll/$nr): not found on any registered Roll"; + captiveportal_syslog("$voucher ($roll/$nr): not found on any registered Roll"); } } else { // hmm, thats weird ... not what I expected @@ -480,7 +480,7 @@ function voucher_auth($voucher_received, $test = 0) { $active_vouchers[$first_voucher_roll][$first_voucher] = "$timestamp,$minutes"; voucher_write_active_db($first_voucher_roll, $active_vouchers[$first_voucher_roll]); - /* Triger a sync of the vouchers on config */ + /* Trigger a sync of the vouchers on config */ send_event("service sync vouchers"); unlock($voucherlck); @@ -560,7 +560,7 @@ function voucher_configure_zone($sync = false) { $timestamp = $activent['timestamp']; $minutes = $activent['minutes']; // its tempting to check for expired timestamps, but during - // bootup, we most likely don't have the correct time time. + // bootup, we most likely don't have the correct time. $active_vouchers[$voucher] = "$timestamp,$minutes"; } } @@ -613,7 +613,7 @@ function voucher_read_active_db($roll) { if ($dirty) { // if we found expired entries, lets save our snapshot voucher_write_active_db($roll, $active); - /* Triger a sync of the vouchers on config */ + /* Trigger a sync of the vouchers on config */ send_event("service sync vouchers"); } } @@ -735,7 +735,7 @@ function voucher_save_db_to_config_zone() { unlock($voucherlck); - write_config("Synching vouchers"); + write_config("Syncing vouchers"); return; } diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index a4bcea6..cc73b51 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -253,7 +253,7 @@ if ($_POST) { if (!empty($pconfig['key'])) $ca['prv'] = base64_encode($pconfig['key']); } else { - $old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warings directly to a page screwing menu tab */ + $old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warnings directly to a page screwing menu tab */ if ($pconfig['method'] == "existing") ca_import($ca, $pconfig['cert'], $pconfig['key'], $pconfig['serial']); diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 8082cd6..e6c7551 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -339,7 +339,7 @@ if ($_POST) { $cert['descr'] = $pconfig['descr']; - $old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warings directly to a page screwing menu tab */ + $old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warnings directly to a page screwing menu tab */ if ($pconfig['method'] == "import") cert_import($cert, $pconfig['cert'], $pconfig['key']); |