From c9599a34bbdeda61456bee8837e8a0b875303a12 Mon Sep 17 00:00:00 2001
From: Maurice <mail@maurice-walker.com>
Date: Thu, 20 Feb 2020 21:57:40 +0100
Subject: [PATCH] DHCP registration, clarifications

Registrations of static mappings do not always use the system domain. The domains configured for individual static mappings or for the DHCP servers always had higher priority. Static mapping registrations work for both DHCPv6 and DHCPv4, dynamic lease registrations only for DHCPv4.
---
 src/www/services_dnsmasq.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index aa69129f9..be90a9d40 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -293,13 +293,13 @@ $( document ).ready(function() {
                   </td>
                 </tr>
                 <tr>
-                  <td><a id="help_for_regdhcp" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DHCP Registration");?></td>
+                  <td><a id="help_for_regdhcp" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DHCPv4 Registration");?></td>
                   <td>
                     <input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?=!empty($pconfig['regdhcp']) ? "checked=\"checked\"" : "";?> />
-                    <?= gettext('Register DHCP leases') ?>
+                    <?= gettext('Register DHCPv4 leases') ?>
                     <div class="hidden" data-for="help_for_regdhcp">
                       <?= gettext("If this option is set, then machines that specify " .
-                        "their hostname when requesting a DHCP lease will be registered " .
+                        "their hostname when requesting a DHCPv4 lease will be registered " .
                         "in Dnsmasq, so that their name can be resolved.") ?>
                     </div>
                   </td>
@@ -322,10 +322,10 @@ $( document ).ready(function() {
                     <input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?=!empty($pconfig['regdhcpstatic']) ? "checked=\"checked\"" : "";?> />
                     <?= gettext('Register DHCP static mappings') ?>
                     <div class="hidden" data-for="help_for_regdhcpstatic">
-                      <?= sprintf(gettext("If this option is set, then DHCP static mappings will ".
+                      <?= sprintf(gettext("If this option is set, then DHCPv6 and DHCPv4 static mappings will ".
                           "be registered in Dnsmasq, so that their name can be ".
                           "resolved. You should also set the domain in %s".
-                          "System: General setup%s to the proper value."),'<a href="system_general.php">','</a>');?>
+                          "System: General setup%s, in the DHCP server settings or for specific static mappings."),'<a href="system_general.php">','</a>');?>
                     </div>
                   </td>
                 </tr>