Merge remote-tracking branch 'origin/master' into devdocs

docs/contributing.rst

@@ -324,9 +324,8 @@ Now run tests inside the Docker image:
   tox -e py27
 
 
-
-Notes on OS depedencies
-=======================
+Notes on OS dependencies
+========================
 
 OS level dependencies are managed by scripts in ``bootstrap``.  Some notes
 are provided here mainly for the :ref:`developers <hacking>` reference.

letsencrypt-apache/readthedocs.org.requirements.txt

@@ -7,4 +7,6 @@
 # in --editable mode (-e), just "pip install .[docs]" does not work as
 # expected and "pip install -e .[docs]" must be used instead
 
+-e acme
+-e .
 -e letsencrypt-apache[docs]

letsencrypt-compatibility-test/readthedocs.org.requirements.txt

@@ -7,4 +7,7 @@
 # in --editable mode (-e), just "pip install .[docs]" does not work as
 # expected and "pip install -e .[docs]" must be used instead
 
+-e acme
+-e .
+-e letsencrypt-apache
 -e letsencrypt-compatibility-test[docs]

letsencrypt-compatibility-test/setup.py

@@ -9,7 +9,6 @@ version = '0.1.0.dev0'
 install_requires = [
     'letsencrypt=={0}'.format(version),
     'letsencrypt-apache=={0}'.format(version),
-    'letsencrypt-nginx=={0}'.format(version),
     'docker-py',
     'zope.interface',
 ]

letsencrypt-nginx/readthedocs.org.requirements.txt

@@ -7,4 +7,6 @@
 # in --editable mode (-e), just "pip install .[docs]" does not work as
 # expected and "pip install -e .[docs]" must be used instead
 
+-e acme
+-e .
 -e letsencrypt-nginx[docs]

readthedocs.org.requirements.txt

@@ -7,4 +7,5 @@
 # in --editable mode (-e), just "pip install .[docs]" does not work as
 # expected and "pip install -e .[docs]" must be used instead
 
+-e acme
 -e .[docs]