summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-12-31 16:16:11 -0700
committerCharles Harris <charlesr.harris@gmail.com>2015-12-31 16:16:11 -0700
commitfd2b0d6c58356dd22b38d5e57e32f8107d9362a5 (patch)
tree91863a917d51c6866a2d1a2b69d04d07e7a346c1
parent4e669d99fdb0456502a33e56c92de66a25385a50 (diff)
parenta496e11c52d4dc595cfa3110fe2e0debff566ebb (diff)
downloadnumpy-fd2b0d6c58356dd22b38d5e57e32f8107d9362a5.tar.gz
Merge pull request #6914 from rgommers/fix-link
DOC: fix broken link in user guide. Closes gh-6906.
-rw-r--r--doc/source/dev/development_environment.rst3
-rw-r--r--doc/source/user/building.rst4
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/source/dev/development_environment.rst b/doc/source/dev/development_environment.rst
index b09728e03..0fb5a666d 100644
--- a/doc/source/dev/development_environment.rst
+++ b/doc/source/dev/development_environment.rst
@@ -137,6 +137,9 @@ run the test suite with Python 3.4, use::
For more extensive info on running and writing tests, see
https://github.com/numpy/numpy/blob/master/doc/TESTS.rst.txt .
+*Note: do not run the tests from the root directory of your numpy git repo,
+that will result in strange test errors.*
+
Rebuilding & cleaning the workspace
-----------------------------------
diff --git a/doc/source/user/building.rst b/doc/source/user/building.rst
index c5f8fea1f..8acb2fa3b 100644
--- a/doc/source/user/building.rst
+++ b/doc/source/user/building.rst
@@ -60,8 +60,8 @@ The NumPy build system uses ``distutils`` and ``numpy.distutils``.
``setuptools`` is only used when building via ``pip`` or with ``python
setupegg.py``. Using ``virtualenv`` should work as expected.
-*Note: for build instructions to do development work on NumPy itself, see
-:ref:`development-environment`*.
+*Note: for build instructions to do development work on NumPy itself, see*
+:ref:`development-environment`.
.. _parallel-builds: