[master] many spelling or typo fixes

mostly in documentation or in comments

reviewed by muks via jabber

includes output changes for two isc_throw.

doc/guide/bind10-guide.xml

@@ -4110,7 +4110,7 @@ Dhcp4/subnet4	[]	list	(default)
 &gt; <userinput>config commit</userinput>
 </screen>
     Even though the "container" option does not carry any data except
-    sub-options, the "data" field must be explictly set to an empty value.
+    sub-options, the "data" field must be explicitly set to an empty value.
     This is required because in the current version of BIND 10 DHCP, the
     default configuration values are not propagated to the configuration parsers:
     if the "data" is not set the parser will assume that this
@@ -4822,7 +4822,7 @@ should include options from the isc option space:
 &gt; <userinput>config commit</userinput>
 </screen>
     Even though the "container" option does not carry any data except
-    sub-options, the "data" field must be explictly set to an empty value.
+    sub-options, the "data" field must be explicitly set to an empty value.
     This is required because in the current version of BIND 10 DHCP, the
     default configuration values are not propagated to the configuration parsers:
     if the "data" is not set the parser will assume that this

src/bin/bind10/init.py.in

@@ -223,7 +223,7 @@ class Init:
         self.component_config = {}
         # Some time in future, it may happen that a single component has
         # multple processes (like a pipeline-like component). If so happens,
-        # name "components" may be inapropriate. But as the code isn't probably
+        # name "components" may be inappropriate. But as the code isn't probably
         # completely ready for it, we leave it at components for now. We also
         # want to support multiple instances of a single component. If it turns
         # out that we'll have a single component with multiple same processes

src/bin/bind10/tests/init_test.py.in

@@ -1595,7 +1595,7 @@ class TestInitComponents(unittest.TestCase):
         init.components[53] = component
 
         # case where the returned pid is unknown to us. nothing should
-        # happpen then.
+        # happen then.
         init.get_process_exit_status_called = False
         init._get_process_exit_status = init._get_process_exit_status_unknown_pid
         init.components_to_restart = []

src/bin/cfgmgr/plugins/tests/tsig_keys_test.py

@@ -92,7 +92,7 @@ class TSigKeysTest(unittest.TestCase):
     def test_bad_format(self):
         """
         Test we fail on bad format. We don't really care much how here, though,
-        as this should not get in trough config manager anyway.
+        as this should not get in through config manager anyway.
         """
         self.assertNotEqual(None, tsig_keys.check({'bad_name': {}}))
         self.assertNotEqual(None, tsig_keys.check({'keys': 'not_list'}))

src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in

@@ -70,7 +70,7 @@ class TestPlugins(unittest.TestCase):
 class TestConfigManagerStartup(unittest.TestCase):
     def test_cfgmgr(self):
         # some creative module use;
-        # b10-cfgmgr has a hypen, so we use __import__
+        # b10-cfgmgr has a hyphen, so we use __import__
         # this also gives us the chance to override the imported
         # module ConfigManager in it.
         b = __import__("b10-cfgmgr")

src/bin/dhcp4/config_parser.cc

@@ -726,7 +726,7 @@ private:
     /// are invalid or insufficient this function emits an exception.
     ///
     /// @warning this function does not check if options_ storage pointer
-    /// is intitialized but this check is not needed here because it is done
+    /// is initialized but this check is not needed here because it is done
     /// in the \ref build function.
     ///
     /// @throw DhcpConfigError if parameters provided in the configuration
@@ -830,7 +830,7 @@ private:
                           << " does not have a definition.");
             }
 
-            // @todo We have a limited set of option definitions intiialized at the moment.
+            // @todo We have a limited set of option definitions initialized at the moment.
             // In the future we want to initialize option definitions for all options.
             // Consequently an error will be issued if an option definition does not exist
             // for a particular option code. For now it is ok to create generic option

src/bin/dhcp4/ctrl_dhcp4_srv.h

@@ -97,7 +97,7 @@ protected:
     /// @brief A dummy configuration handler that always returns success.
     ///
     /// This configuration handler does not perform configuration
-    /// parsing and always returns success. A dummy hanlder should
+    /// parsing and always returns success. A dummy handler should
     /// be installed using \ref isc::config::ModuleCCSession ctor
     /// to get the initial configuration. This initial configuration
     /// comprises values for only those elements that were modified

src/bin/dhcp4/dhcp4_messages.mes

@@ -74,7 +74,7 @@ many possible reasons for such a failure.
 % DHCP4_LEASE_ALLOC lease %1 has been allocated for client-id %2, hwaddr %3
 This debug message indicates that the server successfully granted a lease
 in response to client's REQUEST message. This is a normal behavior and
-incicates successful operation.
+indicates successful operation.
 
 % DHCP4_LEASE_ALLOC_FAIL failed to grant a lease for client-id %1, hwaddr %2
 This message indicates that the server failed to grant a lease to the

src/bin/dhcp4/dhcp4_srv.cc

@@ -343,7 +343,7 @@ Dhcpv4Srv::copyDefaultFields(const Pkt4Ptr& question, Pkt4Ptr& answer) {
     answer->setIndex(question->getIndex());
     answer->setCiaddr(question->getCiaddr());
 
-    answer->setSiaddr(IOAddress("0.0.0.0")); // explictly set this to 0
+    answer->setSiaddr(IOAddress("0.0.0.0")); // explicitly set this to 0
     answer->setHops(question->getHops());
 
     // copy MAC address

src/bin/dhcp4/dhcp4_srv.h

@@ -216,7 +216,7 @@ protected:
     /// @param msg_type specifies message type
     void appendDefaultOptions(Pkt4Ptr& msg, uint8_t msg_type);
 
-    /// @brief Returns server-intentifier option
+    /// @brief Returns server-identifier option
     ///
     /// @return server-id option
     OptionPtr getServerID() { return serverid_; }

src/bin/dhcp4/tests/config_parser_unittest.cc

@@ -82,7 +82,7 @@ public:
     /// option value. These parameters are: "name", "code", "data",
     /// "csv-format" and "space".
     ///
-    /// @param param_value string holiding option parameter value to be
+    /// @param param_value string holding option parameter value to be
     /// injected into the configuration string.
     /// @param parameter name of the parameter to be configured with
     /// param value.

src/bin/dhcp4/tests/dhcp4_srv_unittest.cc

@@ -116,10 +116,10 @@ public:
 
     /// @brief Configures options being requested in the PRL option.
     ///
-    /// The lpr-servers option is NOT configured here altough it is
+    /// The lpr-servers option is NOT configured here although it is
     /// added to the 'Parameter Request List' option in the
     /// \ref addPrlOption. When requested option is not configured
-    /// the server should not return it in its rensponse. The goal
+    /// the server should not return it in its response. The goal
     /// of not configuring the requested option is to verify that
     /// the server will not return it.
     void configureRequestedOptions() {

src/bin/dhcp6/config_parser.cc

@@ -755,7 +755,7 @@ private:
     /// are invalid or insufficient this function emits an exception.
     ///
     /// @warning this function does not check if options_ storage pointer
-    /// is intitialized but this check is not needed here because it is done
+    /// is initialized but this check is not needed here because it is done
     /// in the \ref build function.
     ///
     /// @throw DhcpConfigError if parameters provided in the configuration
@@ -859,7 +859,7 @@ private:
                           << " does not have a definition.");
             }
 
