diff --git a/ChangeLog b/ChangeLog index 648f844d49..b28a7a541c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,7 +61,7 @@ Kea 1.9.10 (development) released on Jul 30, 2021 1921. [func] fdupont The D2 d2_srv_configured hook point used DROP status to notify - the D2 server that an error has occured and the configuration + the D2 server that an error has occurred and the configuration is rejected. The error message is passed to the D2 server through the new 'error' hook parameter. (Gitlab #1950) diff --git a/doc/sphinx/arm/admin.rst b/doc/sphinx/arm/admin.rst index aac08e02a1..d3ad5cb9a4 100644 --- a/doc/sphinx/arm/admin.rst +++ b/doc/sphinx/arm/admin.rst @@ -195,7 +195,7 @@ To check the MySQL timezone: mysql> SELECT @@global.time_zone; mysql> SELECT @@session.time_zone; -To configure the MySQL timezone for your server, please reffer to the +To configure the MySQL timezone for your server, please refer to the installed version documentation. Usually the setting is configured in the [mysqld] section in /etc/mysql/my.cnf, @@ -429,7 +429,7 @@ To check the PostgreSQL timezone: postgres=# show timezone; postgres=# SELECT * FROM pg_timezone_names WHERE name = current_setting('TIMEZONE'); -To configure the PostgreSQL timezone for your server, please reffer to the +To configure the PostgreSQL timezone for your server, please refer to the installed version documentation. Usually the setting is configured in the ``postgresql.conf`` with the varying diff --git a/doc/sphinx/arm/netconf.rst b/doc/sphinx/arm/netconf.rst index 90cd347c10..5c3fa2dcea 100644 --- a/doc/sphinx/arm/netconf.rst +++ b/doc/sphinx/arm/netconf.rst @@ -254,7 +254,7 @@ After installation the result should be similar to this: Features: ! - Means that the feature is effectively disabled because of its false if-feature(s) To reinstall a module, if the revision YANG entry was bumped, simply installing -it will update it automatically. Othweise, it must first be uninstalled: +it will update it automatically. Otherwise, it must first be uninstalled: .. code-block:: console @@ -1033,7 +1033,7 @@ happens between exporting them. Unfortunately, sysrepo v0.x does not support import/export of all YANG modules. This was added in sysrepo v1.x. You will need to do per-module backup. It's probably for the best, for isolating potential failures and preventing them from -affecintg all your modules. +affecting all your modules. With sysrepo v0.x: diff --git a/m4macros/ax_find_library.m4 b/m4macros/ax_find_library.m4 index 74039eaa6b..26953cc8fa 100644 --- a/m4macros/ax_find_library.m4 +++ b/m4macros/ax_find_library.m4 @@ -128,9 +128,9 @@ AC_DEFUN([AX_FIND_LIBRARY], [ ]) # You usually want to call this after you have called AC_MSG_RESULT so that the -# warnings don't interefere between the text displayed by AC_MSG_CHECKING +# warnings don't interfere between the text displayed by AC_MSG_CHECKING # "checking library..." and the text displayed by AC_MSG_RESULT "yes" or "no" -# that sould be on the same line. +# that should be on the same line. AC_DEFUN([AX_DISPLAY_LIBRARY_WARNINGS], [ if test -n "${LIBRARY_WARNINGS}"; then printf '%s\n' "${LIBRARY_WARNINGS}" | while read -r line; do diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in index d3830b6859..863ac8848b 100644 --- a/src/bin/admin/tests/mysql_tests.sh.in +++ b/src/bin/admin/tests/mysql_tests.sh.in @@ -1692,7 +1692,7 @@ mysql_shrink_server_tag_test() { # Now upgrade to schema 9.6. mysql_upgrade_schema_to_version 9.6 - # Unfortunatelly, this schema version already contains 64 character + # Unfortunately, this schema version already contains 64 character # long server tags. Let's extend it back, but not to 256 characters # because it is proven to cause errors in some configurations. sql=\ diff --git a/src/bin/netconf/tests/netconf_unittests.cc b/src/bin/netconf/tests/netconf_unittests.cc index cd6ee6293c..76419328c0 100644 --- a/src/bin/netconf/tests/netconf_unittests.cc +++ b/src/bin/netconf/tests/netconf_unittests.cc @@ -1081,7 +1081,7 @@ TEST_F(NetconfAgentTest, validate) { sortSubnets(request); EXPECT_EQ(prettyPrint(expected), prettyPrint(request)); - // Check that the fakse server received the second request. + // Check that the fake server received the second request. ASSERT_EQ(2, requests_.size()); request_str = requests_[1]; ASSERT_NO_THROW_LOG(request = Element::fromJSON(request_str)); diff --git a/src/bin/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc index 9c36806c7f..3de4e9d3d1 100644 --- a/src/bin/perfdhcp/command_options.cc +++ b/src/bin/perfdhcp/command_options.cc @@ -687,7 +687,7 @@ CommandOptions::initClientsNum() { "value of -R must be non-negative integer"; try { - // Declare clients_num as as 64-bit signed value to + // Declare clients_num as a 64-bit signed value to // be able to detect negative values provided // by user. We would not detect negative values // if we casted directly to unsigned value. diff --git a/src/lib/cc/data.h b/src/lib/cc/data.h index 3859b3e013..d2d0977fad 100644 --- a/src/lib/cc/data.h +++ b/src/lib/cc/data.h @@ -548,7 +548,7 @@ public: // The options are limited. I've tried templating, moving // this function from a member function to free-standing and // taking the Element template as argument. I've tried - // making it a virtual function with overriden + // making it a virtual function with overridden // implementations in ListElement and MapElement. Nothing // works. child = boost::const_pointer_cast(get(key)); @@ -686,7 +686,7 @@ public: /// @brief Sorts the elements inside the list. /// - /// The list must contain elments of the same type. + /// The list must contain elements of the same type. /// Call with the key by which you want to sort when the list contains maps. /// Nested lists are not supported. /// Call without a parameter when sorting any other type. diff --git a/src/lib/cql/cql_connection.h b/src/lib/cql/cql_connection.h index eaa8ee8d98..37fb0b296f 100644 --- a/src/lib/cql/cql_connection.h +++ b/src/lib/cql/cql_connection.h @@ -1,4 +1,4 @@ -// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2015-2017 Deutsche Telekom AG. // // Authors: Razvan Becheriu @@ -156,7 +156,7 @@ public: /// /// Opens the database using the information supplied in the parameters /// passed to the constructor. If no parameters are supplied, the default - /// values will be used. The parameters supported as as follows (default + /// values will be used. The parameters supported are as follows (default /// values specified in parentheses): /// - keyspace: name of the database to which to connect (keatest) /// - contact-points: IP addresses of the nodes to connect to (127.0.0.1) diff --git a/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in b/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in index df46d75795..696d29a060 100644 --- a/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in +++ b/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in @@ -87,7 +87,7 @@ shrink_tag_column() { sql="ALTER TABLE $table MODIFY COLUMN tag VARCHAR(64) NOT NULL" if ! mysql -N -B "${@}" -e "${sql}" then - printf 'shrink_tag_column: alter quary failed [%s]\n' "${sql}" + printf 'shrink_tag_column: alter query failed [%s]\n' "${sql}" exit 255 fi fi