[github52] Merge branch 'spelling' of https://github.com/jsoref/kea into 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 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)));

src/bin/agent/ca_cfg_mgr.h

@@ -186,7 +186,7 @@ protected:
     ///
     /// @param config Pointer to a configuration specified for the agent.
     /// @param check_only Boolean flag indicating if this method should
-    /// only verify correctness of the provided conifiguration.
+    /// only verify correctness of the provided configuration.
     /// @return Pointer to a result of configuration parsing.
     virtual isc::data::ConstElementPtr
     parse(isc::data::ConstElementPtr config, bool check_only);

src/bin/agent/ca_process.cc

@@ -125,7 +125,7 @@ CtrlAgentProcess::configure(isc::data::ConstElementPtr config_set,
             ctx = boost::dynamic_pointer_cast<CtrlAgentCfgContext>(base_ctx);
 
         if (!ctx) {
-            isc_throw(Unexpected, "Interal logic error: bad context type");
+            isc_throw(Unexpected, "Internal logic error: bad context type");
         }
 
         /// @todo: If the parameter is a hostname, we need to resolve it.

src/bin/agent/ca_process.h

@@ -89,7 +89,7 @@ public:
     /// is quite possible scenario when the user is setting up the listener to
     /// use a restricted port range or non-existing IP address. In this case,
     /// the configuration parser will not signal the problem because IP address
-    /// and/or port are syntactically correcect.
+    /// and/or port are syntactically correct.
     ///
     /// This method deals with this problem by opening a new listener aside of
     /// the currently running listener (if the new listener settings are

src/bin/agent/ca_response_creator.h

@@ -19,7 +19,7 @@ class CtrlAgentResponseCreator;
 /// @brief Pointer to the @ref CtrlAgentResponseCreator.
 typedef boost::shared_ptr<CtrlAgentResponseCreator> CtrlAgentResponseCreatorPtr;
 
-/// @brief Concrete implementation of the HTTP response crator used
+/// @brief Concrete implementation of the HTTP response creator used
 /// by the Control Agent.
 ///
 /// See the documentation of the @ref isc::http::HttpResponseCreator for

src/bin/agent/parser_context.cc

@@ -130,7 +130,7 @@ ParserContext::contextName()
     case SOCKET_TYPE:
         return ("socket-type");
     case HOOKS_LIBRARIES:
-        return ("hooks-librairies");
+        return ("hooks-libraries");
     case LOGGERS:
         return ("loggers");
     case OUTPUT_OPTIONS:

src/bin/agent/tests/ca_cfg_mgr_unittests.cc

@@ -181,13 +181,13 @@ const char* AGENT_CONFIGS[] = {
     "{ }",
 
     // Configuration 1: http parameters only (no control sockets, not hooks)
-    "{  \"http-host\": \"betelguese\",\n"
+    "{  \"http-host\": \"betelgeuse\",\n"
     "    \"http-port\": 8001\n"
     "}",
 
     // Configuration 2: http and 1 socket
     "{\n"
-    "    \"http-host\": \"betelguese\",\n"
+    "    \"http-host\": \"betelgeuse\",\n"
     "    \"http-port\": 8001,\n"
     "    \"control-sockets\": {\n"
     "        \"dhcp4\": {\n"
@@ -198,7 +198,7 @@ const char* AGENT_CONFIGS[] = {
 
     // Configuration 3: http and all 3 sockets
     "{\n"
-    "    \"http-host\": \"betelguese\",\n"
+    "    \"http-host\": \"betelgeuse\",\n"
     "    \"http-port\": 8001,\n"
     "    \"control-sockets\": {\n"
     "        \"dhcp4\": {\n"
@@ -217,7 +217,7 @@ const char* AGENT_CONFIGS[] = {
     // CA is able to load hook libraries that augment its operation.
     // The primary functionality is the ability to add new commands.
     "{\n"
-    "    \"http-host\": \"betelguese\",\n"
+    "    \"http-host\": \"betelgeuse\",\n"
     "    \"http-port\": 8001,\n"
     "    \"control-sockets\": {\n"
     "        \"dhcp4\": {\n"
@@ -236,7 +236,7 @@ const char* AGENT_CONFIGS[] = {
 
     // Configuration 5: http and 1 socket (d2 only)
     "{\n"
-    "    \"http-host\": \"betelguese\",\n"
+    "    \"http-host\": \"betelgeuse\",\n"
     "    \"http-port\": 8001,\n"
     "    \"control-sockets\": {\n"
     "        \"d2\": {\n"
@@ -247,7 +247,7 @@ const char* AGENT_CONFIGS[] = {
 
     // Configuration 6: http and 1 socket (dhcp6 only)
     "{\n"
-    "    \"http-host\": \"betelguese\",\n"
+    "    \"http-host\": \"betelgeuse\",\n"
     "    \"http-port\": 8001,\n"
     "    \"control-sockets\": {\n"
     "        \"dhcp6\": {\n"
@@ -303,7 +303,7 @@ TEST_F(AgentParserTest, configParseHttpOnly) {
 
     CtrlAgentCfgContextPtr ctx = cfg_mgr_.getCtrlAgentCfgContext();
     ASSERT_TRUE(ctx);
-    EXPECT_EQ("betelguese", ctx->getHttpHost());
+    EXPECT_EQ("betelgeuse", ctx->getHttpHost());
     EXPECT_EQ(8001, ctx->getHttpPort());
 }
 

src/bin/agent/tests/ca_controller_unittests.cc

@@ -270,7 +270,7 @@ TEST_F(CtrlAgentControllerTest, sigtermShutdown) {
 
 // Tests that the sockets settings are updated upon successful reconfiguration.
 TEST_F(CtrlAgentControllerTest, successfulConfigUpdate) {
-    // This configuration should be used to override the initial conifguration.
+    // This configuration should be used to override the initial configuration.
     const char* second_config =
         "{"
         "  \"http-host\": \"127.0.0.1\","
@@ -378,7 +378,7 @@ TEST_F(CtrlAgentControllerTest, unsuccessfulConfigUpdate) {
 // listener configuration remains the same. The server should continue using the
 // listener instance it has been using prior to the reconfiguration.
 TEST_F(CtrlAgentControllerTest, noListenerChange) {
-    // This configuration should be used to override the initial conifguration.
+    // This configuration should be used to override the initial configuration.
     const char* second_config =
         "{"
         "  \"http-host\": \"127.0.0.1\","
@@ -436,7 +436,7 @@ TEST_F(CtrlAgentControllerTest, registeredCommands) {
     // code as CtrlAgentController is not initialized the same way it is
     // in production code. In particular, the way CtrlAgentController
     // is initialized in tests does not call registerCommands().
-    // This is a crude workaround for this problem. Proper solution shoul
+    // This is a crude workaround for this problem. Proper solution should
     // be developed sooner rather than later.
     const DControllerBasePtr& base = getController();
     const CtrlAgentControllerPtr& ctrl =
@@ -466,7 +466,7 @@ TEST_F(CtrlAgentControllerTest, configWrite) {
     // code as CtrlAgentController is not initialized the same way it is
     // in production code. In particular, the way CtrlAgentController
     // is initialized in tests does not call registerCommands().
-    // This is a crude workaround for this problem. Proper solution shoul
+    // This is a crude workaround for this problem. Proper solution should
     // be developed sooner rather than later.
     const DControllerBasePtr& base = getController();
     const CtrlAgentControllerPtr& ctrl

src/bin/agent/tests/ca_response_creator_unittests.cc

@@ -111,7 +111,7 @@ public:
         return (createAnswer(CONTROL_RESULT_SUCCESS, arguments));
     }
 
-    /// @brief Instance of the response crator.
+    /// @brief Instance of the response creator.
     CtrlAgentResponseCreator response_creator_;
 
     /// @brief Instance of the "empty" request.

src/bin/d2/d2.dox

@@ -107,7 +107,7 @@ may be described by a spec file (also JSON).  This mechanism is subject to
 change, but in the meantime, the spec file describe D2's configuration may be
 found here: @c src/bin/d2/dhcp-ddns.spec
 
-@section d2NCRReceipt Request Reception and Queueing
+@section d2NCRReceipt Request Reception and Queuing
 
 D2 is designed to receive requests from Kea's DHCP servers, asynchronously and
 store them in queue to be processed.  The classes responsible for this are

src/bin/d2/d2_cfg_mgr.cc

@@ -350,7 +350,7 @@ D2CfgMgr::buildParams(isc::data::ConstElementPtr params_config) {
     // This populate the context scalar stores with all of the parameters.
     DCfgMgrBase::buildParams(params_config);
 
-    // Fetch the parameters in the config, performing any logcial
+    // Fetch the parameters in the config, performing any logical
     // validation required.
     asiolink::IOAddress ip_address(0);
     uint32_t port = 0;

src/bin/d2/d2_cfg_mgr.h

@@ -281,7 +281,7 @@ protected:
     /// @brief Adds default values to the given config
     ///
     /// Adds the D2 default values to the configuration Element map. This
-    /// method is invoked by @c DCfgMgrBase::paserConfig().
+    /// method is invoked by @c DCfgMgrBase::parseConfig().
     ///
     /// @param mutable_config - configuration to which defaults should be added
     virtual void setCfgDefaults(isc::data::ElementPtr mutable_config);

src/bin/d2/d2_parser.cc

@@ -490,7 +490,7 @@ namespace isc { namespace d2 {
     /// 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/d2/d2_parser.h

@@ -219,7 +219,7 @@ namespace isc { namespace d2 {
     /// 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/d2/d2_parser.yy

@@ -110,7 +110,7 @@ using namespace std;
 %%
 
 // The whole grammar starts with a map, because the config file
-// constists of Dhcp, Logger and DhcpDdns entries in one big { }.
+// consists of Dhcp, Logger and DhcpDdns entries in one big { }.
 // We made the same for subparsers at the exception of the JSON value.
 %start start;
 

src/bin/d2/d2_queue_mgr.h

@@ -194,7 +194,7 @@ public:
     ///
     /// This method is invoked by the listener as part of its receive
     /// completion callback and is how the inbound NameChangeRequests are
-    /// passed up to the D2QueueMgr for queueing.
+    /// passed up to the D2QueueMgr for queuing.
     /// If the given result indicates a successful receive completion and
     /// there is room left in the queue, the given request is queued.
     ///

src/bin/d2/d2_simple_parser.cc

@@ -41,7 +41,7 @@ const SimpleDefaults D2SimpleParser::D2_GLOBAL_DEFAULTS = {
     { "ncr-format",         Element::string, "JSON" }
 };
 
-/// Supplies defaults for ddns-domoains list elements (i.e. DdnsDomains)
+/// Supplies defaults for ddns-domains list elements (i.e. DdnsDomains)
 const SimpleDefaults D2SimpleParser::TSIG_KEY_DEFAULTS = {
     { "digest-bits", Element::integer, "0" }
 };
@@ -55,7 +55,7 @@ const SimpleDefaults D2SimpleParser::TSIG_KEY_DEFAULTS = {
 const SimpleDefaults D2SimpleParser::DDNS_DOMAIN_MGR_DEFAULTS = {
 };
 
-/// Supplies defaults for ddns-domoains list elements (i.e. DdnsDomains)
+/// Supplies defaults for ddns-domains list elements (i.e. DdnsDomains)
 const SimpleDefaults D2SimpleParser::DDNS_DOMAIN_DEFAULTS = {
     { "key-name", Element::string, "" }
 };

src/bin/d2/d2_simple_parser.h

@@ -66,7 +66,7 @@ public:
     /// found, then an empty map entry is added for it, thus defaulting the
     /// manager to "disabled".
     ///
-    /// @param global element tree containgin the DDNS domain manager element
+    /// @param global element tree containing the DDNS domain manager element
     /// to which defaults should be
     /// added
     /// @param mgr_name name of the manager element within the element tree

src/bin/d2/d2_update_message.h

@@ -277,7 +277,7 @@ public:
     /// This function decodes the DNS Update message stored in the buffer
     /// specified by the function argument.  If given a TSIG context, then
     /// the function will first attempt to use that context to verify the
-    /// message signature.  If verification fails a TSIGVefiryError exception
+    /// message signature.  If verification fails a TSIGVerifyError exception
     /// will be thrown. The function then parses message header and extracts
     /// the section counters: ZOCOUNT, PRCOUNT, UPCOUNT and ADCOUNT. Using
     /// these counters, function identifies message sections, which follow

src/bin/d2/d2_update_mgr.cc

@@ -82,7 +82,7 @@ D2UpdateMgr::checkFinishedTransactions() {
     while (it != transaction_list_.end()) {
         NameChangeTransactionPtr trans = (*it).second;
         if (trans->isModelDone()) {
-            // @todo  Addtional actions based on NCR status could be
+            // @todo  Additional actions based on NCR status could be
             // performed here.
             transaction_list_.erase(it++);
         } else {

src/bin/d2/images/add_state_model.svg

@@ -35,7 +35,7 @@
 <g>
 	<rect fill="#cbcbcb" stroke="none" stroke-opacity="1" x="233" y="735" width="151" height="22" rx="10" />
 	<rect fill="#ffffc0" stroke="black" stroke-opacity="1" x="229" y="731" width="151" height="22" rx="10" />
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="305" y="747">PROCESSS_ADD_OK_ST</text>
+	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" font-weight="bold" text-anchor="middle" x="305" y="747">PROCESS_ADD_OK_ST</text>
 </g>
 <g>
 	<ellipse fill="white" stroke="black" stroke-width="1" stroke-opacity="1" cx="743" cy="746" rx="11.5" ry="11.5" />

src/bin/d2/images/remove_state_model.svg

@@ -244,7 +244,7 @@
 	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="171" y="350">IO_COMPLETED_EVT</text>
 </g>
 <g>
-	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="133" y="580">SERVER_SELEGTED_EVT</text>
+	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="133" y="580">SERVER_SELECTED_EVT</text>
 </g>
 <g>
 	<text font-family="Helvetica" font-size="11" fill="#000000" xml:space="preserve" x="366" y="681">No reverse change requested</text>

src/bin/d2/nc_trans.cc

@@ -134,7 +134,7 @@ NameChangeTransaction::responseString() const {
             stream << "OTHER";
             break;
         default:
-            stream << "UNKOWN("
+            stream << "UNKNOWN("
                    << static_cast<int>(getDnsUpdateStatus()) << ")";
             break;
 

src/bin/d2/parser_context.h

@@ -57,7 +57,7 @@ public:
         ///< Used for parsing content of a TSIG key.
         PARSER_TSIG_KEY,
 
-        ///< Used for pasing a list of TSIG Keys.
+        ///< Used for parsing a list of TSIG Keys.
         PARSER_TSIG_KEYS,
 
         ///< Used for parsing content of a DDNS Domain.
@@ -69,7 +69,7 @@ public:
         ///< Used for parsing content of a DNS Server.
         PARSER_DNS_SERVER,
 
-        ///< Used for pasing a list of DNS servers.
+        ///< Used for parsing a list of DNS servers.
         PARSER_DNS_SERVERS
     } ParserType;
 

src/bin/d2/tests/d2_queue_mgr_unittests.cc

@@ -158,7 +158,7 @@ TEST(D2QueueMgrBasicTest, basicQueue) {
         // Verify that peek did not alter the queue size.
         EXPECT_EQ(VALID_MSG_CNT - i, queue_mgr->getQueueSize());
 
-        // Verify the dequeueing from non-empty queue works
+        // Verify the dequeuing from non-empty queue works
         EXPECT_NO_THROW(queue_mgr->dequeue());
 
         // Verify queue size decrements following dequeue.

src/bin/d2/tests/d2_simple_parser_unittest.cc

@@ -42,7 +42,7 @@ void checkIntegerValue(const ConstElementPtr& element,
 /// @brief Checks if specified element matches the given boolean default
 ///
 /// @param element defaulted element to check
-/// @param deflt SimpleDefault which supplied the default valaue
+/// @param deflt SimpleDefault which supplied the default value
 void checkBooleanValue(const ConstElementPtr& element,
                        const SimpleDefault& deflt)  {
     ASSERT_TRUE(element);
@@ -61,7 +61,7 @@ void checkBooleanValue(const ConstElementPtr& element,
 /// @brief Checks if specified element matches the given string default
 ///
 /// @param element defaulted element to check
-/// @param deflt SimpleDefault which supplied the default valaue
+/// @param deflt SimpleDefault which supplied the default value
 void checkStringValue(const ConstElementPtr& element,
                       const SimpleDefault& deflt)  {
     ASSERT_TRUE(element);
@@ -197,7 +197,7 @@ public:
             // Add any defaults
             setDefaults(elem);
 
-            // Now pares the element tree into object(s).
+            // Now parse the element tree into object(s).
             parseElement(elem);
         } catch (const std::exception& ex) {
             std::string caught_error = ex.what();

src/bin/d2/tests/d2_update_message_unittests.cc

@@ -112,7 +112,7 @@ TEST_F(D2UpdateMessageTest, setZone) {
     EXPECT_EQ(RRClass::ANY().getCode(), zone->getClass().getCode());
 
     // Now, let's check that the existing Zone object can be
-    // overriden with a new one.
+    // overridden with a new one.
     msg.setZone(Name("foo.example.com"), RRClass::NONE());
     zone = msg.getZone();
     EXPECT_TRUE(zone);
@@ -456,7 +456,7 @@ TEST_F(D2UpdateMessageTest, toWire) {
 
     // The simplest way to convert the name from wire format to a string
     // is to use dns::Name class. It should be ok to rely on the Name class
-    // to decode the name, because it is unit tested elswhere.
+    // to decode the name, because it is unit tested elsewhere.
     std::string zone_name = readNameFromWire(buf, 13);
     EXPECT_EQ("example.com.", zone_name);
 

src/bin/d2/tests/d2_update_mgr_unittests.cc

@@ -485,7 +485,7 @@ TEST_F(D2UpdateMgrTest, checkFinishedTransaction) {
     // Verify that the list of transactions has decreased by two.
     EXPECT_EQ(canned_count_ - 2, update_mgr_->getTransactionCount());
 
-    // Vefity that the transaction list is correct.
+    // Verify that the transaction list is correct.
     EXPECT_TRUE(update_mgr_->hasTransaction(canned_ncrs_[0]->getDhcid()));
     EXPECT_FALSE(update_mgr_->hasTransaction(canned_ncrs_[1]->getDhcid()));
     EXPECT_TRUE(update_mgr_->hasTransaction(canned_ncrs_[2]->getDhcid()));

src/bin/d2/tests/dns_client_unittests.cc

@@ -525,7 +525,7 @@ TEST_F(DNSClientTest, sendReceive) {
 
 // Verify that the DNSClient reports an error when the response is received from
 // a DNS and this response is corrupted.
-TEST_F(DNSClientTest, sendReceiveCurrupted) {
+TEST_F(DNSClientTest, sendReceiveCorrupted) {
     // true means that server's response is corrupted.
     runSendReceiveTest(true, false);
 }

src/bin/d2/tests/nc_add_unittests.cc

@@ -70,7 +70,7 @@ public:
 
     /// @brief Prepares the initial D2UpdateMessage
     ///
-    /// This method overrides the NameChangeTransactio implementation to
+    /// This method overrides the NameChangeTransaction implementation to
     /// provide the ability to simulate an exception throw in the build
     /// request logic.
     /// If the one-shot flag, simulate_build_request_exception_ is true,
@@ -479,7 +479,7 @@ TEST_F(NameAddTransactionTest, selectingFwdServerHandler) {
                   name_add->getNextEvent())
                   << " num_servers: " << num_servers << " selections: " << i;
 
-        // Post a server IO error event.  This simulates an IO error occuring
+        // Post a server IO error event.  This simulates an IO error occurring
         // and a need to select the new server.
         ASSERT_NO_THROW(name_add->postNextEvent(NameChangeTransaction::
                                                 SERVER_IO_ERROR_EVT))
@@ -1213,7 +1213,7 @@ TEST_F(NameAddTransactionTest, selectingRevServerHandler) {
                   name_add->getNextEvent())
                   << " num_servers: " << num_servers << " selections: " << i;
 
-        // Post a server IO error event.  This simulates an IO error occuring
+        // Post a server IO error event.  This simulates an IO error occurring
         // and a need to select the new server.
         ASSERT_NO_THROW(name_add->postNextEvent(NameChangeTransaction::
                                                 SERVER_IO_ERROR_EVT))

src/bin/d2/tests/nc_remove_unittests.cc

@@ -71,7 +71,7 @@ public:
 
     /// @brief Prepares the initial D2UpdateMessage
     ///
-    /// This method overrides the NameChangeTransactio implementation to
+    /// This method overrides the NameChangeTransaction implementation to
     /// provide the ability to simulate an exception throw in the build
     /// request logic.
     /// If the one-shot flag, simulate_build_request_exception_ is true,
@@ -481,7 +481,7 @@ TEST_F(NameRemoveTransactionTest, selectingFwdServerHandler) {
                   name_remove->getNextEvent())
                   << " num_servers: " << num_servers << " selections: " << i;
 
-        // Post a server IO error event.  This simulates an IO error occuring
+        // Post a server IO error event.  This simulates an IO error occurring
         // and a need to select the new server.
         ASSERT_NO_THROW(name_remove->postNextEvent(NameChangeTransaction::
                                                    SERVER_IO_ERROR_EVT))
@@ -1203,7 +1203,7 @@ TEST_F(NameRemoveTransactionTest, selectingRevServerHandler) {
                   name_remove->getNextEvent())
                   << " num_servers: " << num_servers << " selections: " << i;
 
-        // Post a server IO error event.  This simulates an IO error occuring
+        // Post a server IO error event.  This simulates an IO error occurring
         // and a need to select the new server.
         ASSERT_NO_THROW(name_remove->postNextEvent(NameChangeTransaction::
                                                 SERVER_IO_ERROR_EVT))

src/bin/d2/tests/nc_trans_unittests.cc

@@ -65,7 +65,7 @@ public:
     }
 
     /// @brief DNSClient callback
-    /// Overrides the callback in NameChangeTranscation to allow testing
+    /// Overrides the callback in NameChangeTransaction to allow testing
     /// sendUpdate without incorporating execution of the state model
     /// into the test.
     /// It sets the DNS status update and posts IO_COMPLETED_EVT as does
@@ -836,7 +836,7 @@ TEST_F(NameChangeTransactionTest, failedUpdateTest) {
     // should run up until the "IO" operation is initiated in DOING_UPDATE_ST.
     ASSERT_NO_THROW(name_change->startTransaction());
 
-    // Vefity that the model is running but waiting, and that the forward
+    // Verify that the model is running but waiting, and that the forward
     // change has not been completed.
     EXPECT_TRUE(name_change->isModelRunning());
     EXPECT_TRUE(name_change->isModelWaiting());

src/bin/dhcp4/ctrl_dhcp4_srv.h

@@ -180,7 +180,7 @@ private:
 
     /// @brief handler for processing 'write-config' command
     ///
-    /// This handle processes write-config comamnd, which writes the
+    /// This handle processes write-config command, which writes the
     /// current configuration to disk. This command takes one optional
     /// parameter called filename. If specified, the current configuration
     /// will be written to that file. If not specified, the file used during

src/bin/dhcp4/dhcp4_parser.cc

@@ -535,7 +535,7 @@ namespace isc { namespace dhcp {
     /// 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/dhcp4/dhcp4_parser.h

@@ -219,7 +219,7 @@ namespace isc { namespace dhcp {
     /// 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/dhcp4/dhcp4_srv.cc

@@ -769,7 +769,7 @@ Dhcpv4Srv::run_one() {
     } catch (const SignalInterruptOnSelect) {
         // Packet reception interrupted because a signal has been received.
         // This is not an error because we might have received a SIGTERM,
-        // SIGINT, SIGHUP or SIGCHILD which are handled by the server. For
+        // SIGINT, SIGHUP or SIGCHLD which are handled by the server. For
         // signals that are not handled by the server we rely on the default
         // behavior of the system.
         LOG_DEBUG(packet4_logger, DBG_DHCP4_DETAIL, DHCP4_BUFFER_WAIT_SIGNAL)
@@ -1933,7 +1933,7 @@ Dhcpv4Srv::adjustIfaceData(Dhcpv4Exchange& ex) {
     IOAddress local_addr = query->getLocalAddr();
 
     // In many cases the query is sent to a broadcast address. This address
-    // apears as a local address in the query message. We can't simply copy
+    // appears as a local address in the query message. We can't simply copy
     // this address to a response message and use it as a source address.
     // Instead we will need to use the address assigned to the interface
     // on which the query has been received. In other cases, we will just

src/bin/dhcp4/dhcp4_srv.h

@@ -582,7 +582,7 @@ protected:
     /// server's response.
     void processClientName(Dhcpv4Exchange& ex);
 
-    /// @brief this is a prefix added to the contend of vendor-class option
+    /// @brief this is a prefix added to the content of vendor-class option
     ///
     /// If incoming packet has a vendor class option, its content is
     /// prepended with this prefix and then interpreted as a class.

src/bin/dhcp4/json_config_parser.cc

@@ -373,13 +373,13 @@ void configureCommandChannel() {
 
     // Determine if the socket configuration has changed. It has if
     // both old and new configuration is specified but respective
-    // data elements are't equal.
+    // data elements aren't equal.
     bool sock_changed = (sock_cfg && current_sock_cfg &&
                          !sock_cfg->equals(*current_sock_cfg));
 
     // If the previous or new socket configuration doesn't exist or
     // the new configuration differs from the old configuration we
-    // close the exisitng socket and open a new socket as appropriate.
+    // close the existing socket and open a new socket as appropriate.
     // Note that closing an existing socket means the clien will not
     // receive the configuration result.
     if (!sock_cfg || !current_sock_cfg || sock_changed) {
@@ -420,7 +420,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set,
     // Revert any runtime option definitions configured so far and not committed.
     LibDHCP::revertRuntimeOptionDefs();
     // Let's set empty container in case a user hasn't specified any configuration
-    // for option definitions. This is equivalent to commiting empty container.
+    // for option definitions. This is equivalent to committing empty container.
     LibDHCP::setRuntimeOptionDefs(OptionDefSpaceContainer());
 
     // Answer will hold the result.

src/bin/dhcp4/parser_context.cc

@@ -138,7 +138,7 @@ Parser4Context::contextName()
     case HOST_RESERVATION_IDENTIFIERS:
         return ("host-reservation-identifiers");
     case HOOKS_LIBRARIES:
-        return ("hooks-librairies");
+        return ("hooks-libraries");
     case SUBNET4:
         return ("subnet4");
     case RESERVATION_MODE:

src/bin/dhcp4/tests/config_parser_unittest.cc

@@ -881,7 +881,7 @@ TEST_F(Dhcp4ParserTest, multipleSubnetsExplicitIDs) {
 }
 
 // Check that the configuration with two subnets having the same id is rejected.
-TEST_F(Dhcp4ParserTest, multipleSubnetsOverlapingIDs) {
+TEST_F(Dhcp4ParserTest, multipleSubnetsOverlappingIDs) {
     ConstElementPtr x;
     // Four subnets, two of them having the same id.
     string config = "{ " + genIfaceConfig() + "," +
@@ -1112,7 +1112,7 @@ TEST_F(Dhcp4ParserTest, nextServerSubnet) {
 }
 
 // Test checks several negative scenarios for next-server configuration: bogus
-// address, IPv6 adddress and empty string.
+// address, IPv6 address and empty string.
 TEST_F(Dhcp4ParserTest, nextServerNegative) {
     IfaceMgrTestConfig test_config(true);
 

src/bin/dhcp4/tests/dhcp4_client.cc

@@ -335,7 +335,7 @@ Dhcp4Client::doDecline() {
     // Include client identifier.
     appendClientId();
 
-    // Incluer server identifier.
+    // Include server identifier.
     appendServerId();
 
     // Remove configuration.

src/bin/dhcp4/tests/dhcp4_process_tests.sh.in

@@ -380,7 +380,7 @@ shutdown_test() {
 }
 
 # This test verifies that DHCPv4 can be configured to run lease file cleanup
-# periodially.
+# periodically.
 lfc_timer_test() {
     # Log the start of the test and print test name.
     test_start "dhcpv4_srv.lfc_timer_test"

src/bin/dhcp4/tests/dhcp4_srv_unittest.cc

@@ -1674,7 +1674,7 @@ TEST_F(Dhcpv4SrvTest, matchClassificationOptionName) {
     // Classify packets
     srv.classifyPacket(query);
 
-    // The queey should be in the router class
+    // The query should be in the router class
     EXPECT_TRUE(query->inClass("router"));
 }
 
@@ -1725,7 +1725,7 @@ TEST_F(Dhcpv4SrvTest, matchClassificationOptionDef) {
     // Classify packets
     srv.classifyPacket(query);
 
-    // The queey should be in the router class
+    // The query should be in the router class
     EXPECT_TRUE(query->inClass("router"));
 }
 

src/bin/dhcp4/tests/dhcp4_test_utils.h

@@ -418,7 +418,7 @@ public:
     void configure(const std::string& config, NakedDhcpv4Srv& srv,
                    const bool commit = true);
 
-    /// @brief Pretents a packet of specified type was received.
+    /// @brief Pretends a packet of specified type was received.
     ///
     /// Instantiates fake network interfaces, configures passed Dhcpv4Srv,
     /// then creates a message of specified type and sends it to the

src/bin/dhcp4/tests/dora_unittest.cc

@@ -1578,7 +1578,7 @@ class DORAMySQLTest : public DORATest {
 public:
     /// @brief Constructor.
     ///
-    /// Recreats MySQL schema for a test.
+    /// Recreates MySQL schema for a test.
     DORAMySQLTest() : DORATest() {
         destroyMySQLSchema();
         createMySQLSchema();

src/bin/dhcp4/tests/fqdn_unittest.cc

@@ -565,7 +565,7 @@ public:
     /// @param len - expected lease length in the NCR
     /// @param not_strict_expire_check - when true the comparison of the NCR
     /// lease expiration time is conducted as greater than or equal to rather
-    /// equal to CLTT plus lease lenght.
+    /// equal to CLTT plus lease length.
     void verifyNameChangeRequest(const isc::dhcp_ddns::NameChangeType type,
                                  const bool reverse, const bool forward,
                                  const std::string& addr,
@@ -1459,7 +1459,7 @@ TEST_F(NameDhcpv4SrvTest, hostnameReservationNoDNSQualifyingSuffix) {
 // Test verifies that the server properly generates a FQDN when the client
 // FQDN name is blank, whether or not DDNS updates are enabled.  It also
 // verifies that the lease is only in the database following a DHCPREQUEST and
-// that the lesae contains the generated FQDN.
+// that the lease contains the generated FQDN.
 TEST_F(NameDhcpv4SrvTest, emptyFqdn) {
     Dhcp4Client client(Dhcp4Client::SELECTING);
     isc::asiolink::IOAddress expected_address("10.0.0.10");

src/bin/dhcp4/tests/get_config_unittest.cc

@@ -6220,7 +6220,7 @@ TEST_P(Dhcp4GetConfigTest, run) {
     EXPECT_TRUE(isEquivalent(unparsed, unparsed2));
 }
 
-/// Define the parametrized test loop
+/// Define the parameterized test loop
 INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
                         ::testing::Range(static_cast<size_t>(0), max_config_counter));
 

src/bin/dhcp4/tests/get_config_unittest.cc.skel

@@ -338,7 +338,7 @@ TEST_P(Dhcp4GetConfigTest, run) {
     EXPECT_TRUE(isEquivalent(unparsed, unparsed2));
 }
 
-/// Define the parametrized test loop
+/// Define the parameterized test loop
 INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
                         ::testing::Range(static_cast<size_t>(0), max_config_counter));
 

src/bin/dhcp4/tests/hooks_unittest.cc

@@ -1904,7 +1904,7 @@ TEST_F(HooksDhcpv4SrvTest, host4_identifier_hwaddr) {
 // The callout libraries write their library index number to a marker
 // file upon load and unload, making it simple to test whether or not
 // the load and unload callouts have been invoked.
-TEST_F(LoadUnloadDhcpv4SrvTest, unloadLibaries) {
+TEST_F(LoadUnloadDhcpv4SrvTest, unloadLibraries) {
 
     ASSERT_NO_THROW(server_.reset(new NakedDhcpv4Srv()));
 

src/bin/dhcp6/ctrl_dhcp6_srv.h

@@ -180,7 +180,7 @@ private:
 
     /// @brief handler for processing 'write-config' command
     ///
-    /// This handle processes write-config comamnd, which writes the
+    /// This handle processes write-config command, which writes the
     /// current configuration to disk. This command takes one optional
     /// parameter called filename. If specified, the current configuration
     /// will be written to that file. If not specified, the file used during

src/bin/dhcp6/dhcp6_messages.mes

@@ -258,7 +258,7 @@ DHCP server failed.
 % DHCP6_FLEX_ID flexible identifier generated for incoming packet: %1
 This debug message is printed when host reservation type is set to flexible identifier
 and the expression specified in its configuration generated (was evaluated to)
-an indetifier for incoming packet. This debug message is mainly intended as a
+an identifier for incoming packet. This debug message is mainly intended as a
 debugging assistance for flexible identifier.
 
 % DHCP6_HANDLE_SIGNAL_EXCEPTION An exception was thrown while handing signal: %1

src/bin/dhcp6/dhcp6_parser.cc

@@ -535,7 +535,7 @@ namespace isc { namespace dhcp {
     /// 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/dhcp6/dhcp6_parser.h

@@ -219,7 +219,7 @@ namespace isc { namespace dhcp {
     /// 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/dhcp6/dhcp6_srv.cc

@@ -1899,7 +1899,7 @@ Dhcpv6Srv::extendIA_PD(const Pkt6Ptr& query,
 
     const bool pd_exclude_requested = requestedInORO(query, D6O_PD_EXCLUDE);
 
-    // For all the leases we have now, add the IAPPREFIX with non-zero lifetimes
+    // For all the leases we have now, add the IAPREFIX with non-zero lifetimes
     for (Lease6Collection::const_iterator l = leases.begin(); l != leases.end(); ++l) {
 
         Option6IAPrefixPtr prf(new Option6IAPrefix(D6O_IAPREFIX,

src/bin/dhcp6/dhcp6_srv.h

@@ -649,7 +649,7 @@ protected:
     void setReservedClientClasses(const Pkt6Ptr& pkt,
                                   const AllocEngine::ClientContext6& ctx);
 
-    /// @brief Attempts to get a MAC/hardware address using configred sources
+    /// @brief Attempts to get a MAC/hardware address using configured sources
     ///
     /// Tries to extract MAC/hardware address information from the packet
     /// using MAC sources configured in 'mac-sources' configuration parameter.
@@ -689,7 +689,7 @@ protected:
     /// @param [out] ctx reference to context object to be initialized.
     void initContext(const Pkt6Ptr& pkt, AllocEngine::ClientContext6& ctx);
 
-    /// @brief this is a prefix added to the contend of vendor-class option
+    /// @brief this is a prefix added to the content of vendor-class option
     ///
     /// If incoming packet has a vendor class option, its content is
     /// prepended with this prefix and then interpreted as a class.

src/bin/dhcp6/json_config_parser.cc

@@ -567,13 +567,13 @@ void configureCommandChannel() {
 
     // Determine if the socket configuration has changed. It has if
     // both old and new configuration is specified but respective
-    // data elements are't equal.
+    // data elements aren't equal.
     bool sock_changed = (sock_cfg && current_sock_cfg &&
                          !sock_cfg->equals(*current_sock_cfg));
 
     // If the previous or new socket configuration doesn't exist or
     // the new configuration differs from the old configuration we
-    // close the exisitng socket and open a new socket as appropriate.
+    // close the existing socket and open a new socket as appropriate.
     // Note that closing an existing socket means the clien will not
     // receive the configuration result.
     if (!sock_cfg || !current_sock_cfg || sock_changed) {
@@ -615,7 +615,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set,
     // Revert any runtime option definitions configured so far and not committed.
     LibDHCP::revertRuntimeOptionDefs();
     // Let's set empty container in case a user hasn't specified any configuration
-    // for option definitions. This is equivalent to commiting empty container.
+    // for option definitions. This is equivalent to committing empty container.
     LibDHCP::setRuntimeOptionDefs(OptionDefSpaceContainer());
 
     // This is a way to convert ConstElementPtr to ElementPtr.

src/bin/dhcp6/parser_context.cc

@@ -138,7 +138,7 @@ Parser6Context::contextName()
     case HOST_RESERVATION_IDENTIFIERS:
         return ("host-reservation-identifiers");
     case HOOKS_LIBRARIES:
-        return ("hooks-librairies");
+        return ("hooks-libraries");
     case SUBNET6:
         return ("subnet6");
     case RESERVATION_MODE:

src/bin/dhcp6/tests/config_parser_unittest.cc

@@ -967,7 +967,7 @@ TEST_F(Dhcp6ParserTest, multipleSubnetsExplicitIDs) {
 }
 
 // CHeck that the configuration with two subnets having the same id is rejected.
-TEST_F(Dhcp6ParserTest, multipleSubnetsOverlapingIDs) {
+TEST_F(Dhcp6ParserTest, multipleSubnetsOverlappingIDs) {
     ConstElementPtr x;
     // Four subnets, two of them have the same id.
     string config = "{ " + genIfaceConfig() + ","
@@ -2935,7 +2935,7 @@ TEST_F(Dhcp6ParserTest, optionDataEncapsulate) {
     EXPECT_TRUE(desc.option_);
     EXPECT_EQ(100, desc.option_->getType());
 
-    // This opton should comprise two sub-options.
+    // This option should comprise two sub-options.
     // Onf of them is 'foo' with code 110.
     OptionPtr option_foo = desc.option_->getOption(110);
     ASSERT_TRUE(option_foo);

src/bin/dhcp6/tests/dhcp6_process_tests.sh.in

@@ -382,7 +382,7 @@ returned %d."
 }
 
 # This test verifies that DHCPv6 can be configured to run lease file cleanup
-# periodially.
+# periodically.
 lfc_timer_test() {
     # Log the start of the test and print test name.
     test_start "dhcpv6_srv.lfc_timer_test"

src/bin/dhcp6/tests/fqdn_unittest.cc

@@ -234,7 +234,7 @@ public:
 
     /// @brief Adds IA option to the message.
     ///
-    /// Addded option holds an address.
+    /// Added option holds an address.
     ///
     /// @param iaid IAID
     /// @param pkt A DHCPv6 message to which the IA option should be added.
@@ -554,7 +554,7 @@ public:
     ///
     /// @param type An expected type of the NameChangeRequest (Add or Remove).
     /// @param reverse An expected setting of the reverse update flag.
-    /// @param forward An expected setting of the forward udpate flag.
+    /// @param forward An expected setting of the forward update flag.
     /// @param addr A string representation of the IPv6 address held in the
     /// NameChangeRequest.
     /// @param dhcid An expected DHCID value.
@@ -791,7 +791,7 @@ TEST_F(FqdnDhcpv6SrvTest, createNameChangeRequests) {
 // Checks that NameChangeRequests to add entries are not
 // created when ddns updates are disabled.
 TEST_F(FqdnDhcpv6SrvTest, noAddRequestsWhenDisabled) {
-    // Disable DDNS udpates.
+    // Disable DDNS updates.
     disableD2();
 
     // Create Reply message with Client Id and Server id.

src/bin/dhcp6/tests/get_config_unittest.cc

@@ -6149,7 +6149,7 @@ TEST_P(Dhcp6GetConfigTest, run) {
     EXPECT_TRUE(isEquivalent(unparsed, unparsed2));
 }
 
-/// Define the parametrized test loop
+/// Define the parameterized test loop
 INSTANTIATE_TEST_CASE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
                         ::testing::Range(static_cast<size_t>(0), max_config_counter));
 

src/bin/dhcp6/tests/get_config_unittest.cc.skel

@@ -341,7 +341,7 @@ TEST_P(Dhcp6GetConfigTest, run) {
     EXPECT_TRUE(isEquivalent(unparsed, unparsed2));
 }
 
-/// Define the parametrized test loop
+/// Define the parameterized test loop
 INSTANTIATE_TEST_CASE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
                         ::testing::Range(static_cast<size_t>(0), max_config_counter));
 

src/bin/dhcp6/tests/hooks_unittest.cc

@@ -2441,7 +2441,7 @@ TEST_F(HooksDhcpv6SrvTest, host6Identifier_hwaddr) {
 // The callout libraries write their library index number to a marker
 // file upon load and unload, making it simple to test whether or not
 // the load and unload callouts have been invoked.
-TEST_F(LoadUnloadDhcpv6SrvTest, unloadLibaries) {
+TEST_F(LoadUnloadDhcpv6SrvTest, unloadLibraries) {
 
     ASSERT_NO_THROW(server_.reset(new NakedDhcpv6Srv(0)));
 

src/bin/dhcp6/tests/host_unittest.cc

@@ -495,7 +495,7 @@ public:
     /// @brief Verifies that host specific options override subnet specific
     /// options.
     ///
-    /// Overriden options are requested with Option Request option.
+    /// Overridden options are requested with Option Request option.
     ///
     /// @param msg_type DHCPv6 message type to be sent to the server. If the
     /// message type is Renew or Rebind, the 4-way exchange is made prior to

src/bin/keactrl/kea.conf.pre

@@ -712,7 +712,7 @@
         //      }
     ]
 
-    // Client-clesses can be defined here. See "client-classes" in Dhcp4 for
+    // Client-classes can be defined here. See "client-classes" in Dhcp4 for
     // an example.
 
     // Hook libraries can be defined here. See "hooks-libraries" example in
@@ -734,7 +734,7 @@
   "reverse-ddns" : {}
 },
 
-// This is a basic configuraton for the Kea Control Agent.
+// This is a basic configuration for the Kea Control Agent.
 // RESTful interface to be available at http://127.0.0.1:8080/
 "Control-agent": {
     "http-host": "127.0.0.1",

src/bin/keactrl/tests/keactrl_tests.sh.in

@@ -200,7 +200,7 @@ Expected wait_for_message return %d, returned %d."
     assert_eq 0 ${_GET_LOG_MESSAGES} \
         "Expected get_log_messages return %d, returned %d."
 
-    # Server may shut down imediatelly after configuration has competed.
+    # Server may shut down immediately after configuration has completed.
     # Give it some time to shutdown.
     sleep 3
 
@@ -317,7 +317,7 @@ Expected wait_for_message return %d, returned %d."
     assert_eq 2 ${_GET_LOG_MESSAGES} \
         "Expected get_log_messages for DCT_STANDALONE return %d, returned %d."
 
-    # Server may shut down imediatelly after configuration has competed.
+    # Server may shut down immediately after configuration has completed.
     # Give it some time to shutdown.
     sleep 3
 
@@ -392,7 +392,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
     printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n"
     ${keactrl} start -c ${KEACTRL_CFG_FILE}
     ret=${?}
-    assert_eq 0 ${ret} "Expected keactrl to retrun 0, returned value was ${ret}"
+    assert_eq 0 ${ret} "Expected keactrl to return 0, returned value was ${ret}"
 
     # Wait up to 20s for the DHCPv4 server to configure.
     wait_for_message 20 "DHCP4_CONFIG_COMPLETE" 1
@@ -400,7 +400,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
         "Timeout waiting for ${kea4_name} to start. \
 Expected wait_for_message return %d, returned %d."
 
-    # Server may shut down imediatelly after configuration has competed.
+    # Server may shut down immediately after configuration has completed.
     # Give it some time to shutdown.
     sleep 3
 
@@ -488,7 +488,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
         "Timeout waiting for ${kea6_name} to start. \
 Expected wait_for_message return %d, returned %d."
 
-    # Server may shut down imediatelly after configuration has competed.
+    # Server may shut down immediately after configuration has completed.
     # Give it some time to shutdown.
     sleep 3
 
@@ -568,7 +568,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
     printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n"
     ${keactrl} start -c ${KEACTRL_CFG_FILE}
     ret=${?}
-    assert_eq 0 ${ret} "Expected keactrl to retrun 0, returned value was ${ret}"
+    assert_eq 0 ${ret} "Expected keactrl to return 0, returned value was ${ret}"
 
     # Wait up to 20s for the DHCPv6 server to configure.
     wait_for_message 20 "DHCP6_CONFIG_COMPLETE" 1
@@ -576,7 +576,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
         "Timeout waiting for ${kea6_name} to start. \
 Expected wait_for_message return %d, returned %d."
 
-    # Server may shut down imediatelly after configuration has competed.
+    # Server may shut down immediately after configuration has completed.
     # Give it some time to shutdown.
     sleep 3
 
@@ -731,7 +731,7 @@ dhcp_ddns=no\nctrl_agent=yes\nkea_verbose=yes\n${keactrl_fixed_config}"
     printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n"
     ${keactrl} start -c ${KEACTRL_CFG_FILE}
     ret=${?}
-    assert_eq 0 ${ret} "Expected keactrl to retrun 0, returned value was ${ret}"
+    assert_eq 0 ${ret} "Expected keactrl to return 0, returned value was ${ret}"
 
     # Wait up to 20s for the DHCPv4 server to configure.
     wait_for_message 20 "DHCP4_CONFIG_COMPLETE" 1
@@ -739,7 +739,7 @@ dhcp_ddns=no\nctrl_agent=yes\nkea_verbose=yes\n${keactrl_fixed_config}"
         "Timeout waiting for ${kea4_name} to start. \
 Expected wait_for_message return %d, returned %d."
 
-    # Server may shut down imediatelly after configuration has competed.
+    # Server may shut down immediately after configuration has completed.
     # Give it some time to shutdown.
     sleep 3
 
@@ -783,7 +783,7 @@ dhcp_ddns=yes\nctrl_agent=yes\nkea_verbose=no\n${keactrl_fixed_config}"
     printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n"
     ${keactrl} start -c ${KEACTRL_CFG_FILE}
     ret=${?}
-    assert_eq 0 ${ret} "Expected keactrl to retrun 0, returned value was ${ret}"
+    assert_eq 0 ${ret} "Expected keactrl to return 0, returned value was ${ret}"
 
     # Wait up to 20s for the DHCPv6 server to configure.
     wait_for_message 20 "DHCP6_CONFIG_COMPLETE" 1
@@ -926,7 +926,7 @@ Expected wait_for_message return %d, returned %d."
     assert_eq 0 ${_GET_LOG_MESSAGES} \
     "Expected get_log_messages return %d, returned %d."
 
-    # Server may shut down imediatelly after configuration has competed.
+    # Server may shut down immediately after configuration has completed.
     # Give it some time to shutdown.
     sleep 3
 

src/bin/lfc/lfc_controller.cc

@@ -236,7 +236,7 @@ LFCController::parseArgs(int argc, char* argv[]) {
 
         case '?':
             // Unknown argument
-            // note this will catch all the prevous ... name missing
+            // note this will catch all the previous ... name missing
             isc_throw(InvalidUsage, "Unknown argument");
 
         case ':':

src/bin/lfc/lfc_controller.h

@@ -99,7 +99,7 @@ public:
     /// @name Accessor methods mainly used for testing purposes
     //@{
 
-    /// @brief Gets the protocol version of the leaes files
+    /// @brief Gets the protocol version of the leases files
     ///
     /// @return Returns the value of the DHCP protocol version.
     /// This can be 4 or 6 while in use and 0 before parsing

src/bin/lfc/tests/lfc_controller_unittests.cc

@@ -485,7 +485,7 @@ TEST_F(LFCControllerTest, launch4) {
     // Run the cleanup
     launch(lfc_controller, argc, argv);
 
-    // Compare the results, we expect a header and no leaes.
+    // Compare the results, we expect a header and no leases.
     // We also verify none of the temp or pid files remain.
     test_str = v4_hdr_;
     EXPECT_EQ(readFile(xstr_), test_str);

src/bin/perfdhcp/command_options.h

@@ -145,7 +145,7 @@ public:
     /// \return type of lease being requested by perfdhcp.
     LeaseType getLeaseType() const { return (lease_type_); }
 
-    /// \brief Returns echange rate.
+    /// \brief Returns exchange rate.
     ///
     /// \return exchange rate per second.
     int getRate() const { return rate_; }
@@ -252,7 +252,7 @@ public:
     /// \return true if seed was provided.
     bool isSeeded() const { return seeded_; }
 
-    /// \brief Returns radom seed.
+    /// \brief Returns random seed.
     ///
     /// \return random seed.
     uint32_t getSeed() const { return seed_; }
@@ -272,7 +272,7 @@ public:
     /// \return true if server-iD to be taken from first package.
     bool isUseFirst() const { return use_first_; }
 
-    /// \brief Check if generated DHCPv6 messages shuold appear as relayed.
+    /// \brief Check if generated DHCPv6 messages should appear as relayed.
     ///
     /// \return true if generated traffic should appear as relayed.
     bool isUseRelayedV6() const { return (v6_relay_encapsulation_level_ > 0); }

src/bin/perfdhcp/pkt_transform.h

@@ -36,7 +36,7 @@ public:
     /// The method copies the input buffer and options contents
     /// to the output buffer. The input buffer must contain whole
     /// initial packet data. Parts of this data will be
-    /// overriden by options data specified in an options
+    /// overridden by options data specified in an options
     /// collection. Such options must have their offsets within
     /// a packet specified (see \ref LocalizedOption to find out
     /// how to specify options offset).
@@ -146,7 +146,7 @@ private:
     ///
     /// \param universe universe used, V4 or V6
     /// \param in_buffer input buffer to be parsed.
-    /// \param options oprions collection with their offsets
+    /// \param options options collection with their offsets
     /// in input buffer specified.
     ///
     /// \throw isc::Unexpected if options unpack failed.

src/bin/perfdhcp/tests/stats_mgr_unittest.cc

@@ -157,7 +157,7 @@ public:
             stats_mgr->passSentPacket(StatsMgr4::XCHG_DO, sent_packet)
         );
 
-        // There is way to differentiate timstamps of two packets other than
+        // There is way to differentiate timestamps of two packets other than
         // sleep for before we create another packet. Packet is using current
         // time to update its timestamp.
         // Sleeping for X seconds will guarantee that delay between packets

src/bin/perfdhcp/tests/test_control_unittest.cc

@@ -624,7 +624,7 @@ public:
             // the case if randomization algorithm generates the same
             // values but this would be an error in randomization algorithm.
             total_dist += mismatch_dist;
-            // Mismatch may have occurred on the MAC address'es octet position
+            // Mismatch may have occurred on the MAC address's octet position
             // up to calculated earlier unequal_pos.
             ASSERT_LE(mismatch_dist, unequal_pos);
             // unique will inform if tested DUID is unique.
@@ -770,7 +770,7 @@ public:
 
         Pkt4Ptr ack = createAckPkt4(1);
 
-        // Create DHCPREQUST from DHCPACK.
+        // Create DHCPREQUEST from DHCPACK.
         Pkt4Ptr request;
         ASSERT_NO_THROW(request = tc.createRequestFromAck(ack));
 
@@ -1149,7 +1149,7 @@ TEST_F(TestControlTest, GenerateDuid) {
     ASSERT_TRUE(std::find(macs.begin(), macs.end(), mac) != macs.end());
 }
 
-TEST_F(TestControlTest, MisMatchVerionServer) {
+TEST_F(TestControlTest, MisMatchVersionServer) {
     NakedTestControl tc;
 
     // make sure we catch -6 paired with v4 address
@@ -1180,7 +1180,7 @@ TEST_F(TestControlTest, GenerateMacAddress) {
     // Initialize Test Controller.
     NakedTestControl tc;
     uint8_t randomized = 0;
-    // Generate MAC adddress and sanity check its size.
+    // Generate MAC address and sanity check its size.
     std::vector<uint8_t> mac = tc.generateMacAddress(randomized);
     ASSERT_EQ(6, mac.size());
     // Make sure that the generated MAC address belongs to the MAC addresses

src/bin/shell/kea-shell.in

@@ -37,7 +37,7 @@ else:
     raise SystemExit("Unknown python version:" + str(sys.version_info[0]))
 
 def timeout_handler(signum, frame):
-    """Connection timeoout handler"""
+    """Connection timeout handler"""
     del signum, frame
     print("Connection timeout")
     sys.exit(1)
@@ -56,7 +56,7 @@ def shell_body():
                                      'connect to Kea Control Agent.')
     parser.add_argument('--host', type=str, default='127.0.0.1',
                         help='hostname of the CA to connect to '
-                        '(defaul:; 127.0.0.1)')
+                        '(default:; 127.0.0.1)')
     parser.add_argument('--port', type=int, default=8000,
                         help='TCP port of the CA to connect to '
                         '(default: 8000)')
@@ -64,7 +64,7 @@ def shell_body():
                         help='Timeout (in seconds) when attempting to '
                         'connect to CA (default: 10)')
     parser.add_argument('--service', nargs="?", action="append",
-                        help='target spcified service. If not specidied,'
+                        help='target spcified service. If not specified,'
                         'control agent will receive command.')
     parser.add_argument('command', type=str, nargs="?",
                         default='list-commands',