Merge branch '1.0.x' into 'master'

.travis/test.sh

@@ -15,7 +15,7 @@ in
         python tests --run-docker
         ;;
     checks)
-        flake8 --ignore=E731 reprozip/reprozip reprounzip/reprounzip reprounzip-*/reprounzip reprounzip-qt/reprounzip_qt reprozip-jupyter/reprozip_jupyter tests/*.py
+        flake8 --ignore=E731,W504 reprozip/reprozip reprounzip/reprounzip reprounzip-*/reprounzip reprounzip-qt/reprounzip_qt reprozip-jupyter/reprozip_jupyter tests/*.py
         find scripts -name '*.py' -exec flake8 {} +
         diff -q reprozip/reprozip/common.py reprounzip/reprounzip/common.py
         diff -q reprozip/reprozip/utils.py reprounzip/reprounzip/utils.py

docs/faq.rst

@@ -47,6 +47,8 @@ X support is **not** enabled by default; to enable it, use the flag ``--enable-x
 
     Please refrain from requiring direct rendering in applications that you intend to pack with ReproZip.
 
+If using Vagrant, you can also use the virtual machine's native display directly, by supplying the ``--use-gui`` option to ``reprounzip vagrant setup``.
+
 How can I access the generated system or virtual machine directly?
 ==================================================================
 

reprounzip-docker/README.rst

@@ -11,7 +11,7 @@ This is the component responsible for the unpacking step on different environmen
 Additional Information
 ----------------------
 
-For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://reprozip.readthedocs.io/>`_.
+For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://docs.reprozip.org/>`_.
 
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 

reprounzip-qt/README.rst

@@ -13,7 +13,7 @@ Please refer to `reprozip <https://pypi.python.org/pypi/reprozip>`__ and `reprou
 Additional Information
 ----------------------
 
-For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://reprozip.readthedocs.io/>`_.
+For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://docs.reprozip.org/>`_.
 
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 

reprounzip-vagrant/README.rst

@@ -13,7 +13,7 @@ Please refer to `reprozip <https://pypi.python.org/pypi/reprozip>`__, `reprounzi
 Additional Information
 ----------------------
 
-For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://reprozip.readthedocs.io/>`_.
+For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://docs.reprozip.org/>`_.
 
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 

reprounzip-vistrails/README.rst

@@ -13,7 +13,7 @@ Please refer to `reprozip <https://pypi.python.org/pypi/reprozip>`__ and `reprou
 Additional Information
 ----------------------
 
-For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://reprozip.readthedocs.io/>`_.
+For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://docs.reprozip.org/>`_.
 
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 

reprounzip/README.rst

@@ -15,7 +15,7 @@ A GUI is available at `reprounzip-qt <https://pypi.python.org/pypi/reprounzip-qt
 Additional Information
 ----------------------
 
-For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://reprozip.readthedocs.io/>`_.
+For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://docs.reprozip.org/>`_.
 
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 

reprozip-jupyter/README.rst

@@ -29,7 +29,7 @@ Please refer to `reprozip <https://pypi.python.org/pypi/reprozip>`__ and `reprou
 Additional Information
 ----------------------
 
-For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://reprozip.readthedocs.io/>`_.
+For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://docs.reprozip.org/>`_.
 
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 

reprozip/README.rst

@@ -13,7 +13,7 @@ Please refer to `reprounzip <https://pypi.python.org/pypi/reprounzip>`_, `reprou
 Additional Information
 ----------------------
 
-For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://reprozip.readthedocs.io/>`_.
+For more detailed information, please refer to our `website <https://www.reprozip.org/>`_, as well as to our `documentation <https://docs.reprozip.org/>`_.
 
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes: