Browse Source

[5110] Fixed misspellings etc...

Thomas Markwalder 8 years ago
parent
commit
9108d8f9a8

+ 6 - 6
src/bin/d2/parser_context.h

@@ -69,7 +69,7 @@ public:
         ///< Used for parsing content of a DNS Server.
         PARSER_DNS_SERVER,
 
-        ///< Used for pasing a list of DNS servess.
+        ///< Used for pasing a list of DNS servers.
         PARSER_DNS_SERVERS
     } ParserType;
 
@@ -257,9 +257,9 @@ public:
     /// Entering a new syntactic context is useful in several ways.
     /// First, it allows the parser to avoid conflicts. Second, it
     /// allows the lexer to return different tokens depending on
-    /// context (e.g. if "renew-timer" string is detected, the lexer
-    /// will return STRING token if in JSON mode or RENEW_TIMER if
-    /// in DHCP6 mode. Finally, the syntactic context allows the
+    /// context (e.g. if "name" string is detected, the lexer
+    /// will return STRING token if in JSON mode or NAME if
+    /// in TSIG_KEY mode. Finally, the syntactic context allows the
     /// error message to be more descriptive if the input string
     /// does not parse properly.
     ///
@@ -271,7 +271,7 @@ public:
     /// @throw isc::Unexpected if unbalanced
     void leave();
 
-    /// @brief Get the syntactix context name
+    /// @brief Get the syntax context name
     ///
     /// @return printable name of the context.
     const std::string contextName();
@@ -280,7 +280,7 @@ public:
     /// @brief Flag determining scanner debugging.
     bool trace_scanning_;
 
-    /// @brief Flag determing parser debugging.
+    /// @brief Flag determining parser debugging.
     bool trace_parsing_;
 
     /// @brief Syntactic context stack

+ 4 - 4
src/bin/d2/tests/d2_cfg_mgr_unittests.cc

@@ -68,7 +68,7 @@ public:
 
     /// @brief Build JSON configuration string for a D2Params element
     ///
-    /// Constructs a JSON string for "params" element using replacable
+    /// Constructs a JSON string for "params" element using replaceable
     /// parameters.
     ///
     /// @param ip_address string to insert as ip_address value
@@ -170,7 +170,7 @@ public:
         // into the Element parser and check for the expected outcome.
         data::ConstElementPtr answer = cfg_mgr_->parseConfig(config_set_);
 
-        // Extract the result and error text from the anwser.
+        // Extract the result and error text from the answer.
         int rcode = 0;
         isc::data::ConstElementPtr comment;
         comment = isc::config::parseAnswer(rcode, answer);
@@ -406,7 +406,7 @@ TEST_F(D2CfgMgrTest, unsupportedTopLevelItems) {
 /// -# ip_address cannot be "0.0.0.0"
 /// -# ip_address cannot be "::"
 /// -# port cannot be 0
-/// -# dns_server_timeout cannat be 0
+/// -# dns_server_timeout cannot be 0
 /// -# ncr_protocol must be valid
 /// -# ncr_format must be valid
 TEST_F(D2CfgMgrTest, invalidEntry) {
@@ -632,7 +632,7 @@ TEST_F(D2CfgMgrTest, forwardMatch) {
     EXPECT_TRUE(cfg_mgr_->matchForward("example.com", match));
     EXPECT_EQ("example.com", match->getName());
 
-    // Verify that search is case insensisitive.
+    // Verify that search is case insensitive.
     EXPECT_TRUE(cfg_mgr_->matchForward("EXAMPLE.COM", match));
     EXPECT_EQ("example.com", match->getName());
 

+ 5 - 5
src/bin/d2/tests/d2_simple_parser_unittest.cc

@@ -21,7 +21,7 @@ namespace {
 /// @brief Checks if specified element matches the given integer default
 ///
 /// @param element defaulted element to check
-/// @param deflt SimpleDefault which supplied the default valaue
+/// @param deflt SimpleDefault which supplied the default value
 void checkIntegerValue(const ConstElementPtr& element,
                        const SimpleDefault& deflt)  {
     ASSERT_TRUE(element);
@@ -150,7 +150,7 @@ class D2SimpleParserTest : public ::testing::Test {
 public:
     /// @brief Constructor
     ///
-    /// @param parser_type specifices the parsing starting point at which
+    /// @param parser_type specificies the parsing starting point at which
     /// the JSON parser should begin. It defaults to PARSER_JSON. See @c
     /// D2ParserContext::ParserType for all possible values.
     D2SimpleParserTest(const D2ParserContext::ParserType&
@@ -170,13 +170,13 @@ public:
     /// The JSON text is submitted to the D2ParserContext for parsing. Any
     /// errors emitted here are caught and compared against the expected
     /// error or flagged as unexpected.
-    /// Next, the virtural method, setDefaults()is invoked. his method should
+    /// Next, the virtual method, setDefaults()is invoked. his method should
     /// be used by derivations to add default values to the element tree
     /// produced by the JSON parser.
     /// Lastly, it passes the element tree into the virtual method,
     /// parseElement().  This method should be used by derivations to create
     /// the appropriate element parser to parse the element tree into the
-    /// approprate D2 object(s).
+    /// appropriate D2 object(s).
     ///
     /// @param json JSON text to parse
     /// @param exp_error exact text of the error message expected or ""
@@ -626,7 +626,7 @@ TEST_F(TSIGKeyInfoParserTest, invalidEntry) {
               "}";
     PARSE_FAIL(config, "<string>:1.62: TSIG key secret cannot be blank");
 
-    // Secret must be valid for alogorithm
+    // Secret must be valid for algorithm
     config = "{"
               " \"name\": \"d2_key_one\" , "
               " \"algorithm\": \"HMAC-MD5\" , "

+ 1 - 1
src/bin/d2/tests/parser_unittest.cc

@@ -87,7 +87,7 @@ TEST(ParserTest, nestedLists) {
 }
 
 TEST(ParserTest, listsInMaps) {
-    string txt = "{ \"constellations\": { \"orion\": [ \"rigel\", \"betelguese\" ], "
+    string txt = "{ \"constellations\": { \"orion\": [ \"rigel\", \"betelgeuse\" ], "
                     "\"cygnus\": [ \"deneb\", \"albireo\"] } }";
     testParser(txt, D2ParserContext::PARSER_JSON);
 }

+ 1 - 1
src/lib/process/d_controller.h

@@ -191,7 +191,7 @@ public:
     ///
     /// It then extracts the set of configuration elements for the
     /// module-name that matches the controller's app_name_ and passes that
-    /// set into @c udpateConfig().
+    /// set into @c updateConfig().
     ///
     /// The file may contain an arbitrary number of other modules.
     ///