From: Stephen Morris <stephen@isc.org>
Date: Thu, 7 Jul 2011 15:47:57 +0000 (+0100)
Subject: Merge branch 'master' into trac1024
X-Git-Tag: perftcpdns_before_epoll~263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5e49faa3340628865ea28a60d3dc36d3e08511d;p=thirdparty%2Fkea.git

Merge branch 'master' into trac1024
---

b5e49faa3340628865ea28a60d3dc36d3e08511d
diff --cc src/lib/log/logger_support.h
index 7dc0c28e76,cf83abcb32..1027e089cc
--- a/src/lib/log/logger_support.h
+++ b/src/lib/log/logger_support.h
@@@ -76,15 -76,15 +76,15 @@@ void initLogger(const std::string& root
  /// "DEBUG", "INFO", "WARN", "ERROR", "FATAL" or "NONE". (Must be upper case
  /// and must not contain leading or trailing spaces.)  If not specified (or if
  /// specified but incorrect), the default passed as argument to this function
 -/// (currently INFO) will be used.
 +/// (currently DEBUG) will be used.
  ///
- /// B10_LOGGER_DBGLEVEL
+ /// - B10_LOGGER_DBGLEVEL\n
  /// Ignored if the level is not DEBUG, this should be a number between 0 and
  /// 99 indicating the logging severity.  The default is 0.  If outside these
  /// limits or if not a number, The value passed to this function (default
 -/// of 0) is used.
 +/// of MAX_DEBUG_LEVEL) is used.
  ///
- /// B10_LOGGER_LOCALMSG
+ /// - B10_LOGGER_LOCALMSG\n
  /// If defined, the path specification of a file that contains message
  /// definitions replacing ones in the default dictionary.
  ///