Merge pull request #2949 from NewEraCracker/textual-corrections

This commit is contained in:
Stephen Beaver 2016-05-10 09:10:24 -04:00
commit 0161bbb4b1
6 changed files with 9 additions and 9 deletions

View File

@ -487,7 +487,7 @@ $section->addInput(new Form_Select(
$spanlist['selected'],
$spanlist['list'],
true
))->setHelp('Add the interface named by interface as a span port on the bridge. Span ports transmit a copy of every frame received by the bridge.' .
))->setHelp('Add the interface named by interface as a span port on the bridge. Span ports transmit a copy of every frame received by the bridge. ' .
'This is most useful for snooping a bridged network passively on another host connected to one of the span ports of the bridge. <br />' .
'%sThe span interface cannot be part of the bridge member interfaces.%s', ['<strong>', '</strong>']);
@ -584,7 +584,7 @@ $section->addInput(new Form_Select(
$edgelist['selected'],
$edgelist['list'],
true
))->setHelp('Enable Spanning Tree Protocol on interface. The if_bridge(4) driver has support for the IEEE 802.1D Spanning Tree Protocol (STP).' .
))->setHelp('Enable Spanning Tree Protocol on interface. The if_bridge(4) driver has support for the IEEE 802.1D Spanning Tree Protocol (STP). ' .
'STP is used to detect and remove loops in a network topology.');
$section->addInput(new Form_Input(
@ -609,7 +609,7 @@ $section->addInput(new Form_Input(
'number',
$pconfig['hellotime'],
['placeholder' => 2, 'min' => 1, 'max' => 2, 'step' => '0.1']
))->setHelp('Set the time in seconds between broadcasting of Spanning Tree Protocol configuration messages. The hello time may only be changed when operating in legacy STP mode.' .
))->setHelp('Set the time in seconds between broadcasting of Spanning Tree Protocol configuration messages. The hello time may only be changed when operating in legacy STP mode. ' .
'The default is 2 seconds. The minimum is 1 second and the maximum is 2 seconds.');
$section->addInput(new Form_Input(

View File

@ -688,7 +688,7 @@ $section->addInput(new Form_Checkbox(
$pconfig['passthrumacadd']
))->setHelp(sprintf('When enabled, a MAC passthrough entry is automatically added after the user has successfully authenticated. Users of that MAC address will ' .
'never have to authenticate again. To remove the passthrough MAC entry either log in and remove it manually from the ' .
'%s or send a POST from another system.' .
'%s or send a POST from another system. ' .
'If this is enabled, RADIUS MAC authentication cannot be used. Also, the logout window will not be shown.', '<a href="services_captiveportal_mac.php">MAC tab</a>'));
$section->addInput(new Form_Checkbox(

View File

@ -63,7 +63,7 @@
$directionicons = array('to' => '&#x2192;', 'from' => '&#x2190;', 'both' => '&#x21c4;');
$notestr =
gettext('Adding new hostnames will allow a DNS hostname access to/from the captive portal without being taken to the portal page.' .
gettext('Adding new hostnames will allow a DNS hostname access to/from the captive portal without being taken to the portal page. ' .
'This can be used for a web server serving images for the portal page, or a DNS server on another network, for example. ' .
'By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal.');

View File

@ -202,7 +202,7 @@ $section->addInput(new Form_Select(
'Type',
$pconfig['type'],
['upstream' => gettext('Upstream Interface'), 'downstream' => gettext('Downstream Interface')]
))->setHelp('The upstream network interface is the outgoing interface which is responsible for communicating to available multicast data sources .' .
))->setHelp('The upstream network interface is the outgoing interface which is responsible for communicating to available multicast data sources. ' .
'There can only be one upstream interface.' . '<br />' .
'Downstream network interfaces are the distribution interfaces to the destination networks, where multicast clients can join groups and '.
'receive multicast data. One or more downstream interfaces must be configured.');

View File

@ -304,7 +304,7 @@ $section->addInput(new Form_Select(
'&nbsp;<strong>Router Only</strong> to only advertise this router' . '<br />' .
'&nbsp;<strong>Unmanaged</strong> for Router Advertising with Stateless Autoconfig' . '<br />' .
'&nbsp;<strong>Managed</strong> for assignment through a DHCPv6 Server' . '<br />' .
'&nbsp;<strong>Assisted</strong> for DHCPv6 Server assignment combined with Stateless Autoconfig.' .
'&nbsp;<strong>Assisted</strong> for DHCPv6 Server assignment combined with Stateless Autoconfig. ' .
'It is not required to activate this DHCPv6 server when set to "Managed", this can be another host on the network');
$section->addInput(new Form_Select(

View File

@ -325,9 +325,9 @@ $section->addInput(new Form_Checkbox(
'Accept unencrypted ID and HASH payloads in IKEv1 Main Mode',
$pconfig['acceptunencryptedmainmode']
))->setHelp(
'Some implementations send the third Main Mode message unencrypted, probably to find the PSKs for the specified ID for authentication.' .
'Some implementations send the third Main Mode message unencrypted, probably to find the PSKs for the specified ID for authentication. ' .
'This is very similar to Aggressive Mode, and has the same security implications: ' .
'A passive attacker can sniff the negotiated Identity, and start brute forcing the PSK using the HASH payload.' .
'A passive attacker can sniff the negotiated Identity, and start brute forcing the PSK using the HASH payload. ' .
'It is recommended to keep this option to no, unless the exact implications are known and compatibility is required for such devices (for example, some SonicWall boxes).'
);