From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 18 Jul 2019 12:00:45 +0000 (+0200)
Subject: [#644,!370] Manual apply of 495cd829eb72d92a8faa07e4afd489bdd1838c49
X-Git-Tag: Kea-1.6.1~10^2~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1934737e5b2812e7213ec6d00121c0f9518eaca;p=thirdparty%2Fkea.git

[#644,!370] Manual apply of 495cd829eb72d92a8faa07e4afd489bdd1838c49
---

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index e186ddce61..058e0557cb 100644
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -185,12 +185,12 @@ client will begin the renewal and rebind procedures.
 
 .. note::
 
-   From Kea 1.6.0 the lease valid lifetime is extended from a
+   Beginning with Kea 1.6.0 the lease valid lifetime is extended from a
    single value to a triplet with minimum, default and maximum values using
    ``min-valid-lifetime``, ``valid-lifetime`` and
    ``max-valid-lifetime``. When the client does not specify
    a lifetime the default value is used, when it specifies using a DHCP option
-   code 51 this value is used if it is not lesser than the  minimum (in this case
+   code 51 this value is used if it is not less than the  minimum (in this case
    the minimum is returned) or greater than the maximum (in this case the
    maximum is used).
 
diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 7e5f1a70c8..2a250c623b 100644
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -2038,26 +2038,26 @@ specified explicitly or that are calculated as percentages of the
 preferred lease time. The server's behavior is governed by a combination
 of configuration parameters, two of which have already been mentioned.
 
-From Kea 1.6.0 lease preferred and valid lifetime are extended from
+Beginning with Kea 1.6.0 lease preferred and valid lifetime are extended from
 single values to triplets with minimum, default and maximum values using:
 
 
-- ``min-preferred-lifetime`` - specifies the minimal preferred lifetime (optional).
+- ``min-preferred-lifetime`` - specifies the minimum preferred lifetime (optional).
 
 - ``preferred-lifetime`` - specifies the default preferred lifetime.
 
-- ``max-preferred-lifetime`` - specifies the maximal preferred lifetime (optional).
+- ``max-preferred-lifetime`` - specifies the maximum preferred lifetime (optional).
 
-- ``min-valid-lifetime`` - specifies the minimal valid lifetime (optional).
+- ``min-valid-lifetime`` - specifies the minimum valid lifetime (optional).
 
 - ``valid-lifetime`` - specifies the default valid lifetime.
 
-- ``max-valid-lifetime`` - specifies the maximal valid lifetime (optional).
+- ``max-valid-lifetime`` - specifies the maximum valid lifetime (optional).
 
 When the client does not specify lifetimes the default is used. When
 it specifies a lifetime using IAADDR or IAPREFIX sub option with not
 zero values these values are used when they are between configured
-minimal (lower values are round up) and maximal (larger values are
+minimum (lower values are round up) and maximal (larger values are
 round down) bounds.
 
 To send specific, fixed values use the following two parameters: