diff --git a/INSTALL.rst b/INSTALL.rst index a64f274a674646d7f30ee4af35d5217bdbfd3e1b..edf8f44cbc0040335f3c59e4eebe2565bba86b2f 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -32,7 +32,7 @@ Building Kwant requires * `Python <https://www.python.org/>`_ 3.4 or above (Kwant 1.1 is the last version to support Python 2), * `NumPy <http://numpy.org/>`_ 1.8.1 or newer, - * `SciPy <https://scipy.org/>`_ 0.14 or newer, + * `SciPy <https://www.scipy.org/>`_ 0.14 or newer, * `LAPACK <http://netlib.org/lapack/>`_ and `BLAS <http://netlib.org/blas/>`_, (For best performance we recommend the free `OpenBLAS <http://www.openblas.net/>`_ or the nonfree `MKL @@ -185,7 +185,7 @@ are extracted form the diff file. The diff file may be modified directly. Another possible way of working is to directly modify either the tutorial script or the figure generation script. Then ``make html`` will use the command line tool `wiggle -<http://neil.brown.name/wiggle/>`_ to propagate the modifications accordingly. +<https://github.com/neilbrown/wiggle>`_ to propagate the modifications accordingly. This will often just work, but may sometimes result in conflicts, in which case a message will be printed. The conflicts then have to be resolved much like with a version control system.