Merge branch 'master' into Hainish-rename-authenticator

docs/api/acme/index.rst

@@ -5,12 +5,6 @@
    :members:
 
 
-Interfaces
-----------
-
-.. automodule:: letsencrypt.acme.interfaces
-   :members:
-
 Messages
 --------
 
@@ -46,6 +40,3 @@ Utilities
 
 .. automodule:: letsencrypt.acme.util
    :members:
-
-.. automodule:: letsencrypt.acme.jose
-   :members:

docs/api/acme/jose.rst

@@ -0,0 +1,67 @@
+:mod:`letsencrypt.acme.jose`
+============================
+
+.. contents::
+
+.. automodule:: letsencrypt.acme.jose
+   :members:
+
+
+JSON Web Algorithms
+-------------------
+
+.. automodule:: letsencrypt.acme.jose.jwa
+   :members:
+
+
+JSON Web Key
+------------
+
+.. automodule:: letsencrypt.acme.jose.jwk
+   :members:
+
+
+JSON Web Signature
+------------------
+
+.. automodule:: letsencrypt.acme.jose.jws
+   :members:
+
+
+Implementation details
+----------------------
+
+
+Interfaces
+~~~~~~~~~~
+
+.. automodule:: letsencrypt.acme.jose.interfaces
+   :members:
+
+
+Errors
+~~~~~~
+
+.. automodule:: letsencrypt.acme.jose.errors
+   :members:
+
+
+JSON utilities
+~~~~~~~~~~~~~~
+
+.. automodule:: letsencrypt.acme.jose.json_util
+   :members:
+
+
+JOSE Base64
+~~~~~~~~~~~
+
+.. automodule:: letsencrypt.acme.jose.b64
+   :members:
+
+
+Utilities
+~~~~~~~~~
+
+.. automodule:: letsencrypt.acme.jose.util
+   :members:

docs/api/client/apache.rst

@@ -1,29 +0,0 @@
-:mod:`letsencrypt.client.apache`
---------------------------------
-
-.. automodule:: letsencrypt.client.apache
-   :members:
-
-:mod:`letsencrypt.client.apache.configurator`
-=============================================
-
-.. automodule:: letsencrypt.client.apache.configurator
-   :members:
-
-:mod:`letsencrypt.client.apache.dvsni`
-=============================================
-
-.. automodule:: letsencrypt.client.apache.dvsni
-   :members:
-
-:mod:`letsencrypt.client.apache.obj`
-====================================
-
-.. automodule:: letsencrypt.client.apache.obj
-   :members:
-
-:mod:`letsencrypt.client.apache.parser`
-=======================================
-
-.. automodule:: letsencrypt.client.apache.parser
-   :members:

docs/api/client/plugins/apache.rst

@@ -0,0 +1,29 @@
+:mod:`letsencrypt.client.plugins.apache`
+----------------------------------------
+
+.. automodule:: letsencrypt.client.plugins.apache
+   :members:
+
+:mod:`letsencrypt.client.plugins.apache.configurator`
+=====================================================
+
+.. automodule:: letsencrypt.client.plugins.apache.configurator
+   :members:
+
+:mod:`letsencrypt.client.plugins.apache.dvsni`
+==============================================
+
+.. automodule:: letsencrypt.client.plugins.apache.dvsni
+   :members:
+
+:mod:`letsencrypt.client.plugins.apache.obj`
+============================================
+
+.. automodule:: letsencrypt.client.plugins.apache.obj
+   :members:
+
+:mod:`letsencrypt.client.plugins.apache.parser`
+===============================================
+
+.. automodule:: letsencrypt.client.plugins.apache.parser
+   :members:

docs/api/client/plugins/standalone.rst

@@ -0,0 +1,11 @@
+:mod:`letsencrypt.client.plugins.standalone`
+--------------------------------------------
+
+.. automodule:: letsencrypt.client.plugins.standalone
+   :members:
+
+:mod:`letsencrypt.client.plugins.standalone.authenticator`
+==========================================================
+
+.. automodule:: letsencrypt.client.plugins.standalone.authenticator
+   :members:

docs/api/client/standalone_authenticator.rst

@@ -1,5 +0,0 @@
-:mod:`letsencrypt.client.standalone_authenticator`
---------------------------------------------------
-
-.. automodule:: letsencrypt.client.standalone_authenticator
-   :members: