Merge branch 'master' of ssh://github.com/letsencrypt/lets-encrypt-preview into renewer

MANIFEST.in

@@ -3,8 +3,7 @@ include CHANGES.rst
 include CONTRIBUTING.md
 include linter_plugin.py
 include letsencrypt/EULA
-
-recursive-include letsencrypt/client/tests/testdata *
+recursive-include letsencrypt/tests/testdata *
 
 recursive-include acme/schemata *.json
 recursive-include acme/jose/testdata *

docs/api/client/proof_of_possession.rst

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

docs/api/proof_of_possession.rst

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

letsencrypt/continuity_auth.py

@@ -19,7 +19,7 @@ class ContinuityAuthenticator(object):
 
     :ivar proof_of_pos: Performs "proofOfPossession" challenges.
     :type proof_of_pos:
-        :class:`letsencrypt.client.proof_of_possession.Proof_of_Possession`
+        :class:`letsencrypt.proof_of_possession.Proof_of_Possession`
 
     """
     zope.interface.implements(interfaces.IAuthenticator)
@@ -32,7 +32,7 @@ class ContinuityAuthenticator(object):
         :type config: :class:`letsencrypt.interfaces.IConfig`
 
         :param installer: Let's Encrypt Installer.
-        :type installer: :class:`letsencrypt.client.interfaces.IInstaller`
+        :type installer: :class:`letsencrypt.interfaces.IInstaller`
 
         """
         self.rec_token = recovery_token.RecoveryToken(

letsencrypt_nginx/configurator.py

@@ -271,7 +271,7 @@ class NginxConfigurator(common.Plugin):
             the existing one?
 
         :param vhost: The vhost to add SSL to.
-        :type vhost: :class:`~letsencrypt.client.plugins.nginx.obj.VirtualHost`
+        :type vhost: :class:`~letsencrypt_nginx.obj.VirtualHost`
 
         """
         ssl_block = [['listen', '443 ssl'],

letsencrypt_nginx/dvsni.py

@@ -78,7 +78,7 @@ class NginxDvsni(ApacheDvsni):
         """Modifies Nginx config to include challenge server blocks.
 
         :param list ll_addrs: list of lists of
-            :class:`letsencrypt.client.plugins.apache.obj.Addr` to apply
+            :class:`letsencrypt_nginx.obj.Addr` to apply
 
         :raises errors.LetsEncryptMisconfigurationError:
             Unable to find a suitable HTTP block to include DVSNI hosts.
@@ -115,7 +115,7 @@ class NginxDvsni(ApacheDvsni):
         """Creates a server block for a DVSNI challenge.
 
         :param achall: Annotated DVSNI challenge.
-        :type achall: :class:`letsencrypt.client.achallenges.DVSNI`
+        :type achall: :class:`letsencrypt.achallenges.DVSNI`
 
         :param list addrs: addresses of challenged domain
             :class:`list` of type :class:`~nginx.obj.Addr`