BIND 10 master, updated. d8b8e46b853f13d3e9ef2857f0fce424f1876ef5 [master]Merge branch 'master' of ssh://git.bind10.isc.org//var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  d8b8e46b853f13d3e9ef2857f0fce424f1876ef5 (commit)
       via  7116ee3c764180aad581e52b36dc67124b7d72f0 (commit)
       via  291d0cbfdc964c1d60542edbe9f442cc383657cd (commit)
      from  283053c1a3dd96ff3811f25361f900dd7c9d97ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d8b8e46b853f13d3e9ef2857f0fce424f1876ef5
Merge: 7116ee3c764180aad581e52b36dc67124b7d72f0 283053c1a3dd96ff3811f25361f900dd7c9d97ef
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu Apr 12 17:15:55 2012 -0500

    [master]Merge branch 'master' of ssh://git.bind10.isc.org//var/bind10/git/bind10

commit 7116ee3c764180aad581e52b36dc67124b7d72f0
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu Apr 12 17:15:09 2012 -0500

    [master] fix typo in a pydoc string comment
    
    trivial / no review

commit 291d0cbfdc964c1d60542edbe9f442cc383657cd
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu Apr 12 16:49:14 2012 -0500

    [master] fix usage synopsis
    
    trivial, not reviewed

-----------------------------------------------------------------------

Summary of changes:
 src/bin/host/host.cc                |    2 +-
 src/lib/python/isc/config/cfgmgr.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/host/host.cc b/src/bin/host/host.cc
index f1bb415..a5c6522 100644
--- a/src/bin/host/host.cc
+++ b/src/bin/host/host.cc
@@ -232,7 +232,7 @@ main(int argc, char* argv[]) {
     argv += optind;
 
     if (argc < 1) {
-        cout << "Usage: host [-adprv] [-c class] [-t type] hostname [server]\n";
+        cout << "Usage: host [-adrv] [-c class] [-p port] [-t type] hostname [server]\n";
         exit(1);
     }
 
diff --git a/src/lib/python/isc/config/cfgmgr.py b/src/lib/python/isc/config/cfgmgr.py
index 8934de8..9f9ce68 100644
--- a/src/lib/python/isc/config/cfgmgr.py
+++ b/src/lib/python/isc/config/cfgmgr.py
@@ -189,7 +189,7 @@ class ConfigManager:
         """Initialize the configuration manager. The data_path string
            is the path to the directory where the configuration is
            stored (in <data_path>/<database_filename> or in
-           <database_filename>, if it is absolute). The dabase_filename
+           <database_filename>, if it is absolute). The database_filename
            is the config file to load. Session is an optional
            cc-channel session. If this is not given, a new one is
            created. If clear_config is True, the configuration file is