-            // @todo We have a limited set of option definitions intiialized at the moment.
+            // @todo We have a limited set of option definitions initialized at the moment.
             // In the future we want to initialize option definitions for all options.
             // Consequently an error will be issued if an option definition does not exist
             // for a particular option code. For now it is ok to create generic option

src/bin/dhcp6/ctrl_dhcp6_srv.h

@@ -95,7 +95,7 @@ protected:
     /// @brief A dummy configuration handler that always returns success.
     ///
     /// This configuration handler does not perform configuration
-    /// parsing and always returns success. A dummy hanlder should
+    /// parsing and always returns success. A dummy handler should
     /// be installed using \ref isc::config::ModuleCCSession ctor
     /// to get the initial configuration. This initial configuration
     /// comprises values for only those elements that were modified

src/bin/dhcp6/dhcp6_srv.cc

@@ -329,7 +329,7 @@ Dhcpv6Srv::generateServerID() {
         // we will grow knobs to selectively turn them on or off. Also,
         // this code is used only *once* during first start on a new machine
         // and then server-id is stored. (or at least it will be once
-        // DUID storage is implemente
+        // DUID storage is implemented)
 
         // I wish there was a this_is_a_real_physical_interface flag...
 

src/bin/dhcp6/dhcp6_srv.h

@@ -40,7 +40,7 @@ namespace dhcp {
 /// packets, processes them, manages leases assignment and generates
 /// appropriate responses.
 ///
-/// @note Only one instance of this class is instantated as it encompasses
+/// @note Only one instance of this class is instantiated as it encompasses
 ///       the whole operation of the server.  Nothing, however, enforces the
 ///       singleton status of the object.
 class Dhcpv6Srv : public boost::noncopyable {
@@ -69,7 +69,7 @@ public:
     /// @brief Destructor. Used during DHCPv6 service shutdown.
     virtual ~Dhcpv6Srv();
 
-    /// @brief Returns server-intentifier option.
+    /// @brief Returns server-indentifier option.
     ///
     /// @return server-id option
     OptionPtr getServerID() { return serverid_; }

src/bin/dhcp6/tests/config_parser_unittest.cc

@@ -88,7 +88,7 @@ public:
     /// option value. These parameters are: "name", "code", "data" and
     /// "csv-format".
     ///
-    /// @param param_value string holiding option parameter value to be
+    /// @param param_value string holding option parameter value to be
     /// injected into the configuration string.
     /// @param parameter name of the parameter to be configured with
     /// param value.

src/bin/msgq/msgq.py.in

@@ -790,7 +790,7 @@ class MsgQ:
             if not self.running:
                 return
 
-            # TODO: Any config handlig goes here.
+            # TODO: Any config handling goes here.
 
             return isc.config.create_answer(0)
 

src/bin/msgq/tests/msgq_test.py

@@ -186,7 +186,7 @@ class MsgQTest(unittest.TestCase):
         The test is not exhaustive as it doesn't test all combination
         of existence of the recipient, addressing schemes, want_answer
         header and the reply header. It is not needed, these should
-        be mostly independant. That means, for example, if the message
+        be mostly independent. That means, for example, if the message
         is a reply and there's no recipient to send it to, the error
         would not be generated no matter if we addressed the recipient
         by lname or group. If we included everything, the test would
@@ -338,7 +338,7 @@ class BadSocket:
         self.send_exception = send_exception
 
     # completely wrap all calls and member access
-    # (except explicitely overridden ones)
+    # (except explicitly overridden ones)
     def __getattr__(self, name, *args):
         attr = getattr(self.socket, name)
         if isinstance(attr, collections.Callable):
@@ -834,7 +834,7 @@ class SocketTests(unittest.TestCase):
         self.assertIsNone(self.__killed_socket)
 
     def test_send_data_interrupt(self):
-        '''send() is interruptted. send_data() returns 0, sock isn't killed.'''
+        '''send() is interrupted. send_data() returns 0, sock isn't killed.'''
         expected_blockings = []
         for eno in [errno.EAGAIN, errno.EWOULDBLOCK, errno.EINTR]:
             self.__sock_error.errno = eno

src/bin/stats/stats.py.in

@@ -194,7 +194,7 @@ class Stats:
         '''Constructor
 
         module_ccsession_class is parameterized so that test can specify
-        a mocked class to test the behavior without involing network I/O.
+        a mocked class to test the behavior without involving network I/O.
         In other cases this parameter shouldn't be specified.
 
         '''

src/bin/stats/stats_httpd.py.in

@@ -407,7 +407,7 @@ class StatsHttpd:
         old_config = self.config.copy()
         self.load_config(new_config)
         # If the http sockets aren't opened or
-        # if new_config doesn't have'listen_on', it returns
+        # if new_config doesn't have 'listen_on', it returns
         if len(self.httpd) == 0 or 'listen_on' not in new_config:
             return isc.config.ccsession.create_answer(0)
         self.close_httpd()

src/bin/stats/tests/b10-stats_test.py

@@ -376,7 +376,7 @@ class TestStats(unittest.TestCase):
                              'report_time': 42})),
                           ('update_module', ())], call_log)
 
-        # Then update faked timestamp so the intial polling will happen, and
+        # Then update faked timestamp so the initial polling will happen, and
         # confirm that.
         call_log = []
         stats.get_timestamp = lambda: 10

src/bin/xfrin/tests/xfrin_test.py

@@ -2193,7 +2193,7 @@ class TestXfrinProcess(unittest.TestCase):
                                    master_addrinfo, tsig_key)
 
         # An awkward check that would specifically identify an old bug
-        # where initialziation of XfrinConnection._tsig_ctx_creator caused
+        # where initialization of XfrinConnection._tsig_ctx_creator caused
         # self reference and subsequently led to reference leak.
         orig_ref = sys.getrefcount(conn)
         conn._tsig_ctx_creator = None

src/bin/xfrin/xfrin.py.in

@@ -187,7 +187,7 @@ def get_soa_serial(soa_rdata):
 
 class XfrinState:
     '''
-    The states of the incomding *XFR state machine.
+    The states of the incoming *XFR state machine.
 
     We (will) handle both IXFR and AXFR with a single integrated state
     machine because they cannot be distinguished immediately - an AXFR
@@ -269,7 +269,7 @@ class XfrinState:
     can be used as singleton objects.  For now, however, we always instantiate
     a new object for every state transition, partly because the introduction
     of singleton will make a code bit complicated, and partly because
-    the overhead of object instantiotion wouldn't be significant for xfrin.
+    the overhead of object instantiation wouldn't be significant for xfrin.
 
     '''
     def set_xfrstate(self, conn, new_state):

src/bin/zonemgr/zonemgr.py.in

@@ -191,7 +191,7 @@ class ZonemgrRefresh:
         self._set_zone_retry_timer(zone_name_class)
 
     def zone_handle_notify(self, zone_name_class, master):
-        """Handle an incomding NOTIFY message via the Auth module.
+        """Handle an incoming NOTIFY message via the Auth module.
 
         It returns True if the specified zone matches one of the locally
         configured list of secondary zones; otherwise returns False.

src/lib/acl/loader.h

@@ -329,7 +329,7 @@ public:
         const List &list(description->listValue());
         boost::shared_ptr<ACL<Context, Action> > result(
             new ACL<Context, Action>(default_action_));
-        // Run trough the list of elements
+        // Run through the list of elements
         for (List::const_iterator i(list.begin()); i != list.end(); ++i) {
             Map map;
             try {
@@ -417,7 +417,7 @@ private:
             }
             default: {
                 // This is the AND-abbreviated form. We need to create an
-                // AND (or "ALL") operator, loop trough the whole map and
+                // AND (or "ALL") operator, loop through the whole map and
                 // fill it in. We do a small trick - we create bunch of
                 // single-item maps, call this loader recursively (therefore
                 // it will get into the "case 1" branch, where there is

src/lib/cache/tests/testdata/message_nxdomain_large_ttl.wire

@@ -19,7 +19,7 @@ b1fe 8583
 ## Authority
 ##
 # example.org: type SOA, class IN, mname ns1.example.org
-# TTL: 3 Hourse, 1 second (10801seconds)
+# TTL: 3 Hours, 1 second (10801 seconds)
 c0 0e 00 06 00 01 00 00 2a 31 00 22 03 6e 73 31 c0
 0e 05 61 64 6d 69 6e c0 0e 00 00 04 d2 00 00 0e
 10 00 00 07 08 00 24 ea 00 00 00 2a 31

src/lib/config/ccsession.cc

@@ -165,7 +165,7 @@ namespace {
 // getValue() (main problem described in ticket #993)
 // This returns either the value set for the given relative id,
 // or its default value
-// (intentially defined here so this interface does not get
+// (intentionally defined here so this interface does not get
 // included in ConfigData as it is)
 ConstElementPtr getValueOrDefault(ConstElementPtr config_part,
                                   const std::string& relative_id,

src/lib/config/ccsession.h

@@ -313,12 +313,12 @@ public:
      *                  spec_is_filename is true (the default), then a
      *                  filename is assumed, otherwise a module name.
      * \param handler The handler functor called whenever there's a change.
-     *                Called once initally from this function. May be NULL
+     *                Called once initially from this function. May be NULL
      *                if you don't want any handler to be called and you're
      *                fine with requesting the data through
      *                getRemoteConfigValue() each time.
      *
-     *                The handler should not throw, or it'll fall trough and
+     *                The handler should not throw, or it'll fall through and
      *                the exception will get into strange places, probably
      *                aborting the application.
      * \param spec_is_filename Says if spec_name is filename or module name.

src/lib/cryptolink/cryptolink.h

@@ -101,7 +101,7 @@ class CryptoLinkImpl;
 /// There is only one way to access it, through getCryptoLink(), which
 /// returns a reference to the initialized library. On the first call,
 /// it will be initialized automatically. You can however initialize it
-/// manually through a call to the initalize(), before your first call
+/// manually through a call to initialize(), before your first call
 /// to getCryptoLink. Any subsequent call to initialize() will be a
 /// noop.
 ///

src/lib/datasrc/client.h

@@ -206,7 +206,7 @@ public:
     ///
     /// The default implementation throws isc::NotImplemented. This allows
     /// for easy and fast deployment of minimal custom data sources, where
-    /// the user/implementator doesn't have to care about anything else but
+    /// the user/implementer doesn't have to care about anything else but
     /// the actual queries. Also, in some cases, it isn't possible to traverse
     /// the zone from logic point of view (eg. dynamically generated zone
     /// data).

src/lib/datasrc/client_list.h

@@ -174,7 +174,7 @@ public:
 
         /// \brief Negative answer constructor.
         ///
-        /// This conscructs a result for negative answer. Both pointers are
+        /// This constructs a result for negative answer. Both pointers are
         /// NULL, and exact_match_ is false.
         FindResult() :
             dsrc_client_(NULL),

src/lib/datasrc/database.h

@@ -161,7 +161,7 @@ public:
     ///
     /// This method looks up a zone for the given name in the database. It
     /// should match only exact zone name (eg. name is equal to the zone's
-    /// apex), as the DatabaseClient will loop trough the labels itself and
+    /// apex), as the DatabaseClient will loop through the labels itself and
     /// find the most suitable zone.
     ///
     /// It is not specified if and what implementation of this method may
@@ -314,7 +314,7 @@ public:
     /// \note In case there are multiple NSEC3 chains and they collide
     ///     (unlikely, but it can happen), this can return multiple NSEC3
     ///     records.
-    /// \exception any Since any implementaion can be used, the caller should
+    /// \exception any Since any implementation can be used, the caller should
     ///     expect any exception to be thrown.
     /// \exception isc::NotImplemented in case the database does not support
     ///     NSEC3
@@ -868,7 +868,7 @@ public:
     /// database.
     ///
     /// Application should not come directly in contact with this class
-    /// (it should handle it trough generic ZoneFinder pointer), therefore
+    /// (it should handle it through generic ZoneFinder pointer), therefore
     /// it could be completely hidden in the .cc file. But it is provided
     /// to allow testing and for rare cases when a database needs slightly
     /// different handling, so it can be subclassed.

src/lib/datasrc/memory/domaintree.h

@@ -1684,7 +1684,7 @@ DomainTree<T>::previousNode(DomainTreeNodeChain<T>& node_path) const {
         }
     }
 
-    // Exchange the node at the top of the path, as we move horizontaly
+    // Exchange the node at the top of the path, as we move horizontally
     // through the domain tree
     node_path.pop();
     node_path.push(node);

src/lib/datasrc/memory/rdata_serialization.h

@@ -364,7 +364,7 @@ struct RdataEncodeSpec;
 /// from the field sequence, you'll need to build the complete
 /// wire-format data, and then construct a dns::Rdata object from it.
 ///
-/// To use it, contstruct it with the data you got from RDataEncoder,
+/// To use it, construct it with the data you got from RDataEncoder,
 /// provide it with callbacks and then iterate through the data.
 /// The callbacks are called with the data fields contained in the
 /// data.

src/lib/datasrc/sqlite3_accessor.h

@@ -250,7 +250,7 @@ public:
     virtual std::string findPreviousName(int zone_id, const std::string& rname)
         const;
 
-    /// \brief Conrete implemantion of the pure virtual method of
+    /// \brief Concrete implementation of the pure virtual method of
     /// DatabaseAccessor
     virtual std::string findPreviousNSEC3Hash(int zone_id,
                                               const std::string& hash) const;

src/lib/datasrc/tests/zone_finder_context_unittest.cc

@@ -105,7 +105,7 @@ createSQLite3ClientWithNS(RRClass zclass, const Name& zname) {
 }
 
 // The test class.  Its parameterized so we can share the test scnearios
-// for any concrete data source implementaitons.
+// for any concrete data source implementations.
 class ZoneFinderContextTest :
         public ::testing::TestWithParam<ClientCreator>
 {

src/lib/dhcp/dhcp6.h

@@ -114,7 +114,7 @@ extern const int dhcpv6_type_name_max;
 // Define hardware types
 // Taken from http://www.iana.org/assignments/arp-parameters/
 #define HWTYPE_ETHERNET    0x0001
-#define HWTYPE_INIFINIBAND 0x0020
+#define HWTYPE_INFINIBAND  0x0020
 
 // Taken from http://www.iana.org/assignments/enterprise-numbers
 #define ENTERPRISE_ID_ISC 2495

src/lib/dhcp/iface_mgr.h

@@ -253,7 +253,7 @@ public:
         /// network interface name
         std::string name_;
 
-        /// interface index (a value that uniquely indentifies an interface)
+        /// interface index (a value that uniquely identifies an interface)
         int ifindex_;
 
         /// list of assigned addresses
@@ -585,7 +585,7 @@ protected:
     ///
     /// This method will eventually detect available interfaces. For now
     /// it offers stub implementation. First interface name and link-local
-    /// IPv6 address is read from intefaces.txt file.
+    /// IPv6 address is read from interfaces.txt file.
     void
     detectIfaces();
 
@@ -594,7 +594,7 @@ protected:
     /// This implementations reads a single line from interfaces.txt file
     /// and pretends to detect such interface. First interface name and
     /// link-local IPv6 address or IPv4 address is read from the
-    /// intefaces.txt file.
+    /// interfaces.txt file.
     void
     stubDetectIfaces();
 
@@ -674,7 +674,7 @@ private:
     /// @param remote_addr remote address to connect to
     /// @param port port to be used
     /// @return local address to be used to connect to remote address
-    /// @throw isc::Unexpected if unable to indentify local address
+    /// @throw isc::Unexpected if unable to identify local address
     isc::asiolink::IOAddress
     getLocalAddress(const isc::asiolink::IOAddress& remote_addr,
                     const uint16_t port);

src/lib/dhcp/iface_mgr_linux.cc

@@ -67,7 +67,7 @@ public:
 /// interfaces) uses memory aliasing. Linux kernel returns a memory
 /// blob that should be interpreted as series of nlmessages. There
 /// are different nlmsg structures defined with varying size. They
-/// have one thing common - inital fields are laid out in the same
+/// have one thing common - initial fields are laid out in the same
 /// way as nlmsghdr. Therefore different messages can be represented
 /// as nlmsghdr with followed variable number of bytes that are
 /// message-specific. The only reasonable way to represent this in
@@ -476,7 +476,7 @@ void IfaceMgr::detectIfaces() {
         iface.setHWType(interface_info->ifi_type);
         iface.setFlags(interface_info->ifi_flags);
 
-        // Does inetface have LL_ADDR?
+        // Does interface have LL_ADDR?
         if (attribs_table[IFLA_ADDRESS]) {
             iface.setMac(static_cast<const uint8_t*>(RTA_DATA(attribs_table[IFLA_ADDRESS])),
                          RTA_PAYLOAD(attribs_table[IFLA_ADDRESS]));

src/lib/dhcp/option_definition.h

@@ -167,7 +167,7 @@ public:
     ///
     /// This constructor sets the name of the option space that is
     /// encapsulated by this option. The encapsulated option space
-    /// indentifies sub-options that are carried within this option.
+    /// identifies sub-options that are carried within this option.
     /// This constructor does not allow to set array indicator
     /// because options comprising an array of data fields must
     /// not be used with sub-options.
@@ -186,7 +186,7 @@ public:
     ///
     /// This constructor sets the name of the option space that is
     /// encapsulated by this option. The encapsulated option space
-    /// indentifies sub-options that are carried within this option.
+    /// identifies sub-options that are carried within this option.
     /// This constructor does not allow to set array indicator
     /// because options comprising an array of data fields must
     /// not be used with sub-options.

src/lib/dhcp/tests/option_custom_unittest.cc

@@ -262,7 +262,7 @@ TEST_F(OptionCustomTest, int16Data) {
     // We should have just one data field.
     ASSERT_EQ(1, option->getDataFieldsNum());
 
-    // Initialize value to 0 explicitely to make sure that is
+    // Initialize value to 0 explicitly to make sure that is
     // modified by readInteger function to expected -234.
     int16_t value = 0;
     ASSERT_NO_THROW(value = option->readInteger<int16_t>(0));
@@ -295,7 +295,7 @@ TEST_F(OptionCustomTest, int32Data) {
     // We should have just one data field.
     ASSERT_EQ(1, option->getDataFieldsNum());
 
-    // Initialize value to 0 explicitely to make sure that is
+    // Initialize value to 0 explicitly to make sure that is
     // modified by readInteger function to expected -234.
     int32_t value = 0;
     ASSERT_NO_THROW(value = option->readInteger<int32_t>(0));

src/lib/dhcp/tests/option_int_unittest.cc

@@ -296,7 +296,7 @@ TEST_F(OptionIntTest, basicInt32V6) {
 TEST_F(OptionIntTest, setValueUint8) {
     boost::shared_ptr<OptionInt<uint8_t> > opt(new OptionInt<uint8_t>(Option::V6,
                                                                       D6O_PREFERENCE, 123));
-    // Check if constructor intitialized the option value correctly.
+    // Check if constructor initialized the option value correctly.
     EXPECT_EQ(123, opt->getValue());
     // Override the value.
     opt->setValue(111);
@@ -310,7 +310,7 @@ TEST_F(OptionIntTest, setValueUint8) {
 TEST_F(OptionIntTest, setValueInt8) {
     boost::shared_ptr<OptionInt<int8_t> > opt(new OptionInt<int8_t>(Option::V6,
                                                                     D6O_PREFERENCE, -123));
-    // Check if constructor intitialized the option value correctly.
+    // Check if constructor initialized the option value correctly.
     EXPECT_EQ(-123, opt->getValue());
     // Override the value.
     opt->setValue(-111);
@@ -325,7 +325,7 @@ TEST_F(OptionIntTest, setValueInt8) {
 TEST_F(OptionIntTest, setValueUint16) {
     boost::shared_ptr<OptionInt<uint16_t> > opt(new OptionInt<uint16_t>(Option::V6,
                                                                         D6O_ELAPSED_TIME, 123));
-    // Check if constructor intitialized the option value correctly.
+    // Check if constructor initialized the option value correctly.
     EXPECT_EQ(123, opt->getValue());
     // Override the value.
     opt->setValue(0x0102);
@@ -339,7 +339,7 @@ TEST_F(OptionIntTest, setValueUint16) {
 TEST_F(OptionIntTest, setValueInt16) {
     boost::shared_ptr<OptionInt<int16_t> > opt(new OptionInt<int16_t>(Option::V6,
                                                                       D6O_ELAPSED_TIME, -16500));
-    // Check if constructor intitialized the option value correctly.
+    // Check if constructor initialized the option value correctly.
     EXPECT_EQ(-16500, opt->getValue());
     // Override the value.
     opt->setValue(-20100);
@@ -353,7 +353,7 @@ TEST_F(OptionIntTest, setValueInt16) {
 TEST_F(OptionIntTest, setValueUint32) {
     boost::shared_ptr<OptionInt<uint32_t> > opt(new OptionInt<uint32_t>(Option::V6,
                                                                         D6O_CLT_TIME, 123));
-    // Check if constructor intitialized the option value correctly.
+    // Check if constructor initialized the option value correctly.
     EXPECT_EQ(123, opt->getValue());
     // Override the value.
     opt->setValue(0x01020304);
@@ -367,7 +367,7 @@ TEST_F(OptionIntTest, setValueUint32) {
 TEST_F(OptionIntTest, setValueInt32) {
     boost::shared_ptr<OptionInt<int32_t> > opt(new OptionInt<int32_t>(Option::V6,
                                                                       D6O_CLT_TIME, -120100));
-    // Check if constructor intitialized the option value correctly.
+    // Check if constructor initialized the option value correctly.
     EXPECT_EQ(-120100, opt->getValue());
     // Override the value.
     opt->setValue(-125000);

src/lib/dhcpsrv/subnet.h

@@ -47,7 +47,7 @@ namespace dhcp {
 /// @todo: Implement support for options here
 
 
-/// @brief Unique indentifier for a subnet (both v4 and v6)
+/// @brief Unique identifier for a subnet (both v4 and v6)
 typedef uint32_t SubnetID;
 
 class Subnet {

src/lib/dns/master_loader.cc

@@ -400,7 +400,7 @@ private:
     const Name zone_origin_;
     Name active_origin_; // The origin used during parsing
                          // (modifiable by $ORIGIN)
-    shared_ptr<Name> last_name_; // Last seen name (for INITAL_WS handling)
+    shared_ptr<Name> last_name_; // Last seen name (for INITIAL_WS handling)
     const RRClass zone_class_;
     MasterLoaderCallbacks callbacks_;
     const AddRRCallback add_callback_;

src/lib/dns/nsec3hash.cc

@@ -45,7 +45,7 @@ namespace {
 /// calculation specified in RFC5155.
 ///
 /// Currently the only pre-defined algorithm in the RFC is SHA1.  So we don't
-/// over-generalize it at the moment, and rather hardocde it and assume that
+/// over-generalize it at the moment, and rather hardcode it and assume that
 /// specific algorithm.
 ///
 /// The implementation details are only open within this file, but to avoid

src/lib/dns/python/pydnspp_common.h

@@ -50,7 +50,7 @@ int addClassVariable(PyTypeObject& c, const char* name, PyObject* obj);
 
 /// \brief Initialize a wrapped class type, and add to module
 ///
-/// The type object is initalized, and its refcount is increased after
+/// The type object is initialized, and its refcount is increased after
 /// successful addition to the module.
 ///
 /// \param type The type object to initialize

src/lib/dns/python/tests/nsec3hash_python_test.py

@@ -41,7 +41,7 @@ class NSEC3HashTest(unittest.TestCase):
                                                       RRClass.IN,
                                                       "1 0 12 aabbccdd"), 1)
 
-        # Invaid type of RDATA
+        # Invalid type of RDATA
         self.assertRaises(TypeError, NSEC3Hash, Rdata(RRType.A, RRClass.IN,
                                                       "192.0.2.1"))
 

src/lib/dns/tests/labelsequence_unittest.cc

@@ -949,7 +949,7 @@ public:
                                     foo_example("foo.example."),
                                     org("org")
     {
-        // explicitely set to non-zero data, to make sure
+        // explicitly set to non-zero data, to make sure
         // we don't try to use data we don't set
         memset(buf, 0xff, LabelSequence::MAX_SERIALIZED_LENGTH);
     }

src/lib/dns/tests/testdata/example.org

@@ -13,5 +13,5 @@ example.org.        3600    IN  SOA ( ; The SOA, split across lines for testing
 
 ; Some empty lines here. They are to make sure the loader can skip them.
 www                 3600    IN  A 192.0.2.1 ; Test a relative name as well.
-                    3600    IN  AAAA    2001:db8::1 ; And initial whitespace hanling
+                    3600    IN  AAAA    2001:db8::1 ; And initial whitespace handling
          ; Here be just some space, no RRs

src/lib/log/log_dbglevels.h

@@ -42,7 +42,7 @@
 /// libraries.
 ///
 /// This file defines a set of standard debug levels for use across all loggers.
-/// In this way users can have some expection of what will be output when
+/// In this way users can have some expectation of what will be output when
 /// enabling debugging.  Symbols are prefixed DBGLVL so as not to clash with
 /// DBG_ symbols in the various modules.
 ///

src/lib/log/logger_manager_impl.h

@@ -55,7 +55,7 @@ public:
 
     /// \brief Initialize Processing
     ///
-    /// This resets the hierachy of loggers back to their defaults.  This means
+    /// This resets the hierarchy of loggers back to their defaults.  This means
     /// that all non-root loggers (if they exist) are set to NOT_SET, and the
     /// root logger reset to logging informational messages.
     void processInit();

src/lib/log/tests/message_initializer_1_unittest.cc

@@ -98,7 +98,7 @@ TEST(MessageInitializerTest1, Duplicates) {
     MessageInitializer::clearDuplicates();
     ASSERT_EQ(0, MessageInitializer::getDuplicates().size());
 
-    // Do it again to make sure, let's explicitely provide false now
+    // Do it again to make sure, let's explicitly provide false now
     const MessageInitializer init_message_initializer_unittest_3(dupe);
     MessageInitializer::loadDictionary(false);
     ASSERT_EQ(1, MessageInitializer::getDuplicates().size());

src/lib/nsas/nameserver_entry.cc

@@ -91,7 +91,7 @@ NameserverEntry::getAddresses(AddressVector& addresses,
             if (!has_address_[family] && expect_address_[family]) {
                 return IN_PROGRESS;
             }
-            // If we do not expect the address, then fall trough to READY
+            // If we do not expect the address, then fall through to READY
         case EXPIRED: // If expired_ok, we pretend to be ready
         case READY:
             if (!has_address_[family]) {
@@ -149,7 +149,7 @@ NameserverEntry::setAddressRTT(const IOAddress& address, uint32_t rtt) {
             }
         }
 
-        // Hack. C++ does not allow ++ on enums, enumerating trough them is pain
+        // Hack. C++ does not allow ++ on enums, enumerating through them is pain
         switch (family) {
             case V4_ONLY: family = V6_ONLY; break;
             default: return;

src/lib/nsas/tests/nameserver_entry_unittest.cc

@@ -59,10 +59,10 @@ protected:
     };
 private:
     /**
-     * \short Fills an rrset into the NameserverEntry trough resolver.
+     * \short Fills an rrset into the NameserverEntry through resolver.
      *
      * This function is used when we want to pass data to a NameserverEntry
-     * trough the resolver.
+     * through the resolver.
      * \param resolver The resolver used by the NameserverEntry
      * \param index Index of the query in the resolver.
      * \param set The answer. If the pointer is empty, it is taken
@@ -79,7 +79,7 @@ private:
         }
     }
 protected:
-    /// Fills the nameserver entry with data trough ask IP
+    /// Fills the nameserver entry with data through ask IP
     void fillNSEntry(boost::shared_ptr<NameserverEntry> entry,
         RRsetPtr rrv4, RRsetPtr rrv6)
     {

src/lib/nsas/tests/zone_entry_unittest.cc

@@ -228,7 +228,7 @@ TEST_F(ZoneEntryTest, ChangedNS) {
     EXPECT_EQ(Fetchable::IN_PROGRESS, zone->getState());
     EXPECT_NO_THROW(resolver_->provideNS(0, rr_single_));
     // It should not be answered yet, it should ask for the IP addresses
-    // (trough the NameserverEntry there)
+    // (through the NameserverEntry there)
     EXPECT_TRUE(callback_->successes_.empty());
     EXPECT_EQ(0, callback_->unreachable_count_);
     EXPECT_TRUE(resolver_->asksIPs(ns_name_, 1, 2));

src/lib/nsas/zone_entry.cc

@@ -93,7 +93,7 @@ class ZoneEntry::ResolverCallback :
          * If there are in the hash table, it is used. If not, they are
          * created. This might still fail, if the list is empty.
          *
-         * It then calls process, to go trough the list of nameservers,
+         * It then calls process, to go through the list of nameservers,
          * examining them and seeing if some addresses are already there
          * and to ask for the rest of them.
          */
@@ -389,7 +389,7 @@ class ZoneEntry::NameserverCallback : public NameserverEntry::Callback {
          * \short Callback method.
          *
          * This is called by NameserverEntry when the change happens.
-         * We just call process to go trough relevant nameservers and call
+         * We just call process to go through relevant nameservers and call
          * any callbacks we can.
          */
         virtual void operator()(NameserverPtr ns) {
@@ -451,8 +451,8 @@ ZoneEntry::process(AddressFamily family,
                  * one handle it when we return to it.
                  *
                  * If we didn't do it, one instance would call "resolve". If it
-                 * was from cache, it would imediatelly recurse back to another
-                 * process (trough the nameserver callback, etc), which would
+                 * was from cache, it would immediately recurse back to another
+                 * process (through the nameserver callback, etc), which would
                  * take that only one nameserver and trigger all callbacks.
                  * Only then would resolve terminate and we could ask for the
                  * second nameserver. This way, we first receive all the

src/lib/python/bind10_config.py.in

@@ -33,7 +33,7 @@ def reload():
     SYSCONFPATH="@sysconfdir@/@PACKAGE@".replace('${prefix}', PREFIX)
 
     # B10_FROM_SOURCE is set in the environment for internal tests and
-    # an experimental run without installagion.  In that case we need to
+    # an experimental run without installation.  In that case we need to
     # specialize some configuration variables, generally so that they refer
     # to somewhere in the source tree instead of the appropriate places
     # after installation.

src/lib/python/isc/bind10/component.py

@@ -490,7 +490,7 @@ class Component(BaseComponent):
 class Configurator:
     """
     This thing keeps track of configuration changes and starts and stops
-    components as it goes. It also handles the inital startup and final
+    components as it goes. It also handles the initial startup and final
     shutdown.
 
     Note that this will allow you to stop (by invoking reconfigure) a core

src/lib/python/isc/bind10/tests/sockcreator_test.py

@@ -306,7 +306,7 @@ class WrapTests(unittest.TestCase):
         p1.close()
         p1 = socket.fromfd(t2.read_fd(), socket.AF_UNIX, socket.SOCK_STREAM)
 
-        # Now, pass some data trough the socket
+        # Now, pass some data through the socket
         p1.send(b'A')
         data = p2.recv(1)
         self.assertEqual(b'A', data)

src/lib/python/isc/bind10/tests/socket_cache_test.py

@@ -58,7 +58,7 @@ class SocketTest(Test):
 
     def test_init(self):
         """
-        Checks the intrnals of the cache just after the creation.
+        Checks the internals of the cache just after the creation.
         """
         self.assertEqual('UDP', self.__socket.protocol)
         self.assertEqual(self.__address, self.__socket.address)

src/lib/python/isc/config/ccsession.py

@@ -194,7 +194,7 @@ class ModuleCCSession(ConfigData):
            it will read the system-wide Logging configuration and call
            the logger manager to apply it. It will also inform the
            logger manager when the logging configuration gets updated.
-           The module does not need to do anything except intializing
+           The module does not need to do anything except initializing
            its loggers, and provide log messages. Defaults to true.
 
            socket_file: If cc_session was none, this optional argument

src/lib/python/isc/config/cfgmgr.py

@@ -442,7 +442,7 @@ class ConfigManager:
         # polymorphism instead of branching. But it just might turn out it
         # will get solved by itself when we move everything to virtual modules
         # (which is possible solution to the offline configuration problem)
-        # or when we solve the incorect behaviour here when a config is
+        # or when we solve the incorrect behaviour here when a config is
         # rejected (spying modules don't know it was rejected and some modules
         # might have been committed already).
         if module_name in self.virtual_modules:

src/lib/python/isc/config/tests/cfgmgr_test.py

@@ -201,7 +201,7 @@ class TestConfigManager(unittest.TestCase):
 
     def test_paths(self):
         """
-        Test data_path and database filename is passed trough to
+        Test data_path and database filename is passed through to
         underlying ConfigManagerData.
         """
         cm = ConfigManager("datapath", "filename", self.fake_session)
@@ -541,7 +541,7 @@ class TestConfigManager(unittest.TestCase):
         # We run the same three times, with different return values
         def single_test(value, returnFunc, expectedResult):
             # Because closures can't assign to closed-in variables, we pass
-            # it trough self
+            # it through self
             self.called_with = None
             def check_test(new_data):
                 self.called_with = new_data

src/lib/python/isc/datasrc/client_inc.cc

@@ -177,7 +177,7 @@ datasource, or when an internal error occurs.\n\
 \n\
 The default implementation throws isc.datasrc.NotImplemented. This allows for\n\
 easy and fast deployment of minimal custom data sources, where the\n\
-user/implementator doesn't have to care about anything else but the\n\
+user/implementer doesn't have to care about anything else but the\n\
 actual queries. Also, in some cases, it isn't possible to traverse the\n\
 zone from logic point of view (eg. dynamically generated zone data).\n\
 \n\

src/lib/python/isc/datasrc/client_python.cc

@@ -162,7 +162,7 @@ DataSourceClient_getIterator(PyObject* po_self, PyObject* args) {
         try {
             bool separate_rrs = false;
             if (separate_rrs_obj != NULL) {
-                // store result in local var so we can explicitely check for
+                // store result in local var so we can explicitly check for
                 // -1 error return value
                 int separate_rrs_true = PyObject_IsTrue(separate_rrs_obj);
                 if (separate_rrs_true == 1) {

src/lib/python/isc/ddns/session.py

@@ -656,7 +656,7 @@ class UpdateSession:
         '''
         # For a number of cases, we may need to remove data in the zone
         # (note; SOA is handled separately by __do_update, so that one
-        # is explicitely ignored here)
+        # is explicitly ignored here)
         if rrset.get_type() == RRType.SOA:
             return
         result, orig_rrset, _ = self.__diff.find(rrset.get_name(),

src/lib/python/isc/ddns/tests/session_tests.py

@@ -209,7 +209,7 @@ class SessionTestBase(unittest.TestCase):
     def tearDown(self):
         # With the Updater created in _get_update_zone, and tests
         # doing all kinds of crazy stuff, one might get database locked
-        # errors if it doesn't clean up explicitely after each test
+        # errors if it doesn't clean up explicitly after each test
         self._session = None
 
     def check_response(self, msg, expected_rcode):

src/lib/python/isc/server_common/dns_tcp.py

@@ -267,7 +267,7 @@ class DNSTCPContext:
         when this object is deallocated, but Python seems to expect socket
         objects should be explicitly closed before deallocation.  So it's
         generally advisable for the user of this object to call this method
-        explictily when it doesn't need the context.
+        explicitly when it doesn't need the context.
 
         This method can be called more than once or can be called after
         other I/O related methods have returned CLOSED; it's compatible

src/lib/python/isc/sysinfo/sysinfo.py

@@ -415,7 +415,7 @@ class SysInfoFreeBSD(SysInfoFreeBSDOSX):
             self._platform_is_smp = True # the value doesn't matter
         except subprocess.CalledProcessError:
             # if this variable isn't defined we should see this exception.
-            # intepret it as an indication of non-SMP kernel.
+            # interpret it as an indication of non-SMP kernel.
             self._platform_is_smp = False
         except OSError:
             pass

src/lib/python/isc/util/socketserver_mixin.py

@@ -39,7 +39,7 @@ class NoPollMixIn:
     socketserver.BaseServer or some derived classes of it, and it must
     be placed before the corresponding socketserver class.  In
     addition, the constructor of this mix-in must be called
-    explicitely in the derived class.  For example, a basic TCP server
+    explicitly in the derived class.  For example, a basic TCP server
     without the problem of polling is created as follows:
 
        class MyServer(NoPollMixIn, socketserver.TCPServer):

src/lib/resolve/tests/recursive_query_unittest.cc

@@ -971,7 +971,7 @@ TEST_F(RecursiveQueryTest, CachedNS) {
     // point and ask NSAS for it. NSAS will in turn ask resolver for NS record
     // of the delegation point. We then pick it up from the fake resolver
     // and check it is the correct one. This checks the delegation point
-    // travels safely trough the whole path there (it would be enough to check
+    // travels safely through the whole path there (it would be enough to check
     // it up to NSAS, but replacing NSAS is more complicated, so we just
     // include in the test as well for simplicity).
 

src/lib/server_common/portconfig.cc

@@ -135,7 +135,7 @@ installListenAddresses(const AddressList& new_addresses,
          * set successuflly or none of them will be used. whether this
          * behavior is user desired, maybe we need revisited it later. And
          * if address setting is more smarter, it should check whether some
-         * part of the new address already in used to avoid interuption the
+         * part of the new address already in used to avoid interrupting the
          * service.
          *
          * If the address setting still failed, we can live with it, since

src/lib/util/python/gen_wiredata.py.in

@@ -138,7 +138,7 @@ the type.  But there are some common configurable entries.  See the
 description of the RR class.  The most important one would be "as_rr".
 It controls whether the entry should be treated as an RR (with name,
 type, class and TTL) or only as an RDATA.  By default as_rr is
-"False", so if an entry is to be intepreted as an RR, an as_rr entry
+"False", so if an entry is to be interpreted as an RR, an as_rr entry
 must be explicitly specified with a value of "True".
 
 Another common entry is "rdlen".  It specifies the RDLEN field value
@@ -762,7 +762,7 @@ class TXT(RR):
       value will be used.  If this parameter isn't specified either,
       the length of the string will be used.  Note that it means
       this parameter (or any stringlenN) doesn't have to be specified
-      unless you want to intentially build a broken character string.
+      unless you want to intentionally build a broken character string.
     - string (string): the default string.  If nstring >= 1 and the
       corresponding stringN isn't specified in the spec file, this
       string will be used.

src/lib/util/tests/fd_share_tests.cc

@@ -66,7 +66,7 @@ TEST(FDShare, transfer) {
             if (close(pipes[0])) {
                 exit(1);
             }
-            // Send "data" trough the received fd, close it and be done
+            // Send "data" through the received fd, close it and be done
             if (!write_data(fd, "data", 4) || close(fd) == -1) {
                 exit(1);
             }

src/lib/util/unittests/resolver.h

@@ -60,7 +60,7 @@ class TestResolver : public isc::resolve::ResolverInterface {
         PresetAnswers answers_;
     public:
         typedef std::pair<isc::dns::QuestionPtr, CallbackPtr> Request;
-        /// \brief List of requests the tested class sent trough resolve
+        /// \brief List of requests the tested class sent through resolve
         std::vector<Request> requests;
 
         /// \brief Destructor

src/lib/xfr/tests/client_test.cc

@@ -24,7 +24,7 @@ using namespace isc::xfr;
 
 namespace {
 
-TEST(ClientTest, connetFile) {
+TEST(ClientTest, connectFile) {
     // File path is too long
     struct sockaddr_un s;     // can't be const; some compiler complains
     EXPECT_THROW(XfroutClient(string(sizeof(s.sun_path), 'x')).connect(),

tests/lettuce/features/example.feature

@@ -26,7 +26,7 @@ Feature: Example feature
 
     Scenario: New database
         # This test checks whether a database file is automatically created
-        # Underwater, we take advantage of our intialization routines so
+        # Underwater, we take advantage of our initialization routines so
         # that we are sure this file does not exist, see
         # features/terrain/terrain.py
 

tests/lettuce/features/nsec3_auth.feature

@@ -241,7 +241,7 @@ Feature: NSEC3 Authoritative service
         """
 
     #
-    # Below are additional tests, not explicitely stated in RFC5155
+    # Below are additional tests, not explicitly stated in RFC5155
     #
 
     Scenario: 7.2.2 other; Name Error where one NSEC3 covers multiple parts of proof (closest encloser)

tests/tools/badpacket/option_info.h

@@ -151,7 +151,7 @@ public:
     /// \param index A valid index (one of the values in the 'Index' enum).
     ///
     /// \return Maximum allowed value for this option.  If the option is a bit
-    ///         in the flags field of the DNS message hearder, this will be 1.
+    ///         in the flags field of the DNS message header, this will be 1.
     static uint32_t maxval(int index);
 
     /// \brief Check Array Index

tests/tools/dhcp-ubench/dhcp-perf-guide.xml

@@ -316,7 +316,7 @@
         turned to several modes of operation. Its value can be
         modified in SQLite_uBenchmark::connect().  See
         http://www.sqlite.org/pragma.html#pragma_journal_mode for
-        detailed explanantion.</para>
+        a detailed explanation.</para>
 
         <para>sqlite_bench supports precompiled statements. Please use
         '-c no|yes' to define which should be used: basic SQL query (no) or

tests/tools/perfdhcp/command_options.cc

@@ -433,7 +433,7 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
     }
     if (server_name_.empty()) {
         isc_throw(InvalidParameter,
-                  "without an inteface server is required");
+                  "without an interface, server is required");
     }
 
     // If DUID is not specified from command line we need to

tests/tools/perfdhcp/pkt_transform.h

@@ -54,7 +54,7 @@ public:
     /// if the option's offset + its size is beyond the packet's size.
     ///
     /// \param universe Universe used, V4 or V6
-    /// \param in_buffer Input buffer holding intial packet
+    /// \param in_buffer Input buffer holding initial packet
     /// data, this can be directly read from template file
     /// \param options Options collection with offsets
     /// \param transid_offset offset of transaction id in a packet,

tests/tools/perfdhcp/stats_mgr.h

@@ -719,7 +719,7 @@ public:
         /// \brief Private default constructor.
         ///
         /// Default constructor is private because we want the client
-        /// class to specify exchange type explicitely.
+        /// class to specify exchange type explicitly.
         ExchangeStats();
 
         /// \brief Erase packet from the list of sent packets.
@@ -905,7 +905,7 @@ public:
 
     /// \brief Increment specified counter.
     ///
-    /// Increement counter value by one.
+    /// Increment counter value by one.
     ///
     /// \param counter_key key poiting to the counter in the counters map.
     /// \param value value to increment counter by.

tests/tools/perfdhcp/test_control.cc

@@ -905,8 +905,8 @@ TestControl::readPacketTemplate(const std::string& file_name) {
             hex_digits.push_back(file_contents[i]);
         } else if (!isxdigit(file_contents[i]) &&
                    !isspace(file_contents[i])) {
-            isc_throw(BadValue, "the '" << file_contents[i] << "' is not a"
-                      " heaxadecimal digit");
+            isc_throw(BadValue, "'" << file_contents[i] << "' is not a"
+                      " hexadecimal digit");
         }
     }
     // Expect even number of digits.
@@ -1864,7 +1864,7 @@ TestControl::updateSendDue() {
         // timer resolution.
         duration = time_duration::ticks_per_second() / rate;
     }
-    // Calculate due time to initate next chunk of exchanges.
+    // Calculate due time to initiate next chunk of exchanges.
     send_due_ = last_sent_ + time_duration(0, 0, 0, duration);
     // Check if it is already due.
     ptime now(microsec_clock::universal_time());

tests/tools/perfdhcp/test_control.h

@@ -909,7 +909,7 @@ private:
     /// \brief Handle interrupt signal.
     ///
     /// Function sets flag indicating that program has been
-    /// interupted.
+    /// interrupted.
     ///
     /// \param sig signal (ignored)
     static void handleInterrupt(int sig);
@@ -970,7 +970,7 @@ private:
     NumberGeneratorPtr transid_gen_; ///< Transaction id generator.
     NumberGeneratorPtr macaddr_gen_; ///< Numbers generator for MAC address.
 
-    /// Buffer holiding server id received in first packet
+    /// Buffer holding server id received in first packet
     dhcp::OptionBuffer first_packet_serverid_;
 
     /// Packet template buffers.

tests/tools/perfdhcp/tests/command_options_unittest.cc

@@ -546,7 +546,7 @@ TEST_F(CommandOptionsTest, Interface) {
     // In order to make this test portable we need to know
     // at least one interface name on OS where test is run.
     // Interface Manager has ability to detect interfaces.
-    // Although we don't call initIsInterface explicitely
+    // Although we don't call initIsInterface explicitly
     // here it is called by CommandOptions object interally
     // so this function is covered by the test.
     dhcp::IfaceMgr& iface_mgr = dhcp::IfaceMgr::instance();