doco answer

3 files changed, 34 insertions, 2 deletions

diff --git a/doc/resolver-class.rst b/doc/resolver-class.rst
index a5b6c0a..f6e0508 100644
--- a/doc/resolver-class.rst
+++ b/doc/resolver-class.rst
@@ -14,3 +14,33 @@ The dns.resolver.Resolver and dns.resolver.Answer Classes
 
 .. autoclass:: dns.resolver.Answer
    :members:
+
+   .. attribute:: qname
+
+      A ``dns.name.Name``, the query name.
+
+   .. attribute:: rdclass
+
+      An ``int``, the query class.
+
+   .. attribute:: rdtype
+
+      An ``int``, the query type.
+
+   .. attribute:: response
+
+      A ``dns.message.Message``, the response message.
+
+   .. attribute:: rrset
+
+      A ``dns.rrset.RRset`` or ``None``, the answer RRset.
+
+   .. attribute:: expiration
+
+      A ``float``, the time when the answer expires.
+
+   .. attribute:: canonical_name
+
+      A ``dns.name.Name``, the canonical name of the query name,
+      i.e. the owner name of the answer RRset after any CNAME and DNAME
+      chaining.
diff --git a/doc/resolver-functions.rst b/doc/resolver-functions.rst
index e4ec1ea..d3c5dcc 100644
--- a/doc/resolver-functions.rst
+++ b/doc/resolver-functions.rst
@@ -1,9 +1,10 @@
 .. _resolver-functions:
 
-Resolver Functions
-==================
+Resolver Functions and The Default Resolver
+===========================================
 
 .. autofunction:: dns.resolver.query
 .. autofunction:: dns.resolver.zone_for_name
+.. autodata:: dns.resolver.default_resolver
 .. autofunction:: dns.resolver.get_default_resolver
 .. autofunction:: dns.resolver.reset_default_resolver
diff --git a/doc/resolver.rst b/doc/resolver.rst
index e394d2e..7068bd3 100644
--- a/doc/resolver.rst
+++ b/doc/resolver.rst
@@ -9,5 +9,6 @@ This is a placeholder.
 .. toctree::
 
    resolver-class
+   resolver-functions
    resolver-caching
    resolver-override