[5477] Corrected some typos and updated copyrights as a result of review.

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index 8a001748cda5e209fb7e189d3ea8c637afd11d60..db76346b030ae3a1edc737b4f308c733eb5c4bd0 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -816,7 +816,7 @@ ControlledDhcpv4Srv::dbReconnect() {
         // Set network state to service enabled
         network_state_.enableService();
 
-        // Toss the reconnct control, we're done with it
+        // Toss the reconnect control, we're done with it
         db_reconnect_ctl_.reset();
     } else {
         if (!db_reconnect_ctl_->checkRetries()) {

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 708951cdaeaf2df31abcb5afa161f49093d0f37c..514d210f05d1e9c0fd52d373d5f412f570c738e7 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2018 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
@@ -140,7 +140,7 @@ change is committed by the administrator.
 A debug message indicating that the DHCPv4 server has received an
 updated configuration from the Kea configuration system.
 
-% DHCP4_DB_RECONNECT_ATTEMPT_SCHEDULE Scheduling attempt %1 of %2 in %3 seconds
+% DHCP4_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 seconds
 An informational message indicating that the server is scheduling the next
 attempt to reconnect to its lease and/or host databases.  This occurs when the
 server has lost databse connectivity and is attempting to reconnect 
@@ -158,11 +158,11 @@ databases if connectivy is lost, and the server will exit. This error
 should be reported. 
 
 % DHCP4_DB_RECONNECT_DISABLED database reconnect is disabled: max-reconnect-tries %1, reconnect-wait-time %1
-This is an informational message indicating that connetivity to either the
+This is an informational message indicating that connectivity to either the
 lease or host database or both and that automatic reconnect is not enabled.
 
-% DHCP4_DB_RECONNECT_RETRIES_EXHAUSTED - Maximum number of Database reconnect attempts: %1, has been exhausted without success, server is shutting down!
-This error indicates that the server is shutting after failing to reconnect to
+% DHCP4_DB_RECONNECT_RETRIES_EXHAUSTED maximum number of database reconnect attempts: %1, has been exhausted without success, server is shutting down!
+This error indicates that the server is shutting down after failing to reconnect to
 the lease and/or host database(s) after making the maximum configured number 
 of reconnect attempts.  Loss of connectivity is typically a network or database
 server issue.

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 66d4bc0c85874c5c3a24ef8c7ff101d081610fc4..84c810ba75540093e01f53edb6154ba8ea75f842 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2018 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
@@ -100,7 +100,7 @@ This informational message is printed every time the IPv6 DHCP server
 is started.  It indicates what database backend type is being to store
 lease and other information.
 
-% DHCP6_DB_RECONNECT_ATTEMPT_SCHEDULE Scheduling attempt %1 of %2 in %3 seconds
+% DHCP6_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 seconds
 An informational message indicating that the server is scheduling the next
 attempt to reconnect to its lease and/or host databases.  This occurs when the
 server has lost databse connectivity and is attempting to reconnect 
@@ -118,11 +118,11 @@ databases if connectivy is lost, and the server will exit. This error
 should be reported. 
 
 % DHCP6_DB_RECONNECT_DISABLED database reconnect is disabled: max-reconnect-tries %1, reconnect-wait-time %1
-This is an informational message indicating that connetivity to either the
+This is an informational message indicating that connectivity to either the
 lease or host database or both and that automatic reconnect is not enabled.
 
-% DHCP6_DB_RECONNECT_RETRIES_EXHAUSTED - Maximum number of Database reconnect attempts: %1, has been exhausted without success, server is shutting down!
-This error indicates that the server is shutting after failing to reconnect to
+% DHCP6_DB_RECONNECT_RETRIES_EXHAUSTED maximum number of database reconnect attempts: %1, has been exhausted without success, server is shutting down!
+This error indicates that the server is shutting down after failing to reconnect to
 the lease and/or host database(s) after making the maximum configured number 
 of reconnect attempts.  Loss of connectivity is typically a network or database
 server issue.

diff --git a/src/lib/dhcpsrv/database_connection.h b/src/lib/dhcpsrv/database_connection.h
index 205dff8590f4953a8fb7a063d6e081f4bae2a529..d4d9e484119e65e3e667370bfbf13c2197693460 100644 (file)
--- a/src/lib/dhcpsrv/database_connection.h
+++ b/src/lib/dhcpsrv/database_connection.h
@@ -68,7 +68,7 @@ public:
 /// @brief Warehouses DB reconnect control values
 ///
 /// When a DatabaseConnection loses connectivity to its backend, it
-/// creates an of this class based on its configuration parameters and
+/// creates an instance of this class based on its configuration parameters and
 /// passes the instance into connection's DB lost callback.  This allows
 /// the layer(s) above the connection to know how to proceed.
 ///
@@ -200,7 +200,7 @@ public:
 
     /// @brief Invokes the connection's lost connectivity callback
     ///
-    /// This function is may be called by derivations when the connectivity
+    /// This function may be called by derivations when the connectivity
     /// to their data server is lost.  If connectivity callback was specified,
     /// this function will instantiate a ReconnectCtl and pass it to the
     /// callback.

diff --git a/src/lib/dhcpsrv/lease_mgr_factory.cc b/src/lib/dhcpsrv/lease_mgr_factory.cc
index 2d467242e4161a32381b85686d418cf5d545d839..54ee05771590c0ee72f29f131c9d1e43ccf71f36 100644 (file)
--- a/src/lib/dhcpsrv/lease_mgr_factory.cc
+++ b/src/lib/dhcpsrv/lease_mgr_factory.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2018 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

diff --git a/src/lib/dhcpsrv/lease_mgr_factory.h b/src/lib/dhcpsrv/lease_mgr_factory.h
index e5989516689637e5c555cda017bac1e167c586f2..54c57c3d9c15280e13a0d7a5e4164059f8ce683e 100644 (file)
--- a/src/lib/dhcpsrv/lease_mgr_factory.h
+++ b/src/lib/dhcpsrv/lease_mgr_factory.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2018 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

diff --git a/src/lib/dhcpsrv/parsers/dbaccess_parser.cc b/src/lib/dhcpsrv/parsers/dbaccess_parser.cc
index f8882200a2c2adc23399ef5f25e94ca8abd98a5b..cb4b0f3b75ae4114d242ec7f7082454a32b5c640 100644 (file)
--- a/src/lib/dhcpsrv/parsers/dbaccess_parser.cc
+++ b/src/lib/dhcpsrv/parsers/dbaccess_parser.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2018 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

diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.cc b/src/lib/dhcpsrv/pgsql_host_data_source.cc
index 5a60d7032a1c27b51828f64cecbcf5badad69f87..bd1e330da7290c908fb690f089b5a4ce7bc18e15 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_host_data_source.cc
+++ b/src/lib/dhcpsrv/pgsql_host_data_source.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2018 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

diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.h b/src/lib/dhcpsrv/pgsql_host_data_source.h
index 0a4882cbb6757d70f9fd36d9da81684b820c2e7d..91ffd7643e001fc42c451ba0e0dcb105d8aa4230 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_host_data_source.h
+++ b/src/lib/dhcpsrv/pgsql_host_data_source.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2018 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

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h
index 4eae0f08b4c3b2a5a66c6d96f241570b39c04099..fb891ae349cc75af3e63ff19e0d526822a56968f 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.h
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h
@@ -69,7 +69,7 @@ public:
 
     /// @brief Adds an IPv4 lease
     ///
-    /// @param lease lease to be added ///
+    /// @param lease lease to be added
     /// @result true if the lease was added, false if not (because a lease
     ///         with the same address was already there).
     ///