Commit ece21d1b authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

[master] typo and misspelling fixes

parent 90946cbc
......@@ -158,7 +158,7 @@ The symbols define the keys in the global message dictionary.
The namespace enclosing the symbols is set by the $NAMESPACE directive.
The "PREFIX_" part of the symbol name is the string defined in the $PREFIX
the argument to the directive. So "$PREFIX MSG_" would prefix the identifer
the argument to the directive. So "$PREFIX MSG_" would prefix the identifier
ABC with "MSG_" to give the symbol MSG_ABC. Similarly "$PREFIX E" would
prefix it with "E" to give the symbol EABC. If no $PREFIX is given, no
prefix appears (so the symbol in this example would be ABC).
......@@ -330,7 +330,7 @@ When logging events, make a distinction between events related to the server
and events related to DNS messages received. Caution needs to be exercised
with the latter as, if the logging is enabled in the normal course of events,
such logging could be a denial of service vector. For example, suppose that
the main authoritiative service logger were to log both zone loading and
the main authoritative service logger were to log both zone loading and
unloading as INFO and a warning message if it received an invalid packet. An
attacker could make the INFO messages unusable by flooding the server with
malformed packets.
......
......@@ -38,7 +38,7 @@ extern std::string dprefix;
* places where logging should happen. When it is removed, compiler will do
* our work of finding the places.
*
* The only thing it does is printing the dprogram prefix, message and
* The only thing it does is printing the program prefix, message and
* a newline if denabled is true.
*
* There are no tests for this function, since it is only temporary and
......
......@@ -73,7 +73,7 @@ public:
/// deletion of the underlying log4cxx data structures when the logger is
/// deleted. Setting it false for externally-declared loggers inhibits
/// their deletion; so at program exit the memory is not reclaimed during
/// program rundown, only when the process is delected. Setting it true
/// program rundown, only when the process is selected. Setting it true
/// for loggers that will be deleted in the normal running of the program
/// enables their deletion - which causes no issues as the problem only
/// manifests itself during program rundown.
......
......@@ -21,7 +21,7 @@
/// appropriate).
/// b) Reads in the local message file is one has been supplied.
///
/// These functions will be replaced once the code has bneen written to obtain
/// These functions will be replaced once the code has been written to obtain
/// the logging parameters from the configuration database.
#include <algorithm>
......
......@@ -34,7 +34,7 @@ namespace log {
///
/// \param root Name of the root logger
/// \param severity Severity at which to log
/// \param dbglevel Debug severiy (ignored if "severity" is not "DEBUG")
/// \param dbglevel Debug severity (ignored if "severity" is not "DEBUG")
/// \param file Name of the local message file.
void initLogger(const std::string& root, isc::log::Severity severity,
int dbglevel, const char* file);
......
......@@ -109,5 +109,5 @@ MessageDictionary::globalDictionary() {
} // namspace log
} // namespace log
} // namespace isc
......@@ -186,7 +186,7 @@ MessageReader::parseNamespace(const vector<string>& tokens) {
// Process message. By the time this method is called, the line has been
// stripped of leading and trailing spaces, and we believe that it is a line
// defining a message. The first token on the line is convered to uppercase
// defining a message. The first token on the line is converted to uppercase
// and becomes the message ID; the rest of the line is the message text.
void
......
......@@ -37,12 +37,12 @@ DUPMSGID duplicate message ID (%s) in compiled code
DUPLNS duplicate $NAMESPACE directive found
+ When reading a message file, more than one $NAMESPACE directive was found. In
+ this version of the code, such a condition is regarded as an error and the
+ read will be abandonded.
+ read will be abandoned.
DUPLPRFX duplicate $PREFIX directive found
+ When reading a message file, more than one $PREFIX directive was found. In
+ this version of the code, such a condition is regarded as an error and the
+ read will be abandonded.
+ read will be abandoned.
IDNOTFND could not replace message for '%s': no such message identification
+ During start-up a local message file was read. A line with the listed
......@@ -53,7 +53,7 @@ IDNOTFND could not replace message for '%s': no such message identification
+ identification has been removed.
+
+ This message may appear a number of times in the file, once for every such
+ unknown mnessage identification.
+ unknown message identification.
MSGRDERR error reading from message file %s: %s
+ The specified error was encountered reading from the named message file.
......@@ -69,9 +69,9 @@ NSEXTRARG $NAMESPACE directive has too many arguments
NSINVARG $NAMESPACE directive has an invalid argument ('%s')
+ The $NAMESPACE argument should be a valid C++ namespace. The reader does a
+ cursory check on its validity, checking that the characters in the namspace
+ cursory check on its validity, checking that the characters in the namespace
+ are correct. The error is generated when the reader finds an invalid
+ character. (Valid are alphanumeric characters, underscroes and colons.)
+ character. (Valid are alphanumeric characters, underscores and colons.)
NOMSGTXT a line containing a message ID ('%s') and nothing else was found
+ Message definitions comprise lines starting with a message identification (a
......
......@@ -79,7 +79,7 @@ std::vector<std::string> tokens(const std::string& text,
///
/// Used in uppercase() to pass as an argument to std::transform(). The
/// function std::toupper() can't be used as it takes an "int" as its argument;
/// this confuses the template expansion mechanism because defererencing a
/// this confuses the template expansion mechanism because dereferencing a
/// string::iterator returns a char.
///
/// \param chr Character to be upper-cased.
......@@ -104,7 +104,7 @@ inline void uppercase(std::string& text) {
///
/// Used in lowercase() to pass as an argument to std::transform(). The
/// function std::tolower() can't be used as it takes an "int" as its argument;
/// this confuses the template expansion mechanism because defererencing a
/// this confuses the template expansion mechanism because dereferencing a
/// string::iterator returns a char.
///
/// \param chr Character to be lower-cased.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment