Browse Source

[master] Document and log message typo corrections

    Merges in branch 'trac3872'
Thomas Markwalder 9 years ago
parent
commit
674d69f4bb

+ 2 - 2
doc/guide/admin.xml

@@ -34,9 +34,9 @@
     <para>
       Backend versions are specified in
       a <replaceable>major.minor</replaceable> format. The minor
-      number is increased when there are backward compatibile changes
+      number is increased when there are backward compatible changes
       introduced.  For example, the addition of a new index. It is
-      desirable, but not mandatory to to apply such a change; you
+      desirable, but not mandatory to apply such a change; you
       can run on older database version if you want to. (Although, in
       the example given, running without the new index may be at the
       expense of a performance penalty.) On the other hand, the major

+ 1 - 1
doc/guide/classify.xml

@@ -18,7 +18,7 @@
       modem is different to the clients behind that modem.
       </para></listitem>
       <listitem><para>
-      The clients have different behavior, e.g.a smart phone behaves
+      The clients have different behavior, e.g. a smart phone behaves
       differently to a laptop.
       </para></listitem>
       <listitem><para>

+ 2 - 2
doc/guide/ctrl-channel.xml

@@ -73,7 +73,7 @@
     <command>result</command> indicates the outcome of the command. A value of 0
     means success while any non-zero value designates an error. Currently 1 is
     used as a generic error, but additional error codes may be added in the
-    future.<command>text</command> field typically appears when result is
+    future. <command>text</command> field typically appears when result is
     non-zero and contains a description of the error encountered, but it may
     also appear for successful results. That's command specific.
     <command>arguments</command> is a map of additional data values returned by
@@ -165,7 +165,7 @@ configuration file.</para>
 
       <para>
 	<emphasis>shutdown</emphasis> command instructs the server to initiate
-	its shutdown procedure. It is the equivalent of sending a SIGTERM singal
+	its shutdown procedure. It is the equivalent of sending a SIGTERM signal
 	to the process. This command does not take any arguments.  An example
 	command may look like this:
 <screen>

+ 4 - 4
doc/guide/ddns.xml

@@ -117,7 +117,7 @@
             directly.  The following command may be used to extract this
             information.  The binary <userinput>path</userinput> may be found
             in the install directory or in the <filename>.libs</filename>
-            subdirectory in the source treee. For example
+            subdirectory in the source tree. For example
             <filename>kea/src/bin/d2/.libs/kea-dhcp-ddns</filename>.
 <screen>
 strings <userinput>path</userinput>/kea-dhcp-ddns | sed -n 's/;;;; //p'
@@ -136,13 +136,13 @@ strings <userinput>path</userinput>/kea-dhcp-ddns | sed -n 's/;;;; //p'
         <itemizedlist>
             <listitem>
             <simpara><command>localstatedir</command>: The value as passed into the
-            build configure script. It defaults defaults to "/usr/local/var".  Note
+            build configure script. It defaults to "/usr/local/var".  Note
             that this value may be overridden at run time by setting the environment
             variable KEA_PIDFILE_DIR.  This is intended primarily for testing purposes.
             </simpara>
             </listitem>
             <listitem>
-            <simpara><command>conf name</command>: The confguration file name
+            <simpara><command>conf name</command>: The configuration file name
             used to start the server, minus all preceding path and file extension.
             For example, given a pathname of "/usr/local/etc/kea/myconf.txt", the
             portion used would be "myconf".
@@ -608,7 +608,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
 	      lease address. The zone name should follow the appropriate
 	      standards: for example, to to support the IPv4 subnet 172.16.1,
 	      the name should be. "1.16.172.in-addr.arpa.".  Similarly,
-	      to support an IPv6 subent of 2001:db8:1, the name should be
+	      to support an IPv6 subnet of 2001:db8:1, the name should be
 	      "1.0.0.0.8.B.D.0.1.0.0.2.ip6.arpa."
 	      Whatever the name, it must be unique within the catalog.
 	      </simpara>

+ 20 - 20
doc/guide/dhcp4-srv.xml

@@ -81,7 +81,7 @@
             directly.  The following command may be used to extract this
             information.  The binary <userinput>path</userinput> may be found
             in the install directory or in the <filename>.libs</filename>
-            subdirectory in the source treee. For example
+            subdirectory in the source tree. For example
             <filename>kea/src/bin/dhcp4/.libs/kea-dhcp4</filename>.
 
 <screen>
@@ -113,13 +113,13 @@ strings <userinput>path</userinput>/kea-dhcp4 | sed -n 's/;;;; //p'
         <itemizedlist>
             <listitem>
             <simpara><command>localstatedir</command>: The value as passed into the
-            build configure script. It defaults defaults to "/usr/local/var".  Note
+            build configure script. It defaults to "/usr/local/var".  Note
             that this value may be overridden at run time by setting the environment
             variable KEA_PIDFILE_DIR.  This is intended primarily for testing purposes.
             </simpara>
             </listitem>
             <listitem>
-            <simpara><command>conf name</command>: The confguration file name
+            <simpara><command>conf name</command>: The configuration file name
             used to start the server, minus all preceding path and file extension.
             For example, given a pathname of "/usr/local/etc/kea/myconf.txt", the
             portion used would be "myconf".
@@ -642,13 +642,13 @@ temporarily override a list of interface names and listen on all interfaces.
   default value <userinput>raw</userinput> is used.
   </para>
 
-  <para>Using UDP sockets automatically disables the reception of brodcast
+  <para>Using UDP sockets automatically disables the reception of broadcast
   packets from directly connected clients. This effectively means that the
   UDP sockets can be used for relayed traffic only. When using the raw sockets,
   both the traffic from the directly connected clients and the relayed traffic
   will be handled. Caution should be taken when configuring the server to open
   multiple raw sockets on the interface with several IPv4 addresses assigned.
-  If the directly connected client sends the message to the brodcast address
+  If the directly connected client sends the message to the broadcast address
   all sockets on this link will receive this message and multiple responses
   will be sent to the client. Hence, the configuration with multiple IPv4
   addresses assigned to the interface should not be used when the directly
@@ -673,7 +673,7 @@ temporarily override a list of interface names and listen on all interfaces.
   mentioned in the <xref linkend="dhcp4-interface-configuration"/>. From
   the administrator's perspective it is often desired to be able to
   configure the system's firewall to filter out the unwanted traffic, and
-  the use of UDP sockets faciliates it. However, the administrator must
+  the use of UDP sockets facilitates it. However, the administrator must
   also be aware of the implications related to filtering certain types
   of traffic as it may impair the DHCP server's operation.
   </para>
@@ -1498,7 +1498,7 @@ It is merely echoed by the server
       <title>Unspecified parameters for DHCPv4 option configuration</title>
       <para>In many cases it is not required to specify all parameters for
       an option configuration and the default values may be used. However, it is
-      important to understand the implications of not specifing some of them
+      important to understand the implications of not specifying some of them
       as it may result in configuration errors. The list below explains
       the behavior of the server when a particular parameter is not explicitly
       specified:
@@ -1700,7 +1700,7 @@ It is merely echoed by the server
         </para>
 
         <para>
-        This example shows a configuration using an automatcially generated
+        This example shows a configuration using an automatically generated
         "VENDOR_CLASS_" class. The Administrator of the network has
         decided that addresses from range 192.0.2.10 to 192.0.2.20 are
         going to be managed by the Dhcp4 server and only clients belonging to the
@@ -2226,7 +2226,7 @@ It is merely echoed by the server
         database for this client, using the client identification information as a
         search key.</simpara></listitem>
         <listitem><simpara>Some configurations use static reservations for the IP
-        addreses and other configuration information. The server's administrator
+        addresses and other configuration information. The server's administrator
         uses client identification information to create these static assignments.
         </simpara></listitem>
         <listitem><simpara>In the dual stack networks there is often a need to
@@ -2272,7 +2272,7 @@ It is merely echoed by the server
       database and will hand out the existing lease rather than allocate
       a new one. Each lease in the lease database is associated with the
       'client identifier' and/or 'chaddr'. The server will first use the
-      'client identifer' (if present) to search the lease. If the lease is
+      'client identifier' (if present) to search the lease. If the lease is
       found, the server will treat this lease as belonging to the client
       even if the current 'chaddr' and the 'chaddr' associated with
       the lease do not match. This facilitates the scenario when the network card
@@ -2390,7 +2390,7 @@ It is merely echoed by the server
     new reservation has been made for the client for the address being currently
     in use by another client. We call this situation a "conflict". The conflicts
     get resolved automatically over time as described in the subsequent sections.
-    Once conflict is resolved,the client will keep receiving the reserved
+    Once conflict is resolved, the client will keep receiving the reserved
     configuration when it renews.</para>
 
     <para>Another example when the host reservations are applicable is when a host
@@ -2404,7 +2404,7 @@ It is merely echoed by the server
     <command>reservations</command> array in the <command>Subnet4</command>
     element. Each element in that array is a structure, that holds information
     about reservations for a single host. In particular, such a structure has
-    to have an indentifer that uniquely identifies a host.  In DHCPv4 context, such an
+    to have an identifier that uniquely identifies a host.  In DHCPv4 context, such an
     identifier is a hardware or MAC address.  In most cases, also an address
     will be specified. It is possible to specify a hostname. Additional
     capabilities are planned.</para>
@@ -2442,7 +2442,7 @@ It is merely echoed by the server
 ]
 </screen>
     The first entry reserves the 192.0.2.202 address for the client that uses
-    MAC adress of 1a:1b:1c:1d:1e:1f. The second entry reserves the address
+    MAC address of 1a:1b:1c:1d:1e:1f. The second entry reserves the address
     192.0.2.100 and the hostname of alice-laptop for client using MAC
     address 0a:0b:0c:0d:0e:0f. Note that if you plan to do DNS updates, it
     is strongly recommended for the hostnames to be unique.
@@ -2648,7 +2648,7 @@ It is merely echoed by the server
       also must not be reserved for another client. Second, when renewing a lease,
       additional check must be performed whether the address being renewed is not
       reserved for another client. Finally, when a host renews an address, the server
-      has to check whether there's a reservation for this host, so the exisiting
+      has to check whether there's a reservation for this host, so the existing
       (dynamically allocated) address should be revoked and the reserved one be
       used instead.
       </para>
@@ -2859,7 +2859,7 @@ It is merely echoed by the server
       that it is expected to hand out to the DHCPv4 clients.  It is
       assumed that the server is authoritative and has complete jurisdiction
       over those addresses. However, due to various reasons, such as
-      misconfiguration or a faulty client implemetation that retains its
+      misconfiguration or a faulty client implementation that retains its
       address beyond the valid lifetime, there may be devices connected that use
       those addresses without the server's approval or knowledge.</para>
 
@@ -2900,7 +2900,7 @@ It is merely echoed by the server
       hook returns (both global and subnet specific variants).</para>
 
       <para>Once the probation time elapses, the declined lease is recovered
-      using the standard expired lease reclaimation procedure, with several
+      using the standard expired lease reclamation procedure, with several
       additional steps. In particular, both declined-addresses statistics
       (global and subnet specific) are decreased. At the same time,
       reclaimed-declined-addresses statistics (again in two variants, global and
@@ -3155,7 +3155,7 @@ It is merely echoed by the server
             <entry>declined-addresses</entry>
             <entry>integer</entry>
             <entry>
-              This statistic shows the number of IPv4 adresses that are
+              This statistic shows the number of IPv4 addresses that are
               currently declined. This statistic counts the number of leases
               currently unavailable. Once a lease is recovered, this
               statistic will be decreased. Ideally, this statistic should be
@@ -3170,7 +3170,7 @@ It is merely echoed by the server
             <entry>subnet[id].declined-addresses</entry>
             <entry>integer</entry>
             <entry>
-              This statistic shows the number of IPv4 adresses that are
+              This statistic shows the number of IPv4 addresses that are
               currently declined in a given subnet. This statistic counts the
               number of leases currently unavailable. Once a lease is
               recovered, this statistic will be decreased. Ideally, this
@@ -3186,7 +3186,7 @@ It is merely echoed by the server
             <entry>reclaimed-declined-addresses</entry>
             <entry>integer</entry>
             <entry>
-              This statistic shows the number of IPv4 adresses that were
+              This statistic shows the number of IPv4 addresses that were
               declined, but have now been recovered. Unlike
               declined-addresses, this statistic never decreases. It can be used
               as a long term indicator of how many actual valid Declines were
@@ -3199,7 +3199,7 @@ It is merely echoed by the server
             <entry>subnet[id].reclaimed-declined-addresses</entry>
             <entry>integer</entry>
             <entry>
-              This statistic shows the number of IPv4 adresses that were
+              This statistic shows the number of IPv4 addresses that were
               declined, but have now been recovered. Unlike
               declined-addresses, this statistic never decreases. It can be used
               as a long term indicator of how many actual valid Declines were

+ 28 - 28
doc/guide/dhcp6-srv.xml

@@ -79,7 +79,7 @@
             directly.  The following command may be used to extract this
             information.  The binary <userinput>path</userinput> may be found
             in the install directory or in the <filename>.libs</filename>
-            subdirectory in the source treee. For example
+            subdirectory in the source tree. For example
             <filename>kea/src/bin/dhcp6/.libs/kea-dhcp6</filename>.
 
 <screen>
@@ -111,13 +111,13 @@ strings <userinput>path</userinput>/kea-dhcp6 | sed -n 's/;;;; //p'
         <itemizedlist>
             <listitem>
             <simpara><command>localstatedir</command>: The value as passed into the
-            build configure script. It defaults defaults to "/usr/local/var".  Note
+            build configure script. It defaults to "/usr/local/var".  Note
             that this value may be overridden at run time by setting the environment
             variable KEA_PIDFILE_DIR.  This is intended primarily for testing purposes.
             </simpara>
             </listitem>
             <listitem>
-            <simpara><command>conf name</command>: The confguration file name
+            <simpara><command>conf name</command>: The configuration file name
             used to start the server, minus all preceding path and file extension.
             For example, given a pathname of "/usr/local/etc/kea/myconf.txt", the
             portion used would be "myconf".
@@ -1376,7 +1376,7 @@ should include options from the isc option space:
       <title>Unspecified parameters for DHCPv6 option configuration</title>
       <para>In many cases it is not required to specify all parameters for
       an option configuration and the default values can be used. However, it is
-      important to understand the implications of not specifing some of them
+      important to understand the implications of not specifying some of them
       as it may result in configuration errors. The list below explains
       the behavior of the server when a particular parameter is not explicitly
       specified:
@@ -1595,7 +1595,7 @@ should include options from the isc option space:
       <para>There are certain conditions that must be met for the option to be
       included. First, the server must not provide the option by itself. In
       other words, if both relay and server provide an option, the server always
-      takes precedence. Second, the option must be RSOO-enabled. IANA mantains a
+      takes precedence. Second, the option must be RSOO-enabled. IANA maintains a
       list of RSOO-enabled options <ulink url="http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xhtml#options-relay-supplied">here</ulink>.
       However, there may be cases when system administrators want to echo other
       options. Kea can be instructed to treat other options as RSOO-enabled.
@@ -1634,11 +1634,11 @@ should include options from the isc option space:
       In certain cases it is useful to differentiate between different types
       of clients and treat them accordingly. It is envisaged that client
       classification will be used for changing the behavior of almost any part of
-      the DHCP message processing, including the assignement of leases from different
-      pools, the assigment of different options (or different values of the same
-      options) etc. In the current release of the sofware however, there are
+      the DHCP message processing, including the assignment of leases from different
+      pools, the assignment of different options (or different values of the same
+      options) etc. In the current release of the software however, there are
       only two mechanisms that take advantage of client classification:
-      subnet selection and assignment of differnet options.
+      subnet selection and assignment of different options.
       </para>
 
       <para>
@@ -1717,7 +1717,7 @@ should include options from the isc option space:
       </para>
 
       <para>
-      This example shows a configuration using an automatcially generated
+      This example shows a configuration using an automatically generated
       "VENDOR_CLASS_" class. The Administrator of the network has
       decided that addresses from range 2001:db8:1::1 to 2001:db8:1::ffff are
       going to be managed by the Dhcp6 server and only clients belonging to the
@@ -2169,7 +2169,7 @@ should include options from the isc option space:
     that has specific requirements, e.g. a printer that needs additional DHCP options
     or a cable modem needs specific parameters. Yet another possible use case for
     host reservation is to define unique names for hosts.  Although not all of
-    the presented use cases are are implemented yet, Kea software will support them
+    the presented use cases are implemented yet, Kea software will support them
     in the near future.</para>
 
     <para>Hosts reservations are defined as parameters for each subnet. Each host
@@ -2178,7 +2178,7 @@ should include options from the isc option space:
     <command>reservations</command> array in the
     <command>Subnet6</command> structure. Each element in that array
     is a structure, that holds information about a single host. In
-    particular, such a structure has to have an indentifer that
+    particular, such a structure has to have an identifier that
     uniquely identifies a host.  In DHCPv6 context, such an identifier
     is a hardware (MAC) address or a DUID.  Also, either one or more
     addresses or prefixes should be specified. It is possible to
@@ -2237,7 +2237,7 @@ should include options from the isc option space:
     It is not allowed to define multiple host definitions with the same hardware
     address in a single subnet. It is a valid configuration, if such definitions
     are specified in different subnets, though. The reservation for a given host
-    should include only one identifier, either DUID or hwardware address. Defining
+    should include only one identifier, either DUID or hardware address. Defining
     both for the same host is considered a configuration error, but as of 0.9.1
     beta, it is not rejected.
     </para>
@@ -2275,7 +2275,7 @@ should include options from the isc option space:
     <section id="reservation6-conflict">
       <title>Conflicts in DHCPv6 reservations</title>
       <para>As reservations and lease information are stored in different places,
-      conflicts may arrise. Consider the following series of events. The server
+      conflicts may arise. Consider the following series of events. The server
       has configured the dynamic pool of addresses from the range of 2001:db8::10
       to 2001:db8::20. Host A requests an address and gets 2001:db8::10. Now the
       system administrator decides to reserve an address for host B. He decides
@@ -2327,7 +2327,7 @@ should include options from the isc option space:
       <para>When the reservation for the client includes the <command>hostname
       </command>, the server will assign this hostname to the client and send
       it back in the Client FQDN, if the client sent the FQDN option to the
-      the server. The reserved hostname always takes precedence over the hostname
+      server. The reserved hostname always takes precedence over the hostname
        supplied by the client (via the FQDN option) or the autogenerated
       (from the IPv6 address) hostname.</para>
 
@@ -2626,7 +2626,7 @@ should include options from the isc option space:
       </para>
 
       <para>
-        The hexadecimal representation of the DUID-EN created accoring to
+        The hexadecimal representation of the DUID-EN created according to
         the configuration above is:
 <screen>
 00:02:00:00:09:BF:87:AB:EF:7A:5B:B5:45
@@ -2897,10 +2897,10 @@ should include options from the isc option space:
 
     <section id="mac-in-dhcpv6">
       <title>MAC/Hardware addresses in DHCPv6</title>
-      <para>MAC/hardware addesses are available in DHCPv4 messages
+      <para>MAC/hardware addresses are available in DHCPv4 messages
       from the clients and administrators
       frequently use that information to perform certain tasks, like per host
-      configuration, address reserveration for specific MAC addresses and other.
+      configuration, address reservation for specific MAC addresses and other.
       Unfortunately, the DHCPv6 protocol does not provide any completely reliable way
       to retrieve that information. To mitigate that issue a number of mechanisms
       have been implemented in Kea that attempt to gather that information. Each
@@ -2951,18 +2951,18 @@ should include options from the isc option space:
         <simpara><command>duid</command> - DHCPv6 uses DUID identifiers instead of
         MAC addresses. There are currently four DUID types defined, with two of them
         (DUID-LLT, which is the default one and DUID-LL) convey MAC address information.
-        Although RFC3315 forbids it, it is possible to parse those DUIDs and extract
+        Although RFC 3315 forbids it, it is possible to parse those DUIDs and extract
         necessary information from them. This method is not completely reliable, as
         clients may use other DUID types, namely DUID-EN or DUID-UUID.
         </simpara>
       </listitem>
       <listitem>
-        <simpara><command>ipv6-link-local</command> - Another possible aquisition
+        <simpara><command>ipv6-link-local</command> - Another possible acquisition
         method comes from the source IPv6 address. In typical usage, clients are
         sending their packets from IPv6 link-local addresses. There's a good chance
         that those addresses are based on EUI-64, which contains MAC address. This
         method is not completely reliable, as clients may use other link-local address
-        types.  In particular, privacy extensions, defined in RFC4941, do not use
+        types.  In particular, privacy extensions, defined in RFC 4941, do not use
         MAC addresses.  Also note that successful extraction requires that the
         address's u-bit must be set to 1 and its g-bit set to 0, indicating that it
         is an interface identifier as per
@@ -3029,7 +3029,7 @@ should include options from the isc option space:
       addresses that it is expected to hand out to the DHCPv6 clients.
       It is assumed that the server is authoritative and has complete
       jurisdiction over those addresses. However, due to various
-      reasons, such as misconfiguration or a faulty client implenetation
+      reasons, such as misconfiguration or a faulty client implementation
       that retains its address beyond the valid lifetime, there may be
       devices connected that use those addresses without the server's
       approval or knowledge.</para>
@@ -3073,7 +3073,7 @@ should include options from the isc option space:
       returns (both global and subnet specific variants).</para>
 
       <para>Once the probation time elapses, the declined lease is recovered
-      using the standard expired lease reclaimation procedure, with several
+      using the standard expired lease reclamation procedure, with several
       additional steps. In particular, both declined-addresses statistics
       (global and subnet specific) are decreased. At the same time,
       reclaimed-declined-addresses statistics (again in two variants, global and
@@ -3162,7 +3162,7 @@ should include options from the isc option space:
               <entry>
                 Number of ADVERTISE packets received. Advertise packets are sent
                 by the server and the server is never expected to receive them. A non-zero
-                value of this statistic indicates an error ocurring in the network.
+                value of this statistic indicates an error occurring in the network.
                 One likely cause would be a misbehaving relay agent that incorrectly
                 forwards ADVERTISE messages towards the server, rather back to the
                 clients.
@@ -3349,7 +3349,7 @@ should include options from the isc option space:
             <entry>declined-addresses</entry>
             <entry>integer</entry>
             <entry>
-              This statistic shows the number of IPv6 adresses that are
+              This statistic shows the number of IPv6 addresses that are
               currently declined. This statistic counts the number of leases
               currently unavailable. Once a lease is recovered, this
               statistic will be decreased. Ideally, this statistic should be
@@ -3364,7 +3364,7 @@ should include options from the isc option space:
             <entry>subnet[id].declined-addresses</entry>
             <entry>integer</entry>
             <entry>
-              This statistic shows the number of IPv6 adresses that are
+              This statistic shows the number of IPv6 addresses that are
               currently declined in a given subnet. This statistic counts the
               number of leases currently unavailable. Once a lease is
               recovered, this statistic will be decreased. Ideally, this
@@ -3380,7 +3380,7 @@ should include options from the isc option space:
             <entry>reclaimed-declined-addresses</entry>
             <entry>integer</entry>
             <entry>
-              This statistic shows the number of IPv6 adresses that were
+              This statistic shows the number of IPv6 addresses that were
               declined, but have now been recovered. Unlike
               declined-addresses, this statistic never decreases. It can be used
               as a long term indicator of how many actual valid Declines were
@@ -3393,7 +3393,7 @@ should include options from the isc option space:
             <entry>subnet[id].reclaimed-declined-addresses</entry>
             <entry>integer</entry>
             <entry>
-              This statistic shows the number of IPv6 adresses that were
+              This statistic shows the number of IPv6 addresses that were
               declined, but have now been recovered. Unlike
               declined-addresses, this statistic never decreases. It can be used
               as a long term indicator of how many actual valid Declines were

+ 1 - 1
doc/guide/intro.xml

@@ -28,7 +28,7 @@
     <section>
       <title>Supported Platforms</title>
       <para>
-        Kea is officially supported on RedHat Enterprise Linux,
+        Kea is officially supported on Red Hat Enterprise Linux,
 	CentOS, Fedora and FreeBSD systems. It is also likely to work on many
 	other platforms: builds have been tested on (in no particular order)
         Debian GNU/Linux 6 and unstable, Ubuntu 9.10, NetBSD 5,

+ 2 - 2
doc/guide/keactrl.xml

@@ -164,9 +164,9 @@ INFO/keactrl: Starting kea-dhcp-ddns -c /usr/local/etc/kea/kea.conf -d
       </para>
 
       <para>Kea's servers create PID files upon startup. These files are used
-      by keactrl to deteremine whether or not a given server is running.  If
+      by keactrl to determine whether or not a given server is running.  If
       one or more servers are running when the start command is issued, the
-      output will look similiar to the following:
+      output will look similar to the following:
 <screen>
 <userinput>$ keactrl start</userinput>
 INFO/keactrl: kea-dhcp4 appears to be running, see: PID 10918, PID file: /usr/local/var/kea/kea.kea-dhcp4.pid.

+ 1 - 1
doc/guide/lease-expiration.xml

@@ -136,7 +136,7 @@
     the cycles.
     </para>
 
-    <para>According to the <command>reclamim-timer-wait-time</command> the
+    <para>According to the <command>reclaim-timer-wait-time</command> the
     server keeps fixed intervals of 5 seconds between the end of one cycle
     and the start of the next cycle. This guarantees the presence of
     5s long periods during which the server remains responsive to DHCP

+ 3 - 3
doc/guide/lfc.xml

@@ -10,7 +10,7 @@
     <section id="kea-lfc-overview">
       <title>Overview</title>
       <para><command>kea-lfc</command> is a service process that removes
-      redundant infomation from the files used to provide persistent storage
+      redundant information from the files used to provide persistent storage
       for the memfile data base backend. This service is written to run as a
       stand alone process.  
       </para>
@@ -58,7 +58,7 @@ kea-lfc [-4 | -6] -c config-file -p pid-file -x previous-file -i copy-file -o ou
             When <command>kea-lfc</command> starts this
             is the result of any previous run of <command>kea-lfc</command>.
             When <command>kea-lfc</command> finishes it is the result of this run.
-            If <command>kea-lfc</command> is interrupted before compelting
+            If <command>kea-lfc</command> is interrupted before completing,
             this file may not exist.
           </simpara></listitem>
 
@@ -72,7 +72,7 @@ kea-lfc [-4 | -6] -c config-file -p pid-file -x previous-file -i copy-file -o ou
           <listitem><simpara>
             <command>output</command> &mdash;
             The temporary file <command>kea-lfc</command> should use to write the leases.
-            Upon completion of writing this this file it will be moved to the finish file
+            Upon completion of writing this file, it will be moved to the finish file
            (see below).
           </simpara></listitem>
 

+ 14 - 14
doc/guide/logging.xml

@@ -188,9 +188,9 @@
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp4.bad-packets</command> - this is the
-            logger used by the DHCPv4 server deamon for logging inbound client
+            logger used by the DHCPv4 server daemon for logging inbound client
             packets that were dropped or to which the server responded with a
-            DHCPNAK. The allows adminstrators to configure a separate log
+            DHCPNAK. The allows administrators to configure a separate log
             output that contains only packet drop and reject entries.</simpara>
           </listitem>
           <listitem>
@@ -213,7 +213,7 @@
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp4.dhcp4</command> - this is the logger
-            by the DHCPv4 server deamon to log basic operations.</simpara>
+            by the DHCPv4 server daemon to log basic operations.</simpara>
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp4.dhcpsrv</command> - this is a base
@@ -234,7 +234,7 @@
           <listitem>
             <simpara><command>kea-dhcp4.hosts</command> - this logger is used
             within the libdhcpsrv and it logs messages related to the management
-            of the DHCPv4 host reservations, i.e. retrieval of the resevations
+            of the DHCPv4 host reservations, i.e. retrieval of the reservations
             and adding new reservations.</simpara>
           </listitem>
           <listitem>
@@ -278,7 +278,7 @@
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp6.bad-packets</command> - this is the
-            logger used by the DHCPv6 server deamon for logging inbound client
+            logger used by the DHCPv6 server daemon for logging inbound client
             packets that were dropped.</simpara>
           </listitem>
           <listitem>
@@ -301,7 +301,7 @@
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp6.dhcp6</command> - this is the logger
-            used DHCPv6 server deamon to log basic operations.</simpara>
+            used DHCPv6 server daemon to log basic operations.</simpara>
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp6.dhcpsrv</command> - this is a base
@@ -322,7 +322,7 @@
           <listitem>
             <simpara><command>kea-dhcp6.hosts</command> - this logger is used
             within the libdhcpsrv and it logs messages related to the management
-            of the DHCPv6 host reservations, i.e. retrieval of the resevations
+            of the DHCPv6 host reservations, i.e. retrieval of the reservations
             and adding new reservations.</simpara>
           </listitem>
           <listitem>
@@ -353,25 +353,25 @@
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp-ddns</command> - this is the root logger for
-            the kea-dhcp-ddns deamon. All components used by this deamon inherit
+            the kea-dhcp-ddns daemon. All components used by this daemon inherit
             the settings from this logger if there is no specialized logger
             provided.</simpara>
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp-ddns.dhcpddns</command> - this is the logger
-            used by the kea-dhcp-ddns deamon for logging configuration and global
+            used by the kea-dhcp-ddns daemon for logging configuration and global
             event information.  This logger does not specify logging settings
-            for libraries used by the deamon.</simpara>
+            for libraries used by the daemon.</simpara>
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp-ddns.dhcp-to-d2</command> - this is the logger
-            used by the kea-dhcp-ddns deamon for logging information about events
-            dealing with receving messages from the DHCP servers and adding them
+            used by the kea-dhcp-ddns daemon for logging information about events
+            dealing with receiving messages from the DHCP servers and adding them
             to the queue for processing.</simpara>
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp-ddns.d2-to-dns</command> - this is the logger
-            used by the kea-dhcp-ddns deamon for logging information about events
+            used by the kea-dhcp-ddns daemon for logging information about events
             dealing with sending and receiving messages with the DNS servers.
             </simpara>
           </listitem>
@@ -770,7 +770,7 @@ file be created.</para>
       </para>
       <para>
         The following environment variables can be used to control the
-        behavio of logging during startup:
+        behavior of logging during startup:
       </para>
 
           <variablelist>

+ 2 - 2
doc/guide/quickstart.xml

@@ -90,7 +90,7 @@ $ <userinput>./configure [your extra parameters]</userinput></screen>
 
         <listitem>
           <para>
-            If the server has been started sucessfully, test that it is
+            If the server has been started successfully, test that it is
             responding to DHCP queries and that the client
             receives a configuration from the server; for example, use
             the <ulink url="http://www.isc.org/downloads/DHCP/">ISC DHCP client</ulink>.
@@ -118,7 +118,7 @@ $ <userinput>./configure [your extra parameters]</userinput></screen>
       <title>Running Kea servers directly</title>
       <para>Kea servers can be started directly (without a need to use
       <command>keactrl</command>). To start DHCPv4 server run the following
-      commmand:
+      command:
       <screen># <userinput>kea-dhcp4 -c /path/to/your/kea4/config/file.json</userinput></screen>
       And, to start the DHCPv6 server run the following command:
       <screen># <userinput>kea-dhcp6 -c /path/to/your/kea6/config/file.json</userinput></screen>

+ 6 - 4
src/bin/admin/kea-admin.xml

@@ -194,22 +194,24 @@
       <citerefentry>
         <refentrytitle>keactrl</refentrytitle>
         <manvolnum>8</manvolnum>
-      </citerefentry>
+      </citerefentry>,
 
       <citerefentry>
         <refentrytitle>kea-dhcp4</refentrytitle>
         <manvolnum>8</manvolnum>
-      </citerefentry>
+      </citerefentry>,
 
       <citerefentry>
         <refentrytitle>kea-dhcp6</refentrytitle>
         <manvolnum>8</manvolnum>
-      </citerefentry>
+      </citerefentry>,
 
       <citerefentry>
         <refentrytitle>kea-dhcp-ddns</refentrytitle>
         <manvolnum>8</manvolnum>
-      </citerefentry>
+      </citerefentry>,
+
+      <citetitle>Kea Administrator Guide</citetitle>.
 
     </para>
   </refsect1>

+ 8 - 7
src/bin/d2/d2_messages.mes

@@ -137,7 +137,7 @@ This is an error message issued when DNSClient returns an unrecognized status
 while DHCP_DDNS was adding a forward address mapping.  The request will be
 aborted.  This is most likely a programmatic issue and should be reported.
 
-% DHCP_DDNS_FORWARD_ADD_BUILD_FAILURE DNS Request ID %1:  udpate message to add a forward DNS entry could not be constructed for this request: %2, reason: %3
+% DHCP_DDNS_FORWARD_ADD_BUILD_FAILURE DNS Request ID %1:  update message to add a forward DNS entry could not be constructed for this request: %2, reason: %3
 This is an error message issued when an error occurs attempting to construct
 the server bound packet requesting a forward address addition.  This is due
 to invalid data contained in the NameChangeRequest. The request will be aborted.
@@ -163,7 +163,7 @@ This is an error message issued when DNSClient returns an unrecognized status
 while DHCP_DDNS was removing a forward address mapping.  The request will be
 aborted.  This is most likely a programmatic issue and should be reported.
 
-% DHCP_DDNS_FORWARD_REMOVE_ADDRS_BUILD_FAILURE DNS Request ID %1: udpate message to remove a forward DNS Address entry could not be constructed for this request: %2, reason: %3
+% DHCP_DDNS_FORWARD_REMOVE_ADDRS_BUILD_FAILURE DNS Request ID %1: update message to remove a forward DNS Address entry could not be constructed for this request: %2, reason: %3
 This is an error message issued when an error occurs attempting to construct
 the server bound packet requesting a forward address (A or AAAA) removal.  This
 is due to invalid data contained in the NameChangeRequest. The request will be
@@ -190,10 +190,11 @@ This is an error message issued when DNSClient returns an unrecognized status
 while DHCP_DDNS was removing forward RRs.  The request will be aborted. This is
 most likely a programmatic issue and should be reported.
 
-% DHCP_DDNS_FORWARD_REMOVE_RRS_BUILD_FAILURE DNS Request ID %1: udpate message to remove forward DNS RR entries could not be constructed for this request: %2,  reason: %3
+% DHCP_DDNS_FORWARD_REMOVE_RRS_BUILD_FAILURE DNS Request ID %1: update message to remove forward DNS RR entries could not be constructed for this request: %2,  reason: %3
 This is an error message issued when an error occurs attempting to construct
 the server bound packet requesting forward RR (DHCID RR) removal.  This is due
-to invalid data contained in the NameChangeRequest. The request will be aborted.This is most likely a configuration issue.
+to invalid data contained in the NameChangeRequest. The request will be aborted.
+This is most likely a configuration issue.
 
 % DHCP_DDNS_FORWARD_REMOVE_RRS_IO_ERROR DHCP_DDNS Request ID %1: encountered an IO error sending a forward RR removal for FQDN %2 to DNS server %3
 This is an error message issued when a communication error occurs while
@@ -284,7 +285,7 @@ This is an error message that occurs when DHCP_DDNS is unable to create
 its PID file.  The log message should contain details sufficient to
 determine the underlying cause.  The most likely culprits are that
 some portion of the pathname does not exist or a permissions issue. The
-default path is determined by --localstatedir configure paramter but
+default path is determined by --localstatedir configure parameter but
 may be overridden by setting environment variable, KEA_PIDFILE_DIR.  The
 first argument is the DHCP_DDNS process name.
 
@@ -383,7 +384,7 @@ mapping removals which were received and accepted by an appropriate DNS server.
 % DHCP_DDNS_REQUEST_DROPPED Request ID %1: Request contains no enabled update requests and will be dropped: %2
 This is a debug message issued when DHCP_DDNS receives a request which does not
 contain updates in a direction that is enabled.  In other words, if only forward
-updates are enabled and request is recevied that asks only for reverse updates
+updates are enabled and request is received that asks only for reverse updates
 then the request is dropped.
 
 % DHCP_DDNS_REVERSE_REMOVE_BAD_DNSCLIENT_STATUS DHCP_DDNS Request ID %1: received an unknown DNSClient status: %2, while removing reverse address mapping for FQDN %3 to DNS server %4
@@ -467,7 +468,7 @@ unable to respond correctly to signals.
 
 % DHCP_DDNS_STARTED Kea DHCP-DDNS server version %1 started
 This informational message indicates that the DHCP-DDNS server has
-processed all configuration information and is ready to beging processing.
+processed all configuration information and is ready to begin processing.
 The version is also printed.
 
 % DHCP_DDNS_STARTING DHCP-DDNS starting, pid: %1, version: %2

+ 4 - 4
src/bin/dhcp4/dhcp4_messages.mes

@@ -47,7 +47,7 @@ through its main loop to perform handling of any pending signals
 and timers. After that, it will enter the wait state again.
 
 % DHCP4_BUFFER_WAIT_INTERRUPTED interrupted wait for the next packet due to timeout, signal or external socket callback (timeout value is %1)
-This debug message is issued when the server intrrupts waiting
+This debug message is issued when the server interrupts waiting
 for reception of the next DHCPv6 message due to timeout, signal
 or reception of the data over socket other than used for DHCPv4
 message transmission. The server will now handle signals
@@ -321,7 +321,7 @@ identification information. The second argument specifies the hostname.
 The third argument contains the error details.
 
 % DHCP4_NCR_CREATE %1: DDNS updates enabled, therefore sending name change requests
-This debug message message is issued when the server is starting to send
+This debug message is issued when the server is starting to send
 name change requests to the D2 module to update records for the client
 in the DNS. This includes removal of old records and addition of the
 new records as required. Details of the name change requests will be
@@ -532,7 +532,7 @@ is a normal operation during client shutdown. The first argument includes
 the client and transaction identification information. The second argument
 includes the released IPv4 address.
 
-% DHCP4_RELEASE_EXCEPTION %1: while trying to release address %2 an exception occured: %3
+% DHCP4_RELEASE_EXCEPTION %1: while trying to release address %2 an exception occurred: %3
 This message is output when an error was encountered during an attempt
 to process a DHCPRELEASE message. The error will not affect the client,
 which does not expect any response from the server for DHCPRELEASE
@@ -624,7 +624,7 @@ has failed.  As a result, the server will exit.  The reason for the
 failure is given within the message.
 
 % DHCP4_SRV_D2STOP_ERROR error stopping IO with DHCP_DDNS during shutdown: %1
-This error message indicates that during shutdown, an erro occurred while
+This error message indicates that during shutdown, an error occurred while
 stopping IO between the DHCPv4 server and the DHCP_DDNS server.  This is
 probably due to a programmatic error is not likely to impact either server
 upon restart.  The reason for the failure is given within the message.

+ 3 - 3
src/bin/dhcp6/dhcp6_messages.mes

@@ -215,7 +215,7 @@ be able to recover from that.
 
 % DHCP6_DECLINE_LEASE Client %1 sent DECLINE for address %2 and the server marked it as declined. The lease will be recovered in %3 seconds.
 This informational message indicates that the client leased an address, but
-discovered that it is being used by some other devicea and reported this to the
+discovered that it is being used by some other device and reported this to the
 server by sending a Decline message. The server marked the lease as
 declined. This likely indicates a misconfiguration in the network. Either
 the server is configured with an incorrect pool or there are devices that have
@@ -663,7 +663,7 @@ has failed.  As a result, the server will exit.  The reason for the
 failure is given within the message.
 
 % DHCP6_SRV_D2STOP_ERROR error stopping IO with DHCP_DDNS during shutdown: %1
-This error message indicates that during shutdown, an erro occurred while
+This error message indicates that during shutdown, an error occurred while
 stopping IO between the DHCPv6 server and the DHCP_DDNS server.  This is
 probably due to a programmatic error is not likely to impact either server
 upon restart.  The reason for the failure is given within the message.
@@ -716,7 +716,7 @@ That could either mean missing functionality or invalid or broken relay or clien
 The list of formally defined message types is available here:
 http://www.iana.org/assignments/dhcpv6-parameters.
 
-% DHCP6_USING_SERVERID server is using server-id %1 and stores in the the file %2
+% DHCP6_USING_SERVERID server is using server-id %1 and stores in the file %2
 This info message is logged when the server reads its server-id from a
 file or generates it. This message is a notification to the administrator
 what server-id will be used and where it is persisted. Typically, there is

+ 2 - 2
src/bin/lfc/kea-lfc.xml

@@ -120,7 +120,7 @@
           <command>kea-lfc</command> process.  It may also
           contain configuration entries for other Kea services.
           Currently <command>kea-lfc</command> gets all of its arguments from
-          the comamnd line, in the future it will be extended to get some arguments
+          the command line, in the future it will be extended to get some arguments
           from the config file.
         </para></listitem>
       </varlistentry>
@@ -142,7 +142,7 @@
           Previous or ex lease file - When <command>kea-lfc</command> starts this
           is the result of any previous run of <command>kea-lfc</command>.
           When <command>kea-lfc</command> finishes it is the result of this run.
-          If <command>kea-lfc</command> is interrupted before compelting
+          If <command>kea-lfc</command> is interrupted before completing,
           this file may not exist.
         </para></listitem>
       </varlistentry>

+ 4 - 4
src/bin/lfc/lfc_messages.mes

@@ -7,19 +7,19 @@
 $NAMESPACE isc::lfc
 % LFC_FAIL_PID_CREATE : %1
 This message is issued if LFC detected a failure when trying
-to create the PID file.  It includes a more specifc error string.
+to create the PID file.  It includes a more specific error string.
 
 % LFC_FAIL_PID_DEL : %1
 This message is issued if LFC detected a failure when trying
-to delete the PID file.  It includes a more specifc error string.
+to delete the PID file.  It includes a more specific error string.
 
 % LFC_FAIL_PROCESS : %1
 This message is issued if LFC detected a failure when trying
-to process the files.  It includes a more specifc error string.
+to process the files.  It includes a more specific error string.
 
 % LFC_FAIL_ROTATE : %1
 This message is issued if LFC detected a failure when trying
-to rotate the files.  It includes a more specifc error string.
+to rotate the files.  It includes a more specific error string.
 
 % LFC_PROCESSING Previous file: %1, copy file: %2
 This message is issued just before LFC starts processing the

+ 9 - 4
src/bin/perfdhcp/perfdhcp.xml

@@ -161,7 +161,7 @@
         <para>
             The template files should be used in conjunction with the command
             line parameters which specify offsets of the data fields being
-            modified in outbound packets. For example, example, the <option>-E
+            modified in outbound packets. For example, the <option>-E
             <replaceable class="parameter">time-offset</replaceable></option>
             switch specifies the offset of the DHCPv6 Elapsed Time option in
             the packet template. If the offset is specified, perfdhcp will
@@ -756,7 +756,7 @@
                             multicast address FF05::1:3).  The server is
                             mandatory except where the <option>-l</option>
                             option is given to specify an interface, in
-                            which case it defauls to 'all'.
+                            which case it defaults to 'all'.
                         </para>
                     </listitem>
                 </varlistentry>
@@ -845,10 +845,15 @@
     <refsect1>
         <title>SEE ALSO</title>
         <para>
+            <citerefentry><refentrytitle>dhcpd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
             <citerefentry><refentrytitle>kea-dhcp4</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
             <citerefentry><refentrytitle>kea-dhcp6</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-            <citetitle>Kea Administrator Guide</citetitle>,
-            <citetitle>DHCP Performance Guide</citetitle>.
+            <citetitle>Kea Administrator Guide</citetitle>.
+<!--
+see http://kea.isc.org/ticket/4077
+            <citetitle>DHCP Performance Guide</citetitle>
+-->
+
         </para>
     </refsect1>
 

+ 6 - 6
src/lib/dhcpsrv/alloc_engine_messages.mes

@@ -200,7 +200,7 @@ address from the dynamic pool and allocate it to the client.
 
 % ALLOC_ENGINE_V4_REQUEST_REMOVE_LEASE %1: removing previous client's lease %2
 This message is logged when the allocation engine removes previous
-lease for the client because the cliet has been allocated new one.
+lease for the client because the client has been allocated new one.
 
 % ALLOC_ENGINE_V4_REQUEST_USE_HR client %1 hasn't requested specific address, using reserved address %2
 This message is issued when the client is not requesting any specific
@@ -234,7 +234,7 @@ Alternatively, if the you know that the number of concurrently active
 clients is less than the addresses you have available, you may want to
 consider reducing the lease lifetime.  In this way, addresses allocated
 to clients that are no longer active on the network will become available
-available sooner.
+sooner.
 
 % ALLOC_ENGINE_V6_ALLOC_HR_LEASE_EXISTS %1: lease type %2 for reserved address/prefix %3 already exists
 This debug message is issued when the allocation engine determines that
@@ -256,7 +256,7 @@ This message is logged when the allocation engine is in the process if
 allocating leases for the client, there are no static reservations,
 but lease(s) exist for the client. The allocation engine will remove
 leases which are reserved for other clients, and return all
-remaning leases to the client.
+remaining leases to the client.
 
 % ALLOC_ENGINE_V6_ALLOC_NO_LEASES_HR no leases found but reservations exist for client %1
 This message is logged when the allocation engine is in the process of
@@ -329,11 +329,11 @@ the lease using the client's hint because the lease for this hint
 is reserved for another client. The first argument includes the
 client identification information.
 
-% ALLOC_ENGINE_V6_HR_ADDR_GRANTED reserved address %1 was was assigned to client %2
+% ALLOC_ENGINE_V6_HR_ADDR_GRANTED reserved address %1 was assigned to client %2
 This informational message signals that the specified client was assigned the address
 reserved for it.
 
-% ALLOC_ENGINE_V6_HR_PREFIX_GRANTED reserved prefix %1/%2 was was assigned to client %3
+% ALLOC_ENGINE_V6_HR_PREFIX_GRANTED reserved prefix %1/%2 was assigned to client %3
 This informational message signals that the specified client was assigned the prefix
 reserved for it.
 
@@ -418,7 +418,7 @@ allocate reserved leases for the client sending a Renew message.
 The server will also remove any leases that the client is trying
 to renew that are not reserved for the client.
 
-% ALLOC_ENGINE_V6_RENEW_REMOVE_RESERVED %1: checking if existing client's leases are reseved for another client
+% ALLOC_ENGINE_V6_RENEW_REMOVE_RESERVED %1: checking if existing client's leases are reserved for another client
 This message is logged when the allocation engine finds leases for
 the client and will check if these leases are reserved for another
 client. If they are, they will not be renewed for the client

+ 7 - 7
src/lib/dhcpsrv/dhcpsrv_messages.mes

@@ -188,7 +188,7 @@ have been experienced.  Any such errors should have preceding entries in the
 log with details.  No further attempts to communicate with kea-dhcp-ddns will
 be made without intervention.
 
-% DHCPSRV_HOOK_LEASE4_RECOVER_SKIP DHCPv4 lease %1 was not recoverd from the declined state because a callout set the skip status.
+% DHCPSRV_HOOK_LEASE4_RECOVER_SKIP DHCPv4 lease %1 was not recovered from the declined state because a callout set the skip status.
 This debug message is printed when a callout installed on lease4_recover
 hook point set the next step status to SKIP. For this particular hook point, this
 indicates that the server should not recover the lease from declined state.
@@ -272,7 +272,7 @@ The argument is the amount of time Kea waits after a reclaimed
 lease expires before considering its removal.
 
 % DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED_START starting deletion of %1 expired-reclaimed leases
-A debug message issued wheb the server has found expired-reclaimed
+A debug message issued when the server has found expired-reclaimed
 leases to be removed. The number of leases to be removed is logged
 in the message.
 
@@ -363,7 +363,7 @@ configures the LFC to be executed periodically. The argument holds the
 interval in seconds in which the LFC will be executed.
 
 % DHCPSRV_MEMFILE_LFC_SPAWN_FAIL lease file cleanup failed to run because kea-lfc process couldn't be spawned
-This error message is logged when the the Kea server fails to run kea-lfc,
+This error message is logged when the Kea server fails to run kea-lfc,
 the program that cleans up the lease file. The server will try again the
 next time a lease file cleanup is scheduled. Although this message should
 not appear and the reason why it did investigated, the occasional failure
@@ -385,7 +385,7 @@ A warning message issued when the schema of the lease file loaded by the server
 is newer than the memfile schema of the server.  The server converts the lease
 data from newer schemas to its schema as it is read, therefore the lease
 information in use by the server will be correct. Note though, that any data
-data stored in newer schema fields will be dropped.  What remains is for the
+stored in newer schema fields will be dropped.  What remains is for the
 file itself to be rewritten using the current schema.
 
 % DHCPSRV_MEMFILE_NEEDS_UPGRADING version of lease file: %1 schema is earlier than version %2
@@ -420,9 +420,9 @@ lease from the memory file database for the specified address.
 A debug message issued when the server is attempting to update IPv6
 lease from the memory file database for the specified address.
 
-% DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE current configuration will result in opening multiple brodcast capable sockets on some interfaces and some DHCP messages may be duplicated
+% DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE current configuration will result in opening multiple broadcast capable sockets on some interfaces and some DHCP messages may be duplicated
 A warning message issued when the current configuration indicates that multiple
-sockets, capable of receiving brodcast traffic, will be opened on some of the
+sockets, capable of receiving broadcast traffic, will be opened on some of the
 interfaces. It must be noted that this may lead to receiving and processing
 the same DHCP message multiple times, as it will be received by each socket
 individually.
@@ -734,7 +734,7 @@ but the server was unable to flag that the handler function
 should be executed for this timer. The callback will not
 be executed this time and most likely the subsequent attempts
 will not be successful too. This error is highly unlikely.
-The name of the timer and thre reason for failure is included
+The name of the timer and the reason for failure is included
 in the message.
 
 % DHCPSRV_TIMERMGR_START_THREAD starting thread for timers

+ 2 - 2
src/lib/dhcpsrv/hosts_messages.mes

@@ -27,7 +27,7 @@ of hosts found respectively.
 
 % HOSTS_CFG_GET_ALL_ADDRESS4_HOST using address %1 found host: %2
 This debug message is issued when found host with the reservation
-for the specified IPv4 addres. The arguments specify the IPv4 address
+for the specified IPv4 address. The arguments specify the IPv4 address
 and the detailed description of the host found.
 
 % HOSTS_CFG_GET_ALL_ADDRESS6 get all hosts with reservations for IPv6 address %1
@@ -140,7 +140,7 @@ the alternate host data source.
 
 % HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_ADDRESS6 trying alternate source for host using subnet id %1 and IPv6 address %2
 This debug message is issued when the Host Manager doesn't find the
-host connected to teh specific subnet and having the reservation for
+host connected to the specific subnet and having the reservation for
 the specified IPv6 address, and it is starting to search for this
 host in the alternate host data source.