From: Francis Dupont Date: Mon, 17 Jun 2019 14:46:10 +0000 (+0200) Subject: [642-update-mysql-cb-with-calls-to-set-delete-and-retrieve-servers] overriden ->... X-Git-Tag: Kea-1.6.0-beta2~170 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ff46f1842848657fb552878dfcf5f355a966c3a;p=thirdparty%2Fkea.git [642-update-mysql-cb-with-calls-to-set-delete-and-retrieve-servers] overriden -> overridden (in src, not fixed in doc --- diff --git a/src/lib/cc/tests/stamped_element_unittest.cc b/src/lib/cc/tests/stamped_element_unittest.cc index 71050ee6af..80d170ef59 100644 --- a/src/lib/cc/tests/stamped_element_unittest.cc +++ b/src/lib/cc/tests/stamped_element_unittest.cc @@ -34,7 +34,7 @@ TEST(StampedElementTest, create) { EXPECT_LT(delta.seconds(), 5); } -// Tests that default id can be overriden by a new value. +// Tests that default id can be overridden by a new value. TEST(StampedElementTest, setId) { StampedElement element; element.setId(123); diff --git a/src/lib/util/optional.h b/src/lib/util/optional.h index 5d1cc98e0d..0e0beb28ba 100644 --- a/src/lib/util/optional.h +++ b/src/lib/util/optional.h @@ -27,7 +27,7 @@ namespace util { /// is not mandatory. The value of the @c Optional may be initialized to /// "unspecified" initially. When the configuration parser finds that the /// particular parameter exists in the configuration file, the default value -/// can be overriden and the value may be marked as "specified". If the +/// can be overridden and the value may be marked as "specified". If the /// parameter is not found, the value remains "unspecified" and the appropriate /// actions may be taken, e.g. the default value may be used. ///