From: Andrei Pavel Date: Tue, 8 Jun 2021 14:49:23 +0000 (+0300) Subject: [#1917] spelling corrections X-Git-Tag: Kea-1.9.9~106 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fac6fa357cbbb3fc82637c9b3158d3a758f2c5b0;p=thirdparty%2Fkea.git [#1917] spelling corrections --- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0178cc671e..0dfacdc7be 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,7 +57,7 @@ guidelines above as close as possible. They are `.clang-format` and want to format code automatically, you will need to have at least one of these tools installed. Since by default, these tools look for the closest style file located in one of the parent directories or, otherwise, in a default location, -there are a a couple of helpful scripts i.e. `./tools/clang-format.sh` and +there are a couple of helpful scripts i.e. `./tools/clang-format.sh` and `./tools/uncrustify.sh` to assure you that the Kea-owned file is used. They accept any number of customized parameters that would be passed to the underlying tool followed by any number of files and/or directories. Passing diff --git a/doc/examples/kea4/ha-load-balancing-primary.json b/doc/examples/kea4/ha-load-balancing-primary.json index 88435a22f2..7784513240 100644 --- a/doc/examples/kea4/ha-load-balancing-primary.json +++ b/doc/examples/kea4/ha-load-balancing-primary.json @@ -33,7 +33,7 @@ // There are dedicated examples for each backend. See Section 7.2.2 "Lease // Storage" for details. "lease-database": { - // Memfile is the simplest and easiest backend to use. It's a in-memory + // Memfile is the simplest and easiest backend to use. It's an in-memory "type": "memfile" }, diff --git a/doc/examples/kea4/vivso.json b/doc/examples/kea4/vivso.json index 7f091b6f82..12adc95b25 100644 --- a/doc/examples/kea4/vivso.json +++ b/doc/examples/kea4/vivso.json @@ -14,7 +14,7 @@ "code": 2, "name": "vlanid", // In case of suboption of option 125 space has to start with prefix "vendor-" -// in this case it's "vendor-" + vendor id from option 60 send by client +// in this case it's "vendor-" + vendor id from option 60 sent by client // 339 is Siemens Industry Inc. "space": "vendor-339", "type": "uint32" diff --git a/doc/sphinx/arm/hooks-ha.rst b/doc/sphinx/arm/hooks-ha.rst index 3732f70f9d..04c839e54b 100644 --- a/doc/sphinx/arm/hooks-ha.rst +++ b/doc/sphinx/arm/hooks-ha.rst @@ -1507,7 +1507,7 @@ HA+MT operation: single-threaded HTTP client processing. - ``http-dedicated-listener`` - enables or disables the creation of a - dedicated, internal HTTP listener through which the server receive HA + dedicated, internal HTTP listener through which the server receives HA messages from its peers. The internal listener replaces the role of kea-ctrl-agent traffic, allowing peers to send their HA commands directly to each other. The listener will listen on the peer's ``url``. When diff --git a/doc/sphinx/arm/hooks-run-script.rst b/doc/sphinx/arm/hooks-run-script.rst index 70ad3d82c5..2d748cc927 100644 --- a/doc/sphinx/arm/hooks-run-script.rst +++ b/doc/sphinx/arm/hooks-run-script.rst @@ -293,7 +293,7 @@ leases4_committed DELETED_LEASES4_SIZE If LEASES4_SIZE or DELETED_LEASES4_SIZE are non zero, then each lease -will have it's own unique identifier as shown below. First index starts +will have its own unique identifier as shown below. First index starts at 0. :: @@ -516,7 +516,7 @@ leases6_committed DELETED_LEASES6_SIZE If LEASES6_SIZE or DELETED_LEASES6_SIZE are non zero, then each lease -will have it's own unique identifier as shown below. First index starts +will have its own unique identifier as shown below. First index starts at 0. :: diff --git a/doc/sphinx/man/perfdhcp.8.rst b/doc/sphinx/man/perfdhcp.8.rst index 3b55b6a4af..dc3d69dab0 100644 --- a/doc/sphinx/man/perfdhcp.8.rst +++ b/doc/sphinx/man/perfdhcp.8.rst @@ -118,7 +118,7 @@ randomized, and so on. Perfdhcp can now simulate traffic from multiple subnets by enabling option -J and passing path to file that contains v4 or v6 addresses that will be -used as relayin generated messages. That enable testing of vast numbers +used as relay in generated messages. That enable testing of vast numbers of Kea shared networks. While testing Kea v4 it should be started with KEA_TEST_SEND_RESPONSES_TO_SOURCE environment variable to force Kea to send generated messages to source address of incoming packet. diff --git a/src/bin/admin/tests/dhcpdb_create_1.0.cql b/src/bin/admin/tests/dhcpdb_create_1.0.cql index e270b9ab12..abd786b452 100644 --- a/src/bin/admin/tests/dhcpdb_create_1.0.cql +++ b/src/bin/admin/tests/dhcpdb_create_1.0.cql @@ -39,7 +39,7 @@ -- is initialized to 1.0, then upgraded to 2.0 etc. This may be somewhat -- sub-optimal, but it ensues consistency with upgrade scripts. (It is much -- easier to maintain init and upgrade scripts if they look the same). --- Since initialization is done only once, it's performance is not an issue. +-- Since initialization is done only once, its performance is not an issue. -- This line starts database initialization to 1.0. diff --git a/src/bin/d2/d2_cfg_mgr.cc b/src/bin/d2/d2_cfg_mgr.cc index 7d23ecefbf..0e70b1b2ed 100644 --- a/src/bin/d2/d2_cfg_mgr.cc +++ b/src/bin/d2/d2_cfg_mgr.cc @@ -103,7 +103,7 @@ D2CfgContext::toElement() const { if (!isNull(control_socket_)) { d2->set("control-socket", UserContext::toElement(control_socket_)); } - // Set hooks-librairies + // Set hooks-libraries d2->set("hooks-libraries", hooks_config_.toElement()); // Set DhcpDdns ElementPtr result = Element::createMap(); diff --git a/src/bin/d2/d2_config.h b/src/bin/d2/d2_config.h index d15a39ec3f..6820bc5757 100644 --- a/src/bin/d2/d2_config.h +++ b/src/bin/d2/d2_config.h @@ -522,7 +522,7 @@ typedef boost::shared_ptr DnsServerInfoStoragePtr; /// @brief Represents a DNS domain that is may be updated dynamically. /// This class specifies a DNS domain and the list of DNS servers that support -/// it. It's primary use is to map a domain to the DNS server(s) responsible +/// it. Its primary use is to map a domain to the DNS server(s) responsible /// for it. /// @todo Currently the name entry for a domain is just an std::string. It /// may be worthwhile to change this to a dns::Name for purposes of better diff --git a/src/bin/d2/d2_messages.mes b/src/bin/d2/d2_messages.mes index a606584700..4b3d47dd0a 100644 --- a/src/bin/d2/d2_messages.mes +++ b/src/bin/d2/d2_messages.mes @@ -181,7 +181,7 @@ version of Kea will implement authentication to guard against such attacks. % DHCP_DDNS_NO_ELIGIBLE_JOBS although there are queued requests, there are pending transactions for each, Queue count: %1 Transaction count: %2 This is a debug message issued when all of the queued requests represent clients -for which there is a an update already in progress. This may occur under +for which there is an update already in progress. This may occur under normal operations but should be temporary situation. % DHCP_DDNS_NO_FWD_MATCH_ERROR Request ID %1: the configured list of forward DDNS domains does not contain a match for: %2 The request has been discarded. diff --git a/src/bin/dhcp4/dhcp4_hooks.dox b/src/bin/dhcp4/dhcp4_hooks.dox index fb7a7f6050..940bcbdde4 100644 --- a/src/bin/dhcp4/dhcp4_hooks.dox +++ b/src/bin/dhcp4/dhcp4_hooks.dox @@ -391,7 +391,7 @@ to the end of this list. is the parsed JSON structure containing the response generated by the command processing. - - Next step status: Not applicable, it's value will be ignored. + - Next step status: Not applicable, its value will be ignored. @section dhcpv4HooksOptionsAccess Accessing DHCPv4 Options within a Packet When the server constructs a response message to a client it includes diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index bbbb976361..376f540ab5 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -7328,7 +7328,7 @@ TEST_F(Dhcp4ParserTest, calculateTeeTimesInheritence) { CfgSubnets4Ptr subnets4 = CfgMgr::instance().getStagingCfg()->getCfgSubnets4(); - // Subnet 100 should use it's own explicit values. + // Subnet 100 should use its own explicit values. ConstSubnet4Ptr subnet4 = subnets4->getBySubnetId(100); ASSERT_TRUE(subnet4); EXPECT_FALSE(subnet4->getCalculateTeeTimes()); diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc index 3a4353c6da..b3de3c3e16 100644 --- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc +++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc @@ -750,7 +750,7 @@ Dhcpv4SrvTest::pretendReceivingPkt(NakedDhcpv4Srv& srv, const std::string& confi // Let's just use one of the actual captured packets that we have. Pkt4Ptr pkt = PktCaptures::captureRelayedDiscover(); - // We just need to tweak it a it, to pretend that it's type is as desired. + // We just need to tweak it a it, to pretend that its type is as desired. // Note that when receiving a packet, its on-wire form is stored in data_ // field. Most methods (including setType()) operates on option objects // (objects stored in options_ after unpack() is called). Finally, outgoing diff --git a/src/bin/dhcp4/tests/fqdn_unittest.cc b/src/bin/dhcp4/tests/fqdn_unittest.cc index cb9a3e9a43..f7c25420cd 100644 --- a/src/bin/dhcp4/tests/fqdn_unittest.cc +++ b/src/bin/dhcp4/tests/fqdn_unittest.cc @@ -733,7 +733,7 @@ public: ///@brief Verify that NameChangeRequest holds valid values. /// - /// Pulls the NCR from the top of the send queue and checks it's content + /// Pulls the NCR from the top of the send queue and checks its content /// against a number of expected parameters. /// /// @param type - expected NCR change type, CHG_ADD or CHG_REMOVE diff --git a/src/bin/dhcp4/tests/hooks_unittest.cc b/src/bin/dhcp4/tests/hooks_unittest.cc index f96653339a..3348283ecc 100644 --- a/src/bin/dhcp4/tests/hooks_unittest.cc +++ b/src/bin/dhcp4/tests/hooks_unittest.cc @@ -2828,7 +2828,7 @@ TEST_F(LoadUnloadDhcpv4SrvTest, unloadLibraries) { ASSERT_TRUE(HooksManager::loadLibraries(libraries)); // Verify that they load functions created the LOAD_MARKER_FILE - // and that it's contents are correct: "12" - the first library + // and that its contents are correct: "12" - the first library // appends "1" to the file, the second appends "2"). Also // check that the unload marker file does not yet exist. EXPECT_TRUE(checkMarkerFile(LOAD_MARKER_FILE, "12")); diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc index 55495ef121..86d9d099b5 100644 --- a/src/bin/dhcp4/tests/kea_controller_unittest.cc +++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc @@ -461,7 +461,7 @@ TEST_F(JSONFileBackendTest, jsonFile) { EXPECT_EQ("192.0.4.0", (*subnet)->get().first.toText()); EXPECT_EQ(24, (*subnet)->get().second); - // ... and it's only pool. + // ... and its only pool. const PoolCollection& pools3 = (*subnet)->getPools(Lease::TYPE_V4); EXPECT_EQ("192.0.4.101", pools3.at(0)->getFirstAddress().toText()); EXPECT_EQ("192.0.4.150", pools3.at(0)->getLastAddress().toText()); diff --git a/src/bin/dhcp6/dhcp6_hooks.dox b/src/bin/dhcp6/dhcp6_hooks.dox index 58c04309b4..d035404311 100644 --- a/src/bin/dhcp6/dhcp6_hooks.dox +++ b/src/bin/dhcp6/dhcp6_hooks.dox @@ -443,7 +443,7 @@ to the end of this list. is the parsed JSON structure containing the response generated by the command processing. - - Next step status: Not applicable, it's value will be ignored. + - Next step status: Not applicable, its value will be ignored. @section dhcpv6HooksOptionsAccess Accessing DHCPv6 Options within a Packet When the server constructs a response message to a client it includes diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc index d4667e7a7a..c0865b73b8 100644 --- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc +++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc @@ -3090,7 +3090,7 @@ TEST_F(Dhcpv6SrvTest, receiveParseFailedStat) { // Let's get a simple SOLICIT... Pkt6Ptr pkt = PktCaptures::captureSimpleSolicit(); - // And pretend it's packet is only 3 bytes long. + // And pretend its packet is only 3 bytes long. pkt->data_.resize(3); // Check that the tested statistics is initially set to 0 diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc index 8d64e3a6c3..de3cdce6a8 100644 --- a/src/bin/dhcp6/tests/hooks_unittest.cc +++ b/src/bin/dhcp6/tests/hooks_unittest.cc @@ -5095,7 +5095,7 @@ TEST_F(LoadUnloadDhcpv6SrvTest, unloadLibraries) { ASSERT_TRUE(HooksManager::loadLibraries(libraries)); // Verify that they load functions created the LOAD_MARKER_FILE - // and that it's contents are correct: "12" - the first library + // and that its contents are correct: "12" - the first library // appends "1" to the file, the second appends "2"). Also // check that the unload marker file does not yet exist. EXPECT_TRUE(checkMarkerFile(LOAD_MARKER_FILE, "12")); diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre index efb57f6748..fc4a8067c3 100644 --- a/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre @@ -41,7 +41,7 @@ // "dhcp-socket-type": "udp" }, - // Kea support control channel, which is a way to receive management + // Kea supports control channel, which is a way to receive management // commands while the server is running. This is a Unix domain socket that // receives commands formatted in JSON, e.g. config-set (which sets new // configuration), config-reload (which tells Kea to reload its @@ -59,7 +59,7 @@ // There are dedicated examples for each backend. See Section 7.2.2 "Lease // Storage" for details. "lease-database": { - // Memfile is the simplest and easiest backend to use. It's a in-memory + // Memfile is the simplest and easiest backend to use. It's an in-memory // C++ database that stores its state in CSV file. "type": "memfile", "lfc-interval": 3600 diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre index 83dd708821..e036b50159 100644 --- a/src/bin/keactrl/kea-dhcp6.conf.pre +++ b/src/bin/keactrl/kea-dhcp6.conf.pre @@ -35,7 +35,7 @@ "interfaces": [ ] }, - // Kea support control channel, which is a way to receive management commands + // Kea supports control channel, which is a way to receive management commands // while the server is running. This is a Unix domain socket that receives // commands formatted in JSON, e.g. config-set (which sets new configuration), // config-reload (which tells Kea to reload its configuration from file), @@ -53,6 +53,8 @@ // There are dedicated examples for each backend. See Section 8.2.2 "Lease // Storage" for details. "lease-database": { + // Memfile is the simplest and easiest backend to use. It's an in-memory + // C++ database that stores its state in CSV file. "type": "memfile", "lfc-interval": 3600 }, diff --git a/src/bin/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc index cb2f79f9f0..bd6296fa47 100644 --- a/src/bin/perfdhcp/command_options.cc +++ b/src/bin/perfdhcp/command_options.cc @@ -870,7 +870,7 @@ void CommandOptions::loadRelayAddr() { while (std::getline(infile, line)) { cnt++; stringstream tmp; - tmp << "invalid address or wrong address version in line: "<< cnt; + tmp << "invalid address or wrong address version in line: " << cnt; check(validateIP(line), tmp.str()); } check(cnt == 0, "file with addresses is empty!"); diff --git a/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc b/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc index 53f2c82d0a..51ee2c2b52 100644 --- a/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc +++ b/src/hooks/dhcp/high_availability/tests/ha_mt_unittest.cc @@ -244,7 +244,7 @@ TEST_F(HAMtServiceTest, multiThreadingBasics) { EXPECT_TRUE(service->listener_->getThreadIOService()->stopped()); } - // Exiting critical section should resume both cllent + // Exiting critical section should resume both client // and listener. // Client should be running. diff --git a/src/lib/asiolink/botan_boost_tls.cc b/src/lib/asiolink/botan_boost_tls.cc index 7d698cc73b..12db353b04 100644 --- a/src/lib/asiolink/botan_boost_tls.cc +++ b/src/lib/asiolink/botan_boost_tls.cc @@ -131,7 +131,7 @@ public: // Pointer to the CA certificate store. std::unique_ptr store_; - // Use the CA ceertificate store flag. + // Use the CA certificate store flag. bool use_stores_; // The certificate chain. diff --git a/src/lib/asiolink/tests/tls_unittest.cc b/src/lib/asiolink/tests/tls_unittest.cc index 8533f5ab37..e6ffa8ab8c 100644 --- a/src/lib/asiolink/tests/tls_unittest.cc +++ b/src/lib/asiolink/tests/tls_unittest.cc @@ -1369,7 +1369,7 @@ TEST(TLSTest, selfSigned) { // the other peer timeout? // Test what happens when handshake is forgotten. -TEST(TLSTest, noHandshakeCloseonError) { +TEST(TLSTest, noHandshakeCloseOnError) { IOService service; // Server part. diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc index bbbba6c2cf..56ee062bfd 100644 --- a/src/lib/dhcpsrv/mysql_host_data_source.cc +++ b/src/lib/dhcpsrv/mysql_host_data_source.cc @@ -83,7 +83,7 @@ const uint8_t MAX_IDENTIFIER_TYPE = static_cast(Host::LAST_IDENTIFIER_T class MySqlHostExchange { private: - /// @brief Number of columns returned for SELECT queries send by this class. + /// @brief Number of columns returned for SELECT queries sent by this class. static const size_t HOST_COLUMNS = 14; public: diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.cc b/src/lib/dhcpsrv/pgsql_host_data_source.cc index 1f5164494d..9a8a217e1f 100644 --- a/src/lib/dhcpsrv/pgsql_host_data_source.cc +++ b/src/lib/dhcpsrv/pgsql_host_data_source.cc @@ -105,7 +105,7 @@ private: static const int DHCP4_SERVER_HOSTNAME_COL = 11; static const int DHCP4_BOOT_FILE_NAME_COL = 12; static const int AUTH_KEY_COL = 13; - /// @brief Number of columns returned for SELECT queries send by this class. + /// @brief Number of columns returned for SELECT queries sent by this class. static const size_t HOST_COLUMNS = 14; public: diff --git a/src/lib/dhcpsrv/tests/alloc_engine_utils.h b/src/lib/dhcpsrv/tests/alloc_engine_utils.h index e6e1accd00..2e4ffbef10 100644 --- a/src/lib/dhcpsrv/tests/alloc_engine_utils.h +++ b/src/lib/dhcpsrv/tests/alloc_engine_utils.h @@ -416,7 +416,7 @@ public: /// can succeed. The invalid hint should be ignored completely. /// /// @param type Lease type - /// @param hint hint (as send by a client) + /// @param hint hint (as sent by a client) /// @param expected_pd_len (used in validation) void allocBogusHint6(Lease::Type type, asiolink::IOAddress hint, uint8_t expected_pd_len); diff --git a/src/lib/http/http_thread_pool.h b/src/lib/http/http_thread_pool.h index 5a04a3d8d7..dddb43be33 100644 --- a/src/lib/http/http_thread_pool.h +++ b/src/lib/http/http_thread_pool.h @@ -33,7 +33,7 @@ public: /// @brief Constructor /// /// @param io_service IOService that will drive the pool's IO. If empty, it - /// create it's own instance. + /// create its own instance. /// @param pool_size Maximum number of threads in the pool. Currently the /// number of threads is fixed at this value. /// @param defer_start If true, creation of the threads is deferred until diff --git a/src/lib/util/state_model.h b/src/lib/util/state_model.h index da297da95d..b915149ca9 100644 --- a/src/lib/util/state_model.h +++ b/src/lib/util/state_model.h @@ -383,7 +383,7 @@ protected: /// This method is used to construct the set of valid events. Each class /// within a StateModel derivation hierarchy uses this method to add any /// events it defines to the set. Each derivation's implementation must - /// also call it's superclass's implementation. This allows each class + /// also call its superclass's implementation. This allows each class /// within the hierarchy to make contributions to the set of defined /// events. Implementations use the method, defineEvent(), to add event /// definitions. An example of the derivation's implementation follows: @@ -434,7 +434,7 @@ protected: /// event set is determined to be invalid this method should throw a /// StateModelError. As with the defineEvents method, each class within /// a StateModel derivation hierarchy must supply an implementation - /// which calls it's superclass's implementation as well as verifying any + /// which calls its superclass's implementation as well as verifying any /// events added by the derivation. Validating an event is accomplished /// by simply attempting to fetch an event by its value from the event set. /// An example of the derivation's implementation follows: @@ -460,7 +460,7 @@ protected: /// This method is used to construct the set of valid states. Each class /// within a StateModel derivation hierarchy uses this method to add any /// states it defines to the set. Each derivation's implementation must - /// also call it's superclass's implementation. This allows each class + /// also call its superclass's implementation. This allows each class /// within the hierarchy to make contributions to the set of defined /// states. Implementations use the method, defineState(), to add state /// definitions. An example of the derivation's implementation follows: @@ -515,7 +515,7 @@ protected: /// state set is determined to be invalid this method should throw a /// StateModelError. As with the defineStates method, each class within /// a StateModel derivation hierarchy must supply an implementation - /// which calls it's superclass's implementation as well as verifying any + /// which calls its superclass's implementation as well as verifying any /// states added by the derivation. Validating an state is accomplished /// by simply attempting to fetch the state by its value from the state set. /// An example of the derivation's implementation follows: diff --git a/src/lib/util/strutil.h b/src/lib/util/strutil.h index a638244b0c..bdb496fdb0 100644 --- a/src/lib/util/strutil.h +++ b/src/lib/util/strutil.h @@ -249,7 +249,7 @@ quotedStringToBinary(const std::string& quoted_string); /// an exception is thrown. /// /// \param hex_string Input string. -/// \param sep character to use a a separator. +/// \param sep character to use as a separator. /// \param binary Vector receiving converted string into binary. /// \throw isc::BadValue if the format of the input string is invalid. void