diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 96712bffaf..c6e19d39d3 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -599,7 +599,7 @@ class altq_root_queue { $form .= " GetEnabled() == "on") $form .= " CHECKED"; - $form .= " > Enable/Disable discipline and its childs"; + $form .= " > Enable/disable discipline and its children"; $form .= ""; $form .= "
Name"; $form .= ""; @@ -627,7 +627,7 @@ class altq_root_queue { $form .= ">PRIQ"; $form .= ""; $form .= "
"; - $form .= "NOTE: changing this changes all child queues!"; + $form .= "NOTE: Changing this changes all child queues!"; $form .= " Beware you can lose information."; $form .= ""; $form .= ""; @@ -660,13 +660,13 @@ class altq_root_queue { $form .= $this->GetQlimit(); $form .= "\">"; $form .= ""; - $form .= "Tbr Size"; + $form .= "TBR Size"; $form .= ""; $form .= "GetTbrConfig(); $form .= "\">"; $form .= "
"; - $form .= "Adjusts the size, in bytes, of the token bucket regulator."; + $form .= "Adjusts the size, in bytes, of the token bucket regulator. "; $form .= "If not specified, heuristics based on the interface "; $form .= "bandwidth are used to determine the size."; $form .= ""; diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php index 8e77a06613..1b2b304b9f 100644 --- a/usr/local/www/interfaces_bridge_edit.php +++ b/usr/local/www/interfaces_bridge_edit.php @@ -109,27 +109,27 @@ if ($_POST) { do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); if ($_POST['maxage'] && !is_numeric($_POST['maxage'])) - $input_errors[] = "Maxage needs to be an interger between 6 and 40."; + $input_errors[] = "Maxage needs to be an integer between 6 and 40."; if ($_POST['maxaddr'] && !is_numeric($_POST['maxaddr'])) - $input_errors[] = "Maxaddr needs to be an interger."; + $input_errors[] = "Maxaddr needs to be an integer."; if ($_POST['timeout'] && !is_numeric($_POST['timeout'])) - $input_errors[] = "Timeout needs to be an interger."; + $input_errors[] = "Timeout needs to be an integer."; if ($_POST['fwdelay'] && !is_numeric($_POST['fwdelay'])) - $input_errors[] = "Forward Delay needs to be an interger between 4 and 30."; + $input_errors[] = "Forward Delay needs to be an integer between 4 and 30."; if ($_POST['hellotime'] && !is_numeric($_POST['hellotime'])) - $input_errors[] = "Hello time for STP needs to be an interger between 1 and 2."; + $input_errors[] = "Hello time for STP needs to be an integer between 1 and 2."; if ($_POST['priority'] && !is_numeric($_POST['priority'])) - $input_errors[] = "Priority for STP needs to be an interger between 0 and 61440."; + $input_errors[] = "Priority for STP needs to be an integer between 0 and 61440."; if ($_POST['holdcnt'] && !is_numeric($_POST['holdcnt'])) - $input_errors[] = "Transmit Hold Count for STP needs to be an interger between 1 and 10."; + $input_errors[] = "Transmit Hold Count for STP needs to be an integer between 1 and 10."; foreach ($ifacelist as $ifn => $ifdescr) { if ($_POST[$ifn] <> "" && !is_numeric($_POST[$ifn])) - $input_errors[] = "{$ifdescr} interface priority for STP needs to be an interger between 0 and 240."; + $input_errors[] = "{$ifdescr} interface priority for STP needs to be an integer between 0 and 240."; } $i = 0; foreach ($ifacelist as $ifn => $ifdescr) { if ($_POST["{$ifn}{$i}"] <> "" && !is_numeric($_POST["{$ifn}{$i}"])) - $input_errors[] = "{$ifdescr} interface path cost for STP needs to be an interger between 1 and 200000000."; + $input_errors[] = "{$ifdescr} interface path cost for STP needs to be an integer between 1 and 200000000."; $i++; } @@ -461,7 +461,7 @@ Set the size of the bridge address cache to size. The default is
Set interface as an edge port. An edge port connects directly to - end stations cannot create bridging loops in the network, this + end stations and cannot create bridging loops in the network; this allows it to transition straight to forwarding. @@ -503,9 +503,9 @@ Set the size of the bridge address cache to size. The default is
- Set the interface as a point to point link. This is required for + Set the interface as a point-to-point link. This is required for straight transitions to forwarding and should be enabled on a - direct link to another RSTP capable switch. + direct link to another RSTP-capable switch. @@ -523,7 +523,7 @@ Set the size of the bridge address cache to size. The default is
- Automatically detect the point to point status on interface by + Automatically detect the point-to-point status on interface by checking the full duplex link status. This is the default for interfaces added to the bridge.

@@ -548,7 +548,7 @@ Set the size of the bridge address cache to size. The default is
Mark an interface as a "sticky" interface. Dynamically learned - address entries are treated at static once entered into the + address entries are treated as static once entered into the cache. Sticky entries are never aged out of the cache or replaced, even if the address is seen on a different interface. diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php index a8445e2972..f09c59e322 100644 --- a/usr/local/www/interfaces_lagg.php +++ b/usr/local/www/interfaces_lagg.php @@ -67,7 +67,7 @@ function lagg_inuse($num) { if ($_GET['act'] == "del") { /* check if still in use */ if (lagg_inuse($_GET['id'])) { - $input_errors[] = "This lagg interface cannot be deleted because it is still being used."; + $input_errors[] = "This LAGG interface cannot be deleted because it is still being used."; } else { mwexec_bg("/sbin/ifconfig " . $a_laggs[$_GET['id']]['laggif'] . " destroy"); unset($a_laggs[$_GET['id']]); @@ -126,7 +126,7 @@ include("head.inc");   -   +   @@ -137,7 +137,7 @@ include("head.inc");

Note:
 - Lagg allows for link aggregation, for bonding and fault tolerance. Only un-assigned interfaces can be added to lagg. + LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG.   diff --git a/usr/local/www/system.php b/usr/local/www/system.php index f63b9eb63e..69a8f70406 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -251,7 +251,7 @@ include("head.inc");
- +
firewall diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index 8a6eae0687..6f7a077343 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -332,7 +332,7 @@ function prot_change() { /> - +
@@ -344,7 +344,7 @@ function prot_change() {
- + diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index 8c0417c032..0ca94945a1 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -457,7 +457,7 @@ function method_change() { " alt="" width="17" height="17" border="0" /> - ')"> + ')"> " alt="" width="17" height="17" border="0" /> @@ -477,7 +477,7 @@ function method_change() {

- +

diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php index a16f9b8df2..d09934c6ff 100755 --- a/usr/local/www/system_firmware_settings.php +++ b/usr/local/www/system_firmware_settings.php @@ -131,14 +131,14 @@ function enable_altfirmwareurl(enable_over) { - >
+ >
:

- : . + : . @@ -153,7 +153,7 @@ function enable_altfirmwareurl(enable_over) { />
- + diff --git a/usr/local/www/upload_progress.php b/usr/local/www/upload_progress.php index 3559ac5fe1..8a27b64ecf 100644 --- a/usr/local/www/upload_progress.php +++ b/usr/local/www/upload_progress.php @@ -41,7 +41,7 @@ include("guiconfig.inc"); // sanitize the ID value $id = $_SESSION['uploadid']; if (!$id) { - echo "Sorry, we could not find a uploadid code."; + echo "Sorry, we could not find an uploadid code."; exit; } diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php index 5a71121521..0021acc420 100644 --- a/usr/local/www/vpn_openvpn_csc.php +++ b/usr/local/www/vpn_openvpn_csc.php @@ -327,7 +327,7 @@ function netbios_change() { - Set this option to disable this client specific override without removing it from the list. + Set this option to disable this client-specific override without removing it from the list. @@ -362,7 +362,7 @@ function netbios_change() { - Don't use this option to permenently disable a + Don't use this option to permanently disable a client due to a compromised key or password. Use a CRL (certificate revocation list) instead. @@ -422,7 +422,7 @@ function netbios_change() { - Prevent this client from receiving any server defined client settings. + Prevent this client from receiving any server-defined client settings. @@ -558,7 +558,7 @@ function netbios_change() { - If this option is not set, all Netbios-over-TCP/IP options (includeing WINS) will be disabled. + If this option is not set, all NetBIOS-over-TCP/IP options (includeing WINS) will be disabled.
diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index de7320fa9f..64ffef13fe 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -52,7 +52,7 @@ 2 General Information - On this screen you will set the General pfSense parameters. + On this screen you will set the general pfSense parameters. Hostname @@ -179,7 +179,7 @@ MAC Address interfaces->wan->spoofmac input - This field can be used to modify ("spoof") the MAC address of the WAN interface (may be required with some cable connections) Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx or leave blank + This field can be used to modify ("spoof") the MAC address of the WAN interface (may be required with some cable connections). Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx or leave blank. true @@ -318,7 +318,7 @@ true Block bogon networks - Block bogon networks when set, this option blocks traffic from IP addresses that are reserved (but not RFC 1918) or not yet assigned by IANA. Bogons are prefixes that should never appear in the Internet routing table, and obviously should not appear as the source address in any packets you receive. + When set, this option blocks traffic from IP addresses that are reserved (but not RFC 1918) or not yet assigned by IANA. Bogons are prefixes that should never appear in the Internet routing table, and obviously should not appear as the source address in any packets you receive. checkbox interfaces->wan->blockbogons Block non-Internet routed networks from entering via WAN @@ -376,7 +376,7 @@ 6 Set Admin WebGUI Password - On this screen we will set the Admin password which is used to access the WebGUI and also SSH services if you wish to enable. + On this screen we will set the admin password, which is used to access the WebGUI and also SSH services if you wish to enable them. Admin Password