diff options
author | Carlos Eduardo Ramos <carlos.ramos@bluepex.com> | 2010-04-29 15:44:53 -0300 |
---|---|---|
committer | Carlos Eduardo Ramos <carlos.ramos@bluepex.com> | 2010-04-29 15:44:53 -0300 |
commit | 9dce16d4fe98db8844cd5e82311b9ebf6709cc90 (patch) | |
tree | 6f8ebeff631ba29a7ac4d63af34eb04142a0ef70 /usr | |
parent | c395a830cacb34017b42f110bf565377345e7c87 (diff) | |
parent | 10b0fac295dd3ef2915afaa0f321a1512c9abcf2 (diff) | |
download | pfsense-9dce16d4fe98db8844cd5e82311b9ebf6709cc90.zip pfsense-9dce16d4fe98db8844cd5e82311b9ebf6709cc90.tar.gz |
Merge branch 'master' of git@rcs.pfsense.org:pfsense/bluepex-clone
Diffstat (limited to 'usr')
-rw-r--r-- | usr/local/www/system_advanced_misc.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_advanced_network.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index 7eaaf70..41f0979 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -182,7 +182,7 @@ include("head.inc"); <strong><?=gettext("Use PowerD"); ?></strong><br/> <br /> <?=gettext("The powerd utility monitors the system state and sets various power control " . - "options accordingly. It offers three modes (maximum, minimum, and " . + "options accordingly. It offers three modes (maximum, minimum, and " . "adaptive) that can be individually selected while on AC power or batteries. " . "The modes maximum, minimum, and adaptive may be abbreviated max, " . "min, adp. Maximum mode chooses the highest performance values. Minimum " . diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php index 8a5eb2a..89e883a 100644 --- a/usr/local/www/system_advanced_network.php +++ b/usr/local/www/system_advanced_network.php @@ -206,7 +206,7 @@ function enable_change(enable_over) { <strong><?=gettext("Enable IPv4 NAT encapsulation of IPv6 packets"); ?></strong><br/> <?=gettext("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 ". + "routing infrastructures. If enabled, don't forget to ". "add a firewall rule to permit IPv6 packets."); ?><br/> <br/> <?=gettext("IP address"); ?> : |