[3705] Fix some typos found during the review.

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index d46d3a168b822d132bb4dd03f934823d9262c805..4381680468e5ca06ecfe090e4991c66f1d0783b5 100644 (file)
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -1393,7 +1393,7 @@ should include options from the isc option space:
 }
 </screen>
       </para>
-      <para>As of March 2015, the only option 65 is RSOO-enabled by IANA. This
+      <para>As of March 2015, only option 65 is RSOO-enabled by IANA. This
       option will always be treated as such and there's no need to explicitly
       mark it. Also, when enabling standard options, it is possible to use their
       names, rather than option code, e.g. (e.g. use

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 455c0416f86597c5253a33e2dde874d4c45b921a..851863a9948873dd5d48c617ae6cad516db4ee2b 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -256,7 +256,7 @@ bool Dhcpv6Srv::run() {
         // Handle next signal received by the process. It must be called after
         // an attempt to receive a packet to properly handle server shut down.
         // The SIGTERM or SIGINT will be received prior to, or during execution
-        // of select() (select is invoked by recivePacket()). When that happens,
+        // of select() (select is invoked by receivePacket()). When that happens,
         // select will be interrupted. The signal handler will be invoked
         // immediately after select(). The handler will set the shutdown flag
         // and cause the process to terminate before the next select() function

diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index d8e65c0d0cc6a22a19cb742e1b72f898ad6fdbd4..5cb515e6341402f17beeabe3686a922ca50e3958 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -610,7 +610,7 @@ protected:
     ///
     /// This method implements RFC6422. It checks if there are any RSOO options
     /// inserted by the relay agents in the query message. If there are, they
-    /// are copied over to the response if the met the following criteria:
+    /// are copied over to the response if they meet the following criteria:
     /// - the option is marked as RSOO-enabled (see relay-supplied-options
     ///   configuration parameter)
     /// - there is no such option provided by the server)

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 2280afae4df1ea08be7fc4d5075f91f71713d874..5769a66e7a4e2f42fbf1b01d2be64a54f54c0046 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -2101,8 +2101,8 @@ TEST_F(Dhcpv6SrvTest, relayOverrideAndClientClass) {
 /// codes of those nested options are specified in codes parameter. Content of
 /// the options is controlled with payload parameter. When it is zero, option
 /// code will be used (e.g. option 100 will contain repeating bytes of value 100).
-/// When non-zero is used, payload will used. Each suboption is always set to
-/// arbitrary chosen value of 10.
+/// When non-zero is used, payload will be used. Each suboption length is always
+/// set to the arbitrarily chosen value of 10.
 ///
 /// @param codes a vector of option codes to be created
 /// @param payload specified payload (0 = fill payload with repeating option code)

diff --git a/src/lib/dhcp/std_option_defs.h b/src/lib/dhcp/std_option_defs.h
index 080892f5668ef17bc3021a9abb846415c1080fa1..4d1f710ec1b6d2a0fdf11fe9de5b458d8d429920 100644 (file)
--- a/src/lib/dhcp/std_option_defs.h
+++ b/src/lib/dhcp/std_option_defs.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above

diff --git a/src/lib/dhcp/tests/pkt6_unittest.cc b/src/lib/dhcp/tests/pkt6_unittest.cc
index 4e992b19620154146a8aedee8d96bf1b97468fd4..b598f2358aaa924422f4b758831034c127039065 100755 (executable)
--- a/src/lib/dhcp/tests/pkt6_unittest.cc
+++ b/src/lib/dhcp/tests/pkt6_unittest.cc
@@ -1294,7 +1294,7 @@ TEST_F(Pkt6Test, getMACFromRemoteIdRelayOption) {
     EXPECT_EQ(tmp.str(), mac->toText(true));
 }
 
-// This test verifies that a solicit that passed through two be parsed
+// This test verifies that a solicit that passed through two relays is parsed
 // properly. In particular the second relay (outer encapsulation) included RSOO
 // (Relay Supplied Options option). This test checks whether it was parsed
 // properly. See captureRelayed2xRSOO() description for details.

diff --git a/src/lib/dhcpsrv/cfg_option.cc b/src/lib/dhcpsrv/cfg_option.cc
index c5a3150eb3e8f2eae6d37f1c1a27f2f7d03049bc..46f0338243826e5758f8735651742870a40d753a 100644 (file)
--- a/src/lib/dhcpsrv/cfg_option.cc
+++ b/src/lib/dhcpsrv/cfg_option.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above

diff --git a/src/lib/dhcpsrv/cfg_option.h b/src/lib/dhcpsrv/cfg_option.h
index 8f2312fc94d2af9c6a84e33f145d2e73318d5a4f..da4c0d5c57357bc9aa8d620ae7f95dd9b8af4b0f 100644 (file)
--- a/src/lib/dhcpsrv/cfg_option.h
+++ b/src/lib/dhcpsrv/cfg_option.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above

diff --git a/src/lib/dhcpsrv/option_space_container.h b/src/lib/dhcpsrv/option_space_container.h
index 26199b7e34b46d9bd41ed76fc16b653ae9f43c65..68556b80ccfbfce3d65749e7d036e2afafb334e2 100644 (file)
--- a/src/lib/dhcpsrv/option_space_container.h
+++ b/src/lib/dhcpsrv/option_space_container.h
@@ -23,7 +23,7 @@ namespace dhcp {
 
 /// @brief Simple container for option spaces holding various items.
 ///
-/// This helper class is used to store items of various types in
+/// This helper class is used to store items of various types
 /// that are grouped by option space names. Each option space is
 /// mapped to a container that holds items which specifically can
 /// be OptionDefinition objects or Subnet::OptionDescriptor structures.

diff --git a/src/lib/dhcpsrv/tests/cfg_option_unittest.cc b/src/lib/dhcpsrv/tests/cfg_option_unittest.cc
index 54e7d3e83d21c675c0249bc856a9aed18ef40bec..5f1d8ab252b56ba23940307ea09521a764820831 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfg_option_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_option_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above