[3705] Fix some typos found during the review.

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

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

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)

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)

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

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.

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

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

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.

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