summaryrefslogtreecommitdiffstats
path: root/src/usr/local
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-04-04 09:30:29 -0400
committerStephen Beaver <sbeaver@netgate.com>2016-04-04 09:30:35 -0400
commit02e6b5379a78da320fe05ef2cc7761c48f51ab31 (patch)
treef0ea86989292183c333ec18788ff6873afda401b /src/usr/local
parent718694129cf5aec2be065efc94978cfbfd30276d (diff)
downloadpfsense-02e6b5379a78da320fe05ef2cc7761c48f51ab31.zip
pfsense-02e6b5379a78da320fe05ef2cc7761c48f51ab31.tar.gz
Merge pull request #2820 from NOYB/Services_/_NTP_-_Remove_Personalizations
(cherry picked from commit 72c57c3f09f483e747480e704e1b0090e32a728e)
Diffstat (limited to 'src/usr/local')
-rw-r--r--src/usr/local/www/services_ntpd_acls.php10
-rw-r--r--src/usr/local/www/services_ntpd_gps.php10
-rw-r--r--src/usr/local/www/services_ntpd_pps.php4
3 files changed, 12 insertions, 12 deletions
diff --git a/src/usr/local/www/services_ntpd_acls.php b/src/usr/local/www/services_ntpd_acls.php
index 623d049..0866743 100644
--- a/src/usr/local/www/services_ntpd_acls.php
+++ b/src/usr/local/www/services_ntpd_acls.php
@@ -119,20 +119,20 @@ if ($_POST) {
/* End ACL Flags */
if (!is_ipaddr($networkacl[$x]['acl_network'])) {
- $input_errors[] = gettext("You must enter a valid IP address for each row under Networks.");
+ $input_errors[] = gettext("A valid IP address must be entered for each row under Networks.");
}
if (is_ipaddr($networkacl[$x]['acl_network'])) {
if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) {
- $input_errors[] = gettext("You must enter a valid IPv4 netmask for each IPv4 row under Networks.");
+ $input_errors[] = gettext("A valid IPv4 netmask must be entered for each IPv4 row under Networks.");
}
} else if (function_exists("is_ipaddrv6")) {
if (!is_ipaddrv6($networkacl[$x]['acl_network'])) {
- $input_errors[] = gettext("You must enter a valid IPv6 address for {$networkacl[$x]['acl_network']}.");
+ $input_errors[] = gettext("A valid IPv6 address must be entered for {$networkacl[$x]['acl_network']}.");
} else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) {
- $input_errors[] = gettext("You must enter a valid IPv6 netmask for each IPv6 row under Networks.");
+ $input_errors[] = gettext("A valid IPv6 netmask must be entered for each IPv6 row under Networks.");
}
} else {
- $input_errors[] = gettext("You must enter a valid IP address for each row under Networks.");
+ $input_errors[] = gettext("A valid IP address must be entered for each row under Networks.");
}
} else if (isset($networkacl[$x])) {
unset($networkacl[$x]);
diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php
index 5b8ad4b..fc74f41 100644
--- a/src/usr/local/www/services_ntpd_gps.php
+++ b/src/usr/local/www/services_ntpd_gps.php
@@ -253,9 +253,9 @@ $section->addInput(new Form_Select(
'GPS Type',
$pconfig['type'],
array_combine($gpstypes, $gpstypes)
-))->setHelp('This option allows you to select a predefined configuration. ' .
- 'Default is the configuration of pfSense 2.1 and earlier (not recommended). Select Generic if your GPS is not listed.' . '<br /><br />' .
- 'The predefined configurations assume your GPS has already been set to NMEA mode.');
+))->setHelp('This option allows a predefined configuration to be selected. ' .
+ 'Default is the configuration of pfSense 2.1 and earlier (not recommended). Select Generic if the GPS is not listed.' . '<br /><br />' .
+ 'The predefined configurations assume the GPS has already been set to NMEA mode.');
$serialports = glob("/dev/cua?[0-9]{,.[0-9]}", GLOB_BRACE);
@@ -312,7 +312,7 @@ $section->addInput(new Form_Input(
'Stratum (0-16)',
'text',
$pconfig['stratum']
-))->setHelp('This may be used to change the GPS Clock stratum (default: 0). This may be useful if, for some reason, you want ntpd to prefer a different clock');
+))->setHelp('This may be used to change the GPS Clock stratum (default: 0). This may be useful to, for some reason, have ntpd prefer a different clock');
$section->addInput(new Form_Checkbox(
'gpsprefer',
@@ -390,7 +390,7 @@ $section->addInput(new Form_Textarea(
'gpsinitcmd',
null,
base64_decode($pconfig['initcmd'])
-))->setHelp('Commands entered here will be sent to the GPS during initialization. Please read and understand your GPS documentation before making any changes here');
+))->setHelp('Commands entered here will be sent to the GPS during initialization. Please read and understand the GPS documentation before making any changes here');
$group = new Form_Group('NMEA Checksum Calculator');
diff --git a/src/usr/local/www/services_ntpd_pps.php b/src/usr/local/www/services_ntpd_pps.php
index e63ddb7..7c2a61c 100644
--- a/src/usr/local/www/services_ntpd_pps.php
+++ b/src/usr/local/www/services_ntpd_pps.php
@@ -1,4 +1,4 @@
-<?php
+f<?php
/*
services_ntpd_pps.php
*/
@@ -195,7 +195,7 @@ $section->addInput(new Form_Input(
'Stratum',
'text',
$pconfig['stratum']
-))->setHelp('This may be used to change the PPS Clock stratum (default: 0). This may be useful if, for some reason, you want ntpd to prefer a different clock and just monitor this source.');
+))->setHelp('This may be used to change the PPS Clock stratum (default: 0). This may be useful to, for some reason, have ntpd prefer a different clock and just monitor this source.');
$section->addInput(new Form_Checkbox(
'ppsflag2',
OpenPOWER on IntegriCloud