BIND 10 master, updated. 666d6e49e1cd46fd293b3fdce239e34588666ed6 [master] replace DENY with DROP in developer documentation

[BIND 10 source code commits]

The branch, master has been updated
       via  666d6e49e1cd46fd293b3fdce239e34588666ed6 (commit)
       via  8b21629d234228ff9fbb7a3c5ad5ebeca4b981c1 (commit)
      from  ae4e7f10136bd182db6d4801ace410e72574abf2 (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 666d6e49e1cd46fd293b3fdce239e34588666ed6
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu Jun 30 09:15:41 2011 -0500

    [master] replace DENY with DROP in developer documentation

commit 8b21629d234228ff9fbb7a3c5ad5ebeca4b981c1
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu Jun 30 09:13:30 2011 -0500

    [master] replace wrong references with real content
    
    I could have fixed the cross-reference spelling, but instead
    I just replaced it with real explanation of the format.
    
    This is very minor and mentioned on jabber.

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

Summary of changes:
 src/bin/resolver/resolver_messages.mes |   12 ++++++++----
 src/lib/acl/loader.h                   |    2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/resolver_messages.mes b/src/bin/resolver/resolver_messages.mes
index 6c5be64..05b9a8b 100644
--- a/src/bin/resolver/resolver_messages.mes
+++ b/src/bin/resolver/resolver_messages.mes
@@ -210,10 +210,14 @@ query in the form of <Source IP address>#<source port>.
 % RESOLVER_QUERY_REJECTED   query rejected: '%1/%2/%3' from %4
 An informational message that indicates an incoming query is rejected
 in terms of the query ACL.  This results in a response with an RCODE of
-REFUSED.  See QUERYACCEPTED for the information given in the message.
+REFUSED. The log message shows the query in the form of <query
+name>/<query type>/<query class>, and the client that sends the
+query in the form of <Source IP address>#<source port>.
 
 % RESOLVER_QUERY_DROPPED    query dropped: '%1/%2/%3' from %4
 An informational message that indicates an incoming query is dropped
-in terms of the query ACL.  Unlike the QUERYREJECTED case, the server does
-not return any response.  See QUERYACCEPTED for the information given in
-the message.
+in terms of the query ACL.  Unlike the RESOLVER_QUERY_REJECTED
+case, the server does not return any response.  The log message
+shows the query in the form of <query name>/<query type>/<query
+class>, and the client that sends the query in the form of <Source
+IP address>#<source port>.
diff --git a/src/lib/acl/loader.h b/src/lib/acl/loader.h
index 6b024c9..a2aa2f8 100644
--- a/src/lib/acl/loader.h
+++ b/src/lib/acl/loader.h
@@ -81,7 +81,7 @@ public:
  * or if it doesn't contain one of the accepted values.
  *
  * \param action The JSON representation of the action. It must be a string
- *     and contain one of "ACCEPT", "REJECT" or "DENY".
+ *     and contain one of "ACCEPT", "REJECT" or "DROP.
  * \note We could define different names or add aliases if needed.
  */
 BasicAction defaultActionLoader(data::ConstElementPtr action);