[github52] Merge branch 'spelling' of https://github.com/jsoref/kea i…

…nto github52

ChangeLog

@@ -13,7 +13,7 @@
 	(Trac #5215, git b6f1ee0d1210e35631369fc697c76cc3cf2c4130)
 
 1275.	[func]		marcin
-	LibraryHandle obbject can now be used to register handlers
+	LibraryHandle object can now be used to register handlers
 	for the control commands in a hook library.
 	(Trac #5329, git 966cc24ae5593ebb08d6f02a11dab23463ebad7e)
 
@@ -585,7 +585,7 @@ Kea 1.1.0 released on September 30, 2016
 	(Trac #5009, git d3109bb27786867fdc99954ba55367f0ad129e7a)
 
 1174.	[bug]		tmark
-	Modifed kea-dhcp6 to avoid requesting DNS updates when
+	Modified kea-dhcp6 to avoid requesting DNS updates when
 	existing leases are renewed without changes to the FQDN.
 	(Trac #5007, git 05ea3a5eb75c06cf9814c63a1a54261bf58a954b)
 
@@ -1114,7 +1114,7 @@ Kea 1.0.0 released on December 29, 2015
 
 1079.	[bug]		jpopelka
 	Fixed compilation issue in MySQL host data source: the
-	dhcp_identifer_length is now unsigned long. This addresses
+	dhcp_identifier_length is now unsigned long. This addresses
 	a compilation problem on Fedora.
 	(Github #17, git 8548d1b589df98cc956b4d80d2cb8819ef576717)
 
@@ -1165,7 +1165,7 @@ Kea 1.0.0 released on December 29, 2015
 
 1071.	[func]		tmark
 	Assigned unique log message IDs to log messages issued from
-	MySQL hosts storage operations, eliminating resuse of
+	MySQL hosts storage operations, eliminating reuse of
 	lease database message IDs.
 	(Trac #4216, git f0e37cd6d45537971a730c68187011dce41217cc)
 
@@ -1865,7 +1865,7 @@ Kea 0.9.2-beta released on June 30, 2015
 	(Trac #3070, git a6b6156aaa95ab74c69a537e90483f82e9fbe4a2)
 
 946.	[doc]		tmark
-	Added doucmentation for kea-admin "lease-dump" command to the
+	Added documentation for kea-admin "lease-dump" command to the
 	Kea Admininstrator's Guide and kea-admin man page.
 	(Trac #3803, git 54b59b7ef02f6428405794066ea779e9bd4c0b6e)
 
@@ -2572,7 +2572,7 @@ Kea 0.9 released on August 29, 2014
 	(Trac #3524, git 822a39ba33870f70787a1f666aed772e06d04d79)
 
 824.	[bug]		marcin
-	Kea deamons report configuration summary when the configuration is
+	Kea daemons report configuration summary when the configuration is
 	applied successfully.
 	(Trac #3477, git f39d208024f720f72c931016cfa50a54e80f8c61)
 
@@ -2802,7 +2802,7 @@ Kea 0.9beta1 released on August 13, 2014
 	as a result of receiving hints from the clients. Previously the
 	whole prefix (including bits beyond the prefix length) was used to
 	search existing leases in the lease database. If not found, the
-	new lease was crated for the prefix sent by the client. If another
+	new lease was created for the prefix sent by the client. If another
 	client sent the same prefix but with different non-significant bits
 	the prefix was allocated. This led to prefix collisions. Currently,
 	server ignores bits beyond the prefix length when searching for
@@ -3669,7 +3669,7 @@ bind10-1.2.0beta1 released on March 6, 2014
 653.	[func]		tmark
 	Added initial implementation of D2QueueMgr to
 	b10-dhcp-ddns.  This class manages the receipt and
-	queueing of requests received by b10-dhcp-ddns from
+	queuing of requests received by b10-dhcp-ddns from
 	its clients (e.g. DHCP servers)
 	(Trac# 3052, git a970f6c5255e000c053a2dc47926cea7cec2761c)
 
@@ -4151,7 +4151,7 @@ bind10-1.1.0beta1 released on April 4, 2013
 	(Trac #2710, git 16e8be506f32de668699e6954f5de60ca9d14ddf)
 
 588.	[bug]*		jreed
-	b10-xfrout: Log message id XFROUT_QUERY_QUOTA_EXCCEEDED
+	b10-xfrout: Log message id XFROUT_QUERY_QUOTA_EXCEEDED
 	changed to XFROUT_QUERY_QUOTA_EXCEEDED.
 	(git be41be890f1349ae4c870a887f7acd99ba1eaac5)
 

compatcheck/README

@@ -1,5 +1,5 @@
 This directory is a collection of compatibility checker programs.
 They will be run before any other installation attempts on 'make install'
 to see if the installation causes any substantial compatibility problems
-with existing configuratons.  If any checker program finds an issue,
+with existing configurations.  If any checker program finds an issue,
 'make install' will stop at that point.

configure.ac

@@ -114,7 +114,7 @@ AC_LANG([C++])
 AM_CONDITIONAL(USE_GXX, test "X${GXX}" = "Xyes")
 AC_CHECK_DECL([__SUNPRO_CC], [SUNCXX="yes"], [SUNCXX="no"])
 AC_CHECK_DECL([__clang__], [CLANGPP="yes"], [CLANGPP="no"])
-# USE_CLANGPP is no longer used, keep it by summetry with USE_GXX?
+# USE_CLANGPP is no longer used, keep it by symmetry with USE_GXX?
 AM_CONDITIONAL(USE_CLANGPP, test "X${CLANGPP}" = "Xyes")
 
 # Check for C++11 features support
@@ -930,7 +930,7 @@ EOF
     #CRYPTO_LDFLAGS="-ldl"
     CRYPTO_LDFLAGS=""
     CRYPTO_RPATH=""
-    dnl Check avaibility of SHA-2
+    dnl Check availability of SHA-2
     AC_MSG_CHECKING([support of SHA-2])
     LIBS_SAVED=${LIBS}
     LIBS="$LIBS $CRYPTO_LIBS"
@@ -1423,7 +1423,7 @@ AC_ARG_ENABLE(generate_parser, [AC_HELP_STRING([--enable-generate-parser],
    bison and flex are required [default=no]])],
    enable_generate_parser=$enableval, enable_generate_parser=no)
 
-# Check if flex is avaible. Flex is not needed for building Kea sources,
+# Check if flex is available. Flex is not needed for building Kea sources,
 # unless you want to regenerate grammars
 AC_PROG_LEX
 

doc/design/datasrc/data-source-classes.txt

@@ -310,7 +310,7 @@ image::memmgr-mapped-init.png[]
 
 4. The memmgr module then calls
    `ConfigurableClientList::getZoneTableAccessor()`, and calls the
-   `getItertor()` method on it to get a list of zones for which
+   `getIterator()` method on it to get a list of zones for which
    zone data are to be loaded into the memory segment.
 
 5. The memmgr module loads the zone data for each such zone.  This

doc/design/ipc-high.txt

@@ -372,7 +372,7 @@ It is meant mostly as signalling protocol. Sending millions of
 messages or messages of several tens of megabytes is probably a bad
 idea. While there's no architectural limitation with regards of the
 number of transferred messages and the maximum size of message is 4GB,
-the code is not optimised and it would probably be very slow.
+the code is not optimized and it would probably be very slow.
 
 We currently expect the system not to be at heavy load. Therefore, we
 expect the system to keep up with users sending messages. The

doc/design/resolver/01-scaling-across-cores

@@ -66,9 +66,9 @@ Legend
 Goals
 -----
  * Run the CPU intensive tasks in multiple threads to allow concurrency.
- * Minimise waiting for locks.
+ * Minimize waiting for locks.
  * Don't require too much memory.
- * Minimise the number of upstream queries (both because they are slow and
+ * Minimize the number of upstream queries (both because they are slow and
    expensive and also because we don't want to eat too much bandwidth and spam
    the authoritative servers).
  * Design simple enough so it can be implemented.

doc/devel/bison.dox

@@ -78,7 +78,7 @@ convey the intent; a more detailed description is available in subsequent sectio
    @endcode
    The lexer would generate the following sequence of tokens: LCURLY_BRACKET, DHCP6, COLON,
    LCURLY_BRACKET, RENEW_TIMER, COLON, INTEGER (a token with a value of 100), RCURLY_BRACKET,
-   RCURLY_BRACKET, END.  The bison grammar recognises that the sequence forms a valid sentence and
+   RCURLY_BRACKET, END.  The bison grammar recognizes that the sequence forms a valid sentence and
    that there are no errors and act upon it. (Whereas if the left and right braces in the above
    example were exchanged, the bison module would identify the sequence as syntactically incorrect.)
 
@@ -244,7 +244,7 @@ In principle, it is valid to define just the grammar without any corresponding C
 will go through the whole input text, match the rules and will either say the input adhered to the
 rules (parsing successful) or not (parsing failed). This may be a useful step when developing new
 parser, but it has no practical value. To perform specific actions, bison allows the injection of
-C++ code at almost any poing. For example we could augment the parsing of renew_timer with some
+C++ code at almost any point. For example we could augment the parsing of renew_timer with some
 extra code:
 
 @code

doc/devel/config-backend.dox

@@ -13,7 +13,7 @@
 Kea started as a sub-project in BIND10 that used a program (called
 bindctl) to deliver configuration information to its modules. This
 potentially allowed for modules to get their configuration information
-in a variaty of ways using what were known as configuration backends.
+in a variety of ways using what were known as configuration backends.
 After BIND10 was cancelled, the Kea project briefly tried to maintain
 backward compatibility with the BIND10 framework, but the effort
 was discontinued due to lack of interest.

doc/examples/https/httpd2/kea-httpd2.conf

@@ -3,10 +3,10 @@
 #   the service is protected by client's certificate verification
 #   mechanism. Before using this configuration a server administrator
 #   must generate server certificate and private key as well as
-#   the certifiate authority (CA). The clients' certificates must
+#   the certificate authority (CA). The clients' certificates must
 #   be signed by the CA.
 #
-#   Note that the steps provided below to generate and setup certifcates
+#   Note that the steps provided below to generate and setup certificates
 #   are provided as an example for testing purposes only. Always
 #   consider best known security measures to protect your production
 #   environment.
@@ -22,7 +22,7 @@
 #   openssl req -new -x509 -days 365 -key ca.key -out ca.crt
 #
 #
-#   The client certifcate needs to be generated and signed:
+#   The client certificate needs to be generated and signed:
 #
 #   openssl genrsa -des3 -out kea-client.key 4096
 #   openssl req -new -key kea-client.key -out kea-client.csr

doc/examples/https/nginx/kea-nginx.conf

@@ -3,10 +3,10 @@
 #   the service is protected by client's certificate verification
 #   mechanism. Before using this configuration a server administrator
 #   must generate server certificate and private key as well as
-#   the certifiate authority (CA). The clients' certificates must
+#   the certificate authority (CA). The clients' certificates must
 #   be signed by the CA.
 #
-#   Note that the steps provided below to generate and setup certifcates
+#   Note that the steps provided below to generate and setup certificates
 #   are provided as an example for testing purposes only. Always
 #   consider best known security measures to protect your production
 #   environment.

doc/examples/kea4/multiple-options.json

@@ -101,7 +101,7 @@
              "data": "mydomain.example.com, example.com"
          },
             // String options that have a comma in their values need to have
-            // it escaped (i.e. each comma is predeced by two backslashes).
+            // it escaped (i.e. each comma is preceded by two backslashes).
             // That's because commas are reserved for separating fields in
             // compound options. At the same time, we need to be conformant
             // with JSON spec, that does not allow "\,". Therefore the

doc/examples/kea6/multiple-options.json

@@ -79,7 +79,7 @@
             },
 
             // String options that have a comma in their values need to have
-            // it escaped (i.e. each comma is predeced by two backslashes).
+            // it escaped (i.e. each comma is preceded by two backslashes).
             // That's because commas are reserved for separating fields in
             // compound options. At the same time, we need to be conformant
             // with JSON spec, that does not allow "\,". Therefore the

doc/guide/Makefile.am

@@ -58,7 +58,7 @@ CLEANFILES = kea-guide.pdf kea-messages.pdf
 DBLATEX_FLAGS = --xslt-opts=--path --xslt-opts=$(abs_top_builddir)/doc \
 	-P doc.collab.show=0 -P latex.output.revhistory=0 \
 	-P term.breakline=1 -P filename.as.url=0 \
-	-P imagedata.default.scale="maxwidth=50px,maxheigth=35px"
+	-P imagedata.default.scale="maxwidth=50px,maxheight=35px"
 
 pdf: kea-guide.pdf kea-messages.pdf
 

doc/guide/agent.xml

@@ -188,7 +188,7 @@
     a reverse proxy server is also often used for authentication of the
     controlling clients. In this case, the client must present a valid
     certificate when it connects via reverse proxy. The proxy server
-    authenticates the client by checking if the presented certifcate is
+    authenticates the client by checking if the presented certificate is
     signed by the certificate authority used by the server.</para>
 
     <para>To illustrate this, we provide a sample configuration for the

doc/guide/ctrl-channel.xml

@@ -129,7 +129,7 @@
       administrative operations in the CA rather than forwarding it to
       the DHCPv4 server is the ability to perform these operations without
       disrupting the DHCPv4 service (DHCPv4 server doesn't have to stop
-      processing DHCP messages to apply changes to the database). Nevetheless,
+      processing DHCP messages to apply changes to the database). Nevertheless,
       these situations are rather rare and, in most cases, when the
       <command>service</command> parameter contains a name of the service
       the commands are simply forwarded by the CA. The forwarded command
@@ -210,7 +210,7 @@
 
     <para>Kea development team is actively working on providing client applications
     which can be used to control the servers. These applications are, however, in the
-    early stages of development and as of Kea 1.2.0 release have certain limitatins.
+    early stages of development and as of Kea 1.2.0 release have certain limitations.
     The easiest way to start playing with the control API is to use common Unix/Linux tools
     such as <command>socat</command> and <command>curl</command>.</para>
 
@@ -224,7 +224,7 @@ where <command>/path/to/the/kea/socket</command> is the path specified in the
 configuration file. Text passed to <command>socat</command>
 will be sent to Kea and the responses received from Kea printed to standard output.</para>
 
-    <para>It is also easy to open UNIX socket programatically. An example of
+    <para>It is also easy to open UNIX socket programmatically. An example of
     such a simplistic client written in C is available in the Kea Developer's
     Guide, chapter Control Channel Overview, section Using Control Channel.</para>
 

doc/guide/ddns.xml

@@ -159,7 +159,7 @@ strings <userinput>path</userinput>/kea-dhcp-ddns | sed -n 's/;;;; //p'
       <para>
         Before starting <command>kea-dhcp-ddns</command> module for the
         first time, a configuration file needs to be created. The following default
-        configuration is a template that can be customised to your requirements.
+        configuration is a template that can be customized to your requirements.
 <screen>
 <userinput>"DhcpDdns": {
     "ip-address": "127.0.0.1",

doc/guide/hooks.xml

@@ -10,7 +10,7 @@
       <title>Introduction</title>
       <para>
       Although Kea offers a lot of flexibility, there may be cases where
-      its behavior needs customisation.  To accommodate this possibility,
+      its behavior needs customization.  To accommodate this possibility,
       Kea includes the idea of "Hooks".  This feature lets Kea load one
       or more dynamically-linked libraries (known as "hooks libraries")
       and, at various points in its processing ("hook points"), call

doc/guide/shell.xml

@@ -53,7 +53,7 @@ kea-shell [--host hostname] [--port number] [--timeout seconds] [--service servi
 
       <listitem>
         <simpara>
-          <command>--service <replaceable>serive-name</replaceable></command> specifies the
+          <command>--service <replaceable>service-name</replaceable></command> specifies the
           target of a command. If not given, CA will be used as target.  May be used more
           than once to specify multiple targets.
         </simpara>

ext/coroutine/coroutine.h

@@ -20,7 +20,7 @@
 // a single int.
 //
 // A reentrant function contains a CORO_REENTER (coroutine)  { ... }
-// block.  Whenever an asychrnonous operation is initiated within the
+// block.  Whenever an asynchronous operation is initiated within the
 // routine, the function is provided as the handler object.  (The simplest
 // way to do this is to have the reentrant function be the operator()
 // member for the coroutine object itself.)   For example:

src/bin/admin/kea-admin.in

@@ -148,7 +148,7 @@ mysql_init() {
 
     COUNT=`echo $RESULT | wc -w`
     if [ $COUNT -gt 0 ]; then
-        # Let't start with a new line. mysql could have printed something out.
+        # Let's start with a new line. mysql could have printed something out.
         printf "\n"
         log_error "Expected empty database $db_name, but there are $COUNT tables: \n$RESULT. Aborting."
         exit 1

src/bin/admin/tests/dhcpdb_create_1.0.cql

@@ -38,7 +38,7 @@
 -- is initialized to 1.0, then upgraded to 2.0 etc. This may be somewhat
 -- sub-optimal, but it ensues consistency with upgrade scripts. (It is much
 -- easier to maintain init and upgrade scripts if they look the same).
--- Since initialization is done only once, it's perfromance is not an issue.
+-- Since initialization is done only once, it's performance is not an issue.
 
 -- This line starts database initialization to 1.0.
 

src/bin/admin/tests/mysql_tests.sh.in

@@ -276,7 +276,7 @@ EOF
     count=`mysql_execute "${qry}"`
     ERRCODE=$?
     assert_eq 0 $ERRCODE "select from lease_hwaddr_source failed. (expected status code %d, returned %d)"
-    assert_eq 1 "$count" "lease_hwaddr_source does not contain entry for HWADDR_SOURCE_UKNOWN. (record count %d, expected %d)"
+    assert_eq 1 "$count" "lease_hwaddr_source does not contain entry for HWADDR_SOURCE_UNKNOWN. (record count %d, expected %d)"
 
     # table: stored procedures for lease data dumps were modified (upgrade 4.0 -> 4.1)
     # verify  lease4DumpData has order by lease address

src/bin/admin/tests/pgsql_tests.sh.in

@@ -183,7 +183,7 @@ pgsql_upgrade_2_0_to_3_0() {
     assert_eq 1 $count "lease6DumpHeader is missing hwaddr columns"
 
     # Added hwaddr columns to lease6DumpData
-    output=`pgsql_execute "select hwaddr,hwttype,hwaddr_source from lease6DumpData();"`
+    output=`pgsql_execute "select hwaddr,hwtype,hwaddr_source from lease6DumpData();"`
     assert_eq 0 $ERRCODE "function lease6DumpData() broken or missing. (expected status code %d, returned %d)"
 
     # Added order by clause to lease6DumpData
@@ -196,11 +196,11 @@ pgsql_upgrade_2_0_to_3_0() {
     output=`pgsql_execute "select count(hwaddr_source) from lease_hwaddr_source where hwaddr_source = 0 and name='HWADDR_SOURCE_UNKNOWN';"`
     ERRCODE=$?
     assert_eq 0 $ERRCODE "select from lease_hwaddr_source failed. (expected status code %d, returned %d)"
-    assert_eq 1 "$output" "lease_hwaddr_source does not contain entry for HWADDR_SOURCE_UKNOWN. (record count %d, expected %d)"
+    assert_eq 1 "$output" "lease_hwaddr_source does not contain entry for HWADDR_SOURCE_UNKNOWN. (record count %d, expected %d)"
 }
 
 pgsql_upgrade_3_0_to_3_1() {
-    # Verify upgraded schemd reports version 3.1.
+    # Verify upgraded schema reports version 3.1.
     version=$(${keaadmin} lease-version pgsql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir)
     assert_str_eq "3.1" ${version} "Expected kea-admin to return %s, returned value was %s"
 }

src/bin/agent/agent_parser.cc

@@ -490,7 +490,7 @@ namespace isc { namespace agent {
     /// The return value of parse ().
     int yyresult;
 
-    // FIXME: This shoud be completely indented.  It is not yet to
+    // FIXME: This should be completely indented.  It is not yet to
     // avoid gratuitous conflicts when merging into the master branch.
     try
       {

src/bin/agent/agent_parser.h

@@ -218,7 +218,7 @@ namespace isc { namespace agent {
     /// Both variants must be built beforehand, because swapping the actual
     /// data requires reading it (with as()), and this is not possible on
     /// unconstructed variants: it would require some dynamic testing, which
-    /// should not be the variant's responsability.
+    /// should not be the variant's responsibility.
     /// Swapping between built and (possibly) non-built is done with
     /// variant::move ().
     template <typename T>

src/bin/agent/agent_parser.yy

@@ -116,7 +116,7 @@ start: START_JSON      { ctx.ctx_ = ctx.NO_KEYWORDS; } json
 // expected by full grammar, we can tell the parser to start from content of
 // the Control-agent. This is very useful for unit-testing, so we don't need
 // to repeat the outer map and "Control-agent" map. We can simply provide
-// the concents of that map.
+// the contents of that map.
 sub_agent: LCURLY_BRACKET {
     // Parse the Control-agent map
     ElementPtr m(new MapElement(ctx.loc2pos(@1)));