Merge branch 'master' into v4.1-dev

2018-08-24 12:45:12 +02:00
parent 60d47be2f3 d0e2ac4388
commit 86204d165d
4 changed files with 44 additions and 4 deletions
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -33,7 +33,6 @@ Install Instaloader
 - On **Windows 10**, you may download the standalone executable from the
  `current release page <https://github.com/instaloader/instaloader/releases/latest>`__.

- To get the most current version of Instaloader from our
-  `Git repository <https://github.com/instaloader/instaloader>`__::
+- To test the most current pre-release or development version of Instaloader::

-     pip3 install --upgrade git+https://github.com/instaloader/instaloader
+     pip3 install --pre instaloader
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
 requests
-sphinx
+sphinx!=1.7.7
 sphinx-bootstrap-theme