Merge branch 'isc-master' into config-h

1 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/dhcp/option4_client_fqdn.cc b/src/lib/dhcp/option4_client_fqdn.cc
index d6438ad365..f797982d2a 100644
--- a/src/lib/dhcp/option4_client_fqdn.cc
+++ b/src/lib/dhcp/option4_client_fqdn.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -54,9 +54,9 @@ public:
 
     /// @brief Constructor, from wire data.
     ///
-    /// @param first An iterator pointing to the begining of the option data
+    /// @param first An iterator pointing to the beginning of the option data
     /// in the wire format.
-    /// @param last An iterator poiting to the end of the option data in the
+    /// @param last An iterator pointing to the end of the option data in the
     /// wire format.
     Option4ClientFqdnImpl(OptionBufferConstIter first,
                           OptionBufferConstIter last);
@@ -94,9 +94,9 @@ public:
 
     /// @brief Parse the Option provided in the wire format.
     ///
-    /// @param first An iterator pointing to the begining of the option data
+    /// @param first An iterator pointing to the beginning of the option data
     /// in the wire format.
-    /// @param last An iterator poiting to the end of the option data in the
+    /// @param last An iterator pointing to the end of the option data in the
     /// wire format.
     void parseWireData(OptionBufferConstIter first,
                        OptionBufferConstIter last);
@@ -106,11 +106,11 @@ public:
     void parseCanonicalDomainName(OptionBufferConstIter first,
                                   OptionBufferConstIter last);
 
-    /// @brief Parse domain-name emcoded in the deprecated ASCII format.
+    /// @brief Parse domain-name encoded in the deprecated ASCII format.
     ///
-    /// @param first An iterator pointing to the begining of the option data
+    /// @param first An iterator pointing to the beginning of the option data
     /// where domain-name is stored.
-    /// @param last An iterator poiting to the end of the option data where
+    /// @param last An iterator pointing to the end of the option data where
     /// domain-name is stored.
     void parseASCIIDomainName(OptionBufferConstIter first,
                               OptionBufferConstIter last);
@@ -123,7 +123,7 @@ Option4ClientFqdnImpl(const uint8_t flags,
                       const std::string& domain_name,
                       // cppcheck 1.57 complains that const enum value is not passed
                       // by reference. Note that, it accepts the non-const enum value
-                      // to be passed by value. In both cases it is unneccessary to
+                      // to be passed by value. In both cases it is unnecessary to
                       // pass the enum by reference.
                       // cppcheck-suppress passedByValue
                       const Option4ClientFqdn::DomainNameType name_type)
@@ -190,7 +190,7 @@ Option4ClientFqdnImpl::
 setDomainName(const std::string& domain_name,
               // cppcheck 1.57 complains that const enum value is not passed
               // by reference. Note that, it accepts the non-const enum
-              // to be passed by value. In both cases it is unneccessary to
+              // to be passed by value. In both cases it is unnecessary to
               // pass the enum by reference.
               // cppcheck-suppress passedByValue
               const Option4ClientFqdn::DomainNameType name_type) {