From: Marcin Siodelski Date: Wed, 4 Jun 2014 10:25:03 +0000 (+0200) Subject: [3336] Minor changes after the second review. X-Git-Tag: trac3434_base~14^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f8ff64f05b5582c45caa976542e31fff3ef3731;p=thirdparty%2Fkea.git [3336] Minor changes after the second review. Fixed one typo and clarified in the configuration examples that it is up to the client to pick the renew and rebind timers if the server doesn't send option 58 and 59. --- diff --git a/doc/examples/kea4/single-subnet.json b/doc/examples/kea4/single-subnet.json index 43c6f297e3..dc7d23f243 100644 --- a/doc/examples/kea4/single-subnet.json +++ b/doc/examples/kea4/single-subnet.json @@ -23,8 +23,9 @@ "valid-lifetime": 4000, # Renew and rebind timers are commented out. This implies that options -# 58 and 59 will not be sent to the client. Uncomment them to send -# these options. +# 58 and 59 will not be sent to the client. In this case it is up to +# the client to pick the timer values according to RFC2131. Uncomment the +# timers to send these options to the client. # "renew-timer": 1000, # "rebind-timer": 2000, diff --git a/src/lib/dhcpsrv/triplet.h b/src/lib/dhcpsrv/triplet.h index de72ca48f6..a60510305a 100644 --- a/src/lib/dhcpsrv/triplet.h +++ b/src/lib/dhcpsrv/triplet.h @@ -25,7 +25,7 @@ namespace dhcp { /// This template class is used to store configuration parameters, like lifetime /// or T1. It defines 3 parameters: min, default, and max value. If the /// particular configuration parameter is not mandatory, it is possible to -/// mark the parameter described by a @c Triplet "unspcified". For example, the +/// mark the parameter described by a @c Triplet "unspecified". For example, the /// T1 and T2 values in DHCPv4 server are optional and may be not specified /// in the configuration. The @c Triplets describing these parameters will be /// marked "unspecified". If the server finds that the particular parameter