fix doco nits

diff --git a/dns/dnssec.py b/dns/dnssec.py
index 171a55da003e8b73cfb8e19360be1cdd8b6a9757..13b9c52f6da18c06452deb5b03c9c26bcb828546 100644 (file)
--- a/dns/dnssec.py
+++ b/dns/dnssec.py
@@ -170,18 +170,18 @@ def make_ds(name, key, algorithm, origin=None):
     :param name: Owner name of the DS record
     :type name: string
     :param key: a DNSKEY
-    :type key: :py:data:`dns.rdtypes.ANY.DNSKEY`
+    :type key: :py:data:`dns.rdtypes.ANY.DNSKEY.DNSKEY`
     :param algorithm: a string describing which hash algorithm to
-    use.  The currently supported hashes are "SHA1" and "SHA256". Case
-    does not matter for these strings.
+      use.  The currently supported hashes are "SHA1" and "SHA256". Case
+      does not matter for these strings.
     :type algorithm: string
     :param origin: Will be used as origin if `key` is a relative name,
-    defaults to None
+      defaults to None
     :type origin: :py:data:`dns.name.Name`, optional
     :raises UnsupportedAlgorithm: If the algorithm is not either
-    "SHA1" or "SHA256" exception will be thrown
+      "SHA1" or "SHA256"
     :return: a DS record
-    :rtype: :py:data:`dns.rdtypes.ANY.DS`
+    :rtype: :py:data:`dns.rdtypes.ANY.DS.DS`
 
     """
 

diff --git a/doc/conf.py b/doc/conf.py
index 0a0e667bd7967511298d271508b86c527efc6987..9cb572549b8ecd945faf76be36437bd7689b35ae 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -60,9 +60,9 @@ author = 'Dnspython Contributors'
 # built documents.
 #
 # The short X.Y version.
-version = '1.16'
+version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.16.0'
+release = '2.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -91,7 +91,7 @@ autoclass_content = 'both'
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'alabaster'
+#html_theme = 'alabaster'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

diff --git a/doc/rdata-set-make.rst b/doc/rdata-set-make.rst
index 6ada9c34b08e2a8657066cab02ab9829f32b1c24..daf9ccf0118dcc0566690ec790320f494034f15e 100644 (file)
--- a/doc/rdata-set-make.rst
+++ b/doc/rdata-set-make.rst
@@ -1,4 +1,4 @@
-.. _rdata-make:
+.. _rdata-set-make:
 
 Making DNS Rdatasets and RRsets
 ===============================