From 60ec80028602e22ab65c876c34d86b8f5421ba50 Mon Sep 17 00:00:00 2001 From: NOYB Date: Sun, 1 May 2016 00:06:27 -0700 Subject: Miscellaneous Textual Corrections (cherry picked from commit bb80af580c5a4408e42c76c39c67d173540897db) --- src/usr/local/www/interfaces_bridge_edit.php | 2 +- src/usr/local/www/interfaces_gif_edit.php | 2 +- src/usr/local/www/interfaces_gre_edit.php | 2 +- src/usr/local/www/interfaces_groups_edit.php | 4 ++-- src/usr/local/www/interfaces_lagg_edit.php | 8 ++++---- src/usr/local/www/interfaces_qinq_edit.php | 4 ++-- src/usr/local/www/services_ntpd.php | 6 +++--- src/usr/local/www/services_unbound_advanced.php | 2 +- src/usr/local/www/vpn_ipsec_settings.php | 2 +- src/usr/local/www/vpn_openvpn_client.php | 4 ++-- src/usr/local/www/vpn_openvpn_csc.php | 2 +- src/usr/local/www/vpn_openvpn_server.php | 16 ++++++++-------- 12 files changed, 27 insertions(+), 27 deletions(-) (limited to 'src/usr') diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php index 59e19c9..1f6aed5 100644 --- a/src/usr/local/www/interfaces_bridge_edit.php +++ b/src/usr/local/www/interfaces_bridge_edit.php @@ -435,7 +435,7 @@ $section->addInput(new Form_Select( $memberslist['selected'], $memberslist['list'], true // Allow multiples -))->setHelp('Interfaces participating in the bridge'); +))->setHelp('Interfaces participating in the bridge.'); $section->addInput(new Form_Input( 'descr', diff --git a/src/usr/local/www/interfaces_gif_edit.php b/src/usr/local/www/interfaces_gif_edit.php index e602070..43d3a4b 100644 --- a/src/usr/local/www/interfaces_gif_edit.php +++ b/src/usr/local/www/interfaces_gif_edit.php @@ -238,7 +238,7 @@ $section->addInput(new Form_Select( 'GIF tunnel subnet', $pconfig['tunnel-remote-net'], array_combine(range(128, 1, -1), range(128, 1, -1)) -))->setHelp('The subnet is used for determining the network that is tunnelled'); +))->setHelp('The subnet is used for determining the network that is tunnelled.'); $section->addInput(new Form_Checkbox( 'link0', diff --git a/src/usr/local/www/interfaces_gre_edit.php b/src/usr/local/www/interfaces_gre_edit.php index 3e379ab..637f806 100644 --- a/src/usr/local/www/interfaces_gre_edit.php +++ b/src/usr/local/www/interfaces_gre_edit.php @@ -234,7 +234,7 @@ $section->addInput(new Form_Select( 'GRE tunnel subnet', $pconfig['tunnel-remote-net'], array_combine(range(128, 1, -1), range(128, 1, -1)) -))->setHelp('The subnet is used for determining the network that is tunnelled'); +))->setHelp('The subnet is used for determining the network that is tunnelled.'); $section->addInput(new Form_Checkbox( 'link0', diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index 4fcaab6..d05859c 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -229,7 +229,7 @@ $section->addInput(new Form_Input( $pconfig['ifname'], ['placeholder' => 'Group Name'] ))->setWidth(6)->setHelp('No numbers or spaces are allowed. '. - 'Only characters in a-zA-Z'); + 'Only characters: a-zA-Z'); $section->addInput(new Form_Input( 'descr', @@ -238,7 +238,7 @@ $section->addInput(new Form_Input( $pconfig['descr'], ['placeholder' => 'Group Description'] ))->setWidth(6)->setHelp('A group description may be entered '. - 'here for administrative reference (not parsed)'); + 'here for administrative reference (not parsed).'); $section->addInput(new Form_Select( 'members', diff --git a/src/usr/local/www/interfaces_lagg_edit.php b/src/usr/local/www/interfaces_lagg_edit.php index 926ef3e..f82d99f 100644 --- a/src/usr/local/www/interfaces_lagg_edit.php +++ b/src/usr/local/www/interfaces_lagg_edit.php @@ -77,7 +77,7 @@ $protohelp = '
  • ' . '' . $laggprotosuc[0] . '
    ' . gettext('This protocol is intended to do nothing: it disables any ' . - 'traffic without disabling the lagg interface itself') . + 'traffic without disabling the lagg interface itself.') . '
    • ' . '
  • ' . '' . $laggprotosuc[1] . '
    ' . @@ -113,13 +113,13 @@ $protohelp = 'does not negotiate aggregation with the peer or exchange ' . 'frames to monitor the link. The hash includes the Ethernet ' . 'source and destination address, and, if available, the VLAN ' . - 'tag, and the IP source and destination address') . + 'tag, and the IP source and destination address.') . '
    • ' . '
  • ' . '' . $laggprotosuc[5] . '
    ' . gettext('Distributes outgoing traffic using a round-robin scheduler ' . 'through all active ports and accepts incoming traffic from ' . - 'any active port') . + 'any active port.') . '
    • ' . ''; @@ -288,7 +288,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp("Enter a description here for reference only. (Not parsed)"); +))->setHelp("Enter a description here for reference only (Not parsed)."); $section->addInput(new Form_Input( 'laggif', diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php index 6c4d04c..ae98a76 100644 --- a/src/usr/local/www/interfaces_qinq_edit.php +++ b/src/usr/local/www/interfaces_qinq_edit.php @@ -280,7 +280,7 @@ $section->addInput(new Form_Checkbox( 'Option(s)', 'Adds interface to QinQ interface groups', $pconfig['autogroup'] -))->setHelp('Allows rules to be written more easily'); +))->setHelp('Allows rules to be written more easily.'); $section->addInput(new Form_Input( 'descr', @@ -292,7 +292,7 @@ $section->addInput(new Form_Input( $section->addInput(new Form_StaticText( 'Member(s)', 'Ranges can be specified in the inputs below. Enter a range (2-3) or individual numbers.' . '
    ' . - 'Click "Duplicate" as many times as needed to add new inputs' + 'Click "Duplicate" as many times as needed to add new inputs.' )); if (isset($id) && $a_qinqs[$id]) { diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php index e335992..fc790f1 100644 --- a/src/usr/local/www/services_ntpd.php +++ b/src/usr/local/www/services_ntpd.php @@ -299,7 +299,7 @@ $section->addInput(new Form_StaticText( $btnaddrow ))->setHelp('For best results three to five servers should be configured here.' . '
    ' . 'The prefer option indicates that NTP should favor the use of this server more than all others.' . '
    ' . - 'The noselect option indicates that NTP should not use this server for time, but stats for this server will be collected and displayed.'); + 'The no select option indicates that NTP should not use this server for time, but stats for this server will be collected and displayed.'); $section->addInput(new Form_Input( 'ntporphan', @@ -308,7 +308,7 @@ $section->addInput(new Form_Input( $pconfig['ntporphan'] ))->setHelp('Orphan mode allows the system clock to be used when no other clocks are available. ' . 'The number here specifies the stratum reported during orphan mode and should normally be set to a number high enough ' . - 'to insure that any other servers available to clients are preferred over this server. (default: 12).'); + 'to insure that any other servers available to clients are preferred over this server (default: 12).'); $section->addInput(new Form_Checkbox( 'statsgraph', @@ -381,7 +381,7 @@ $btnadv->setAttribute('type','button')->addClass('btn-info btn-sm'); $section->addInput(new Form_StaticText( 'Leap seconds', $btnadv -))->setHelp('A leap second file allows NTP to advertize an upcoming leap second addition or subtraction. ' . +))->setHelp('A leap second file allows NTP to advertise an upcoming leap second addition or subtraction. ' . 'Normally this is only useful if this server is a stratum 1 time server. '); $section->addInput(new Form_Textarea( diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php index 7d976cc..3b6c57f 100644 --- a/src/usr/local/www/services_unbound_advanced.php +++ b/src/usr/local/www/services_unbound_advanced.php @@ -377,7 +377,7 @@ $section->addInput(new Form_Select( $section->addInput(new Form_Checkbox( 'disable_auto_added_access_control', 'Disable Auto-added Access Control', - 'disable the automatically-added access control entries', + 'Disable the automatically-added access control entries', $pconfig['disable_auto_added_access_control'] ))->setHelp('By default, IPv4 and IPv6 networks residing on internal interfaces of this system are permitted. ' . 'Allowed networks must be manually configured on the Access Lists tab if the auto-added entries are disabled.'); diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php index 70ca261..b935672 100644 --- a/src/usr/local/www/vpn_ipsec_settings.php +++ b/src/usr/local/www/vpn_ipsec_settings.php @@ -376,7 +376,7 @@ $section->addInput(new Form_Checkbox( 'Make before Break', 'Initiate IKEv2 reauthentication with a make-before-break', $pconfig['makebeforebreak'] -))->setHelp('instead of a break-before-make scheme. Make-before-break uses overlapping IKE and CHILD_SA during reauthentication ' . +))->setHelp('Instead of a break-before-make scheme. Make-before-break uses overlapping IKE and CHILD_SA during reauthentication ' . 'by first recreating all new SAs before deleting the old ones. This behavior can be beneficial to avoid connectivity gaps ' . 'during reauthentication, but requires support for overlapping SAs by the peer.'); diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index 94643b4..7a39e8d 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -687,7 +687,7 @@ if ($act=="new" || $act=="edit"): 'text', $pconfig['tunnel_network'] ))->setHelp('This is the IPv4 virtual network used for private communications between this client and the server ' . - 'expressed using CIDR (eg. 10.0.8.0/24). The second network address will be assigned to ' . + 'expressed using CIDR (e.g. 10.0.8.0/24). The second network address will be assigned to ' . 'the client virtual interface.'); $section->addInput(new Form_Input( @@ -696,7 +696,7 @@ if ($act=="new" || $act=="edit"): 'text', $pconfig['tunnel_networkv6'] ))->setHelp('This is the IPv6 virtual network used for private ' . - 'communications between this client and the server expressed using CIDR (eg. fe80::/64). ' . + 'communications between this client and the server expressed using CIDR (e.g. fe80::/64). ' . 'The second network address will be assigned to the client virtual interface.'); $section->addInput(new Form_Input( diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php index 66422da..0ad064d 100644 --- a/src/usr/local/www/vpn_openvpn_csc.php +++ b/src/usr/local/www/vpn_openvpn_csc.php @@ -394,7 +394,7 @@ if ($act == "new" || $act == "edit"): 'Tunnel Network', 'text', $pconfig['tunnel_network'] - ))->setHelp('This is the virtual network used for private communications between this client and the server expressed using CIDR (eg. 10.0.8.0/24). ' . + ))->setHelp('This is the virtual network used for private communications between this client and the server expressed using CIDR (e.g. 10.0.8.0/24). ' . 'The first network address is assumed to be the server address and the second network address will be assigned to the client virtual interface. '); $section->addInput(new Form_Input( diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index a0db4f9..668101e 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -850,9 +850,9 @@ if ($act=="new" || $act=="edit"): 'text', $pconfig['tunnel_network'] ))->setHelp('This is the IPv4 virtual network used for private communications between this server and client ' . - 'hosts expressed using CIDR (eg. 10.0.8.0/24). The first network address will be assigned to ' . + 'hosts expressed using CIDR (e.g. 10.0.8.0/24). The first network address will be assigned to ' . 'the server virtual interface. The remaining network addresses can optionally be assigned ' . - 'to connecting clients. (see Address Pool)'); + 'to connecting clients (see Address Pool).'); $section->addInput(new Form_Input( 'tunnel_networkv6', @@ -860,9 +860,9 @@ if ($act=="new" || $act=="edit"): 'text', $pconfig['tunnel_networkv6'] ))->setHelp('This is the IPv6 virtual network used for private ' . - 'communications between this server and client hosts expressed using CIDR (eg. fe80::/64). ' . + 'communications between this server and client hosts expressed using CIDR (e.g. fe80::/64). ' . 'The first network address will be assigned to the server virtual interface. The remaining ' . - 'network addresses can optionally be assigned to connecting clients. (see Address Pool)'); + 'network addresses can optionally be assigned to connecting clients (see Address Pool).'); $section->addInput(new Form_Checkbox( 'serverbridge_dhcp', @@ -876,7 +876,7 @@ if ($act=="new" || $act=="edit"): 'Bridge Interface', $pconfig['serverbridge_interface'], openvpn_build_bridge_list() - ))->setHelp('The interface to which this tap instance will be bridged. This is not done automatically. This interface must be assigned ' . + ))->setHelp('The interface to which this TAP instance will be bridged. This is not done automatically. This interface must be assigned ' . 'and the bridge created separately. This setting controls which existing IP address and subnet ' . 'mask are used by OpenVPN for the bridge. Setting this to "none" will cause the Server Bridge DHCP settings below to be ignored.'); @@ -885,8 +885,8 @@ if ($act=="new" || $act=="edit"): 'Server Bridge DHCP Start', 'text', $pconfig['serverbridge_dhcp_start'] - ))->setHelp('When using tap mode as a multi-point server, a DHCP range may optionally be supplied to use on the ' . - 'interface to which this tap instance is bridged. If these settings are left blank, DHCP will be passed ' . + ))->setHelp('When using TAP mode as a multi-point server, a DHCP range may optionally be supplied to use on the ' . + 'interface to which this TAP instance is bridged. If these settings are left blank, DHCP will be passed ' . 'through to the LAN, and the interface setting above will be ignored.'); $section->addInput(new Form_Input( @@ -1008,7 +1008,7 @@ if ($act=="new" || $act=="edit"): 'Topology', $pconfig['topology'], $openvpn_topologies - ))->setHelp('Specifies the method used to supply a virtual adapter IP address to clients when using tun mode on IPv4.' . '
    ' . + ))->setHelp('Specifies the method used to supply a virtual adapter IP address to clients when using TUN mode on IPv4.' . '
    ' . 'Some clients may require this be set to "subnet" even for IPv6, such as OpenVPN Connect (iOS/Android). ' . 'Older versions of OpenVPN (before 2.0.9) or clients such as Yealink phones may require "net30".'); -- cgit v1.1