diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-09-24 12:48:20 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-09-24 12:48:20 +0545 |
| commit | 098f3943296f268b7a120248f79c4a74c2432964 (patch) | |
| tree | b98268574cdb23b40af9b8f25136bd3b73e55dcd /usr | |
| parent | 2f1e2ad9c14b4fab1d863ee93e4dd2e64668ed91 (diff) | |
| download | pfsense-098f3943296f268b7a120248f79c4a74c2432964.zip pfsense-098f3943296f268b7a120248f79c4a74c2432964.tar.gz | |
Redmine #5196 Remove incorrect text about DNS servers - RELENG_2_2
The correct text is already displayed under the DNS server boxes at line 892.
This should also be done to master once the conversion of services_dhcp.php to bootstrap is stable.
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/services_dhcp.php | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 294d2f4..fdd1d43 100644 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -889,7 +889,7 @@ include("head.inc"); <input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>" /><br /> <input name="dns3" type="text" class="formfld unknown" id="dns3" size="20" value="<?=htmlspecialchars($pconfig['dns3']);?>" /><br /> <input name="dns4" type="text" class="formfld unknown" id="dns4" size="20" value="<?=htmlspecialchars($pconfig['dns4']);?>" /><br /> - <?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS Forwarder or Resolver is enabled, otherwise the servers configured on the General page.");?> + <?=gettext("Note: leave blank to use the system default DNS servers - this interface's IP if DNS Forwarder or Resolver is enabled, otherwise the servers configured on the General page.");?> </td> </tr> <tr> @@ -1202,15 +1202,19 @@ include("head.inc"); </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br /> - </strong></span><?=gettext("The DNS servers entered in"); ?> <a href="system.php"><?=gettext("System: " . - "General setup"); ?></a> <?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS " . - "forwarder"); ?></a>, <?=gettext("if enabled)"); ?> </span><span class="vexpl"><?=gettext("will " . - "be assigned to clients by the DHCP server."); ?><br /> - <br /> - <?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcp_leases.php"><?=gettext("Status: " . - "DHCP leases"); ?></a> <?=gettext("page."); ?><br /> - </span></p> + <td width="78%"> + <p> + <span class="vexpl"> + <span class="red"> + <strong> + <?=gettext("Note:");?> + </strong> + </span> + <br /> + <?=gettext("The DHCP lease table can be viewed on the"); ?> + <a href="status_dhcp_leases.php"><?=gettext("Status: DHCP leases"); ?></a> <?=gettext("page."); ?><br /> + </span> + </p> </td> </tr> </table> |
