summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CAPI.txt (renamed from numpy/doc/CAPI.txt)0
-rw-r--r--doc/DISTUTILS.txt (renamed from numpy/doc/DISTUTILS.txt)0
-rw-r--r--doc/EXAMPLE_DOCSTRING.txt (renamed from numpy/doc/EXAMPLE_DOCSTRING.txt)0
-rw-r--r--doc/HOWTO_BUILD_DOCS.txt (renamed from numpy/doc/HOWTO_BUILD_DOCS.txt)0
-rw-r--r--doc/HOWTO_DOCUMENT.txt (renamed from numpy/doc/HOWTO_DOCUMENT.txt)0
-rw-r--r--doc/README.txt (renamed from numpy/doc/README.txt)0
-rw-r--r--doc/cython/MANIFEST (renamed from numpy/doc/cython/MANIFEST)0
-rw-r--r--doc/cython/Makefile (renamed from numpy/doc/cython/Makefile)0
-rw-r--r--doc/cython/README.txt (renamed from numpy/doc/cython/README.txt)0
-rw-r--r--doc/cython/c_numpy.pxd (renamed from numpy/doc/cython/c_numpy.pxd)0
-rw-r--r--doc/cython/c_python.pxd (renamed from numpy/doc/cython/c_python.pxd)0
-rw-r--r--doc/cython/numpyx.pyx (renamed from numpy/doc/cython/numpyx.pyx)0
-rwxr-xr-xdoc/cython/run_test.py (renamed from numpy/doc/cython/run_test.py)0
-rwxr-xr-xdoc/cython/setup.py (renamed from numpy/doc/cython/setup.py)0
-rw-r--r--doc/example.py (renamed from numpy/doc/example.py)0
-rw-r--r--doc/html/api-objects.txt (renamed from numpy/doc/html/api-objects.txt)0
-rw-r--r--doc/html/crarr.png (renamed from numpy/doc/html/crarr.png)bin340 -> 340 bytes
-rw-r--r--doc/html/epydoc.css (renamed from numpy/doc/html/epydoc.css)0
-rw-r--r--doc/html/epydoc.js (renamed from numpy/doc/html/epydoc.js)0
-rw-r--r--doc/html/example-module.html (renamed from numpy/doc/html/example-module.html)0
-rw-r--r--doc/html/example-pysrc.html (renamed from numpy/doc/html/example-pysrc.html)0
-rw-r--r--doc/html/frames.html (renamed from numpy/doc/html/frames.html)0
-rw-r--r--doc/html/help.html (renamed from numpy/doc/html/help.html)0
-rw-r--r--doc/html/identifier-index.html (renamed from numpy/doc/html/identifier-index.html)0
-rw-r--r--doc/html/index.html (renamed from numpy/doc/html/index.html)0
-rw-r--r--doc/html/module-tree.html (renamed from numpy/doc/html/module-tree.html)0
-rw-r--r--doc/html/redirect.html (renamed from numpy/doc/html/redirect.html)0
-rw-r--r--doc/html/toc-everything.html (renamed from numpy/doc/html/toc-everything.html)0
-rw-r--r--doc/html/toc-example-module.html (renamed from numpy/doc/html/toc-example-module.html)0
-rw-r--r--doc/html/toc.html (renamed from numpy/doc/html/toc.html)0
-rw-r--r--doc/newdtype_example/example.py (renamed from numpy/doc/newdtype_example/example.py)0
-rw-r--r--doc/newdtype_example/floatint.c (renamed from numpy/doc/newdtype_example/floatint.c)0
-rw-r--r--doc/newdtype_example/floatint/__init__.py (renamed from numpy/doc/newdtype_example/floatint/__init__.py)0
-rw-r--r--doc/newdtype_example/setup.py (renamed from numpy/doc/newdtype_example/setup.py)0
-rw-r--r--doc/npy-format.txt (renamed from numpy/doc/npy-format.txt)0
-rw-r--r--doc/pep_buffer.txt (renamed from numpy/doc/pep_buffer.txt)0
-rw-r--r--doc/pyrex/MANIFEST (renamed from numpy/doc/pyrex/MANIFEST)0
-rw-r--r--doc/pyrex/Makefile (renamed from numpy/doc/pyrex/Makefile)0
-rw-r--r--doc/pyrex/README.txt (renamed from numpy/doc/pyrex/README.txt)0
-rw-r--r--doc/pyrex/c_numpy.pxd (renamed from numpy/doc/pyrex/c_numpy.pxd)0
-rw-r--r--doc/pyrex/c_python.pxd (renamed from numpy/doc/pyrex/c_python.pxd)0
-rw-r--r--doc/pyrex/notes (renamed from numpy/doc/pyrex/notes)0
-rw-r--r--doc/pyrex/numpyx.c (renamed from numpy/doc/pyrex/numpyx.c)0
-rw-r--r--doc/pyrex/numpyx.pyx (renamed from numpy/doc/pyrex/numpyx.pyx)0
-rwxr-xr-xdoc/pyrex/run_test.py (renamed from numpy/doc/pyrex/run_test.py)0
-rw-r--r--doc/pyrex/setup.py (renamed from numpy/doc/pyrex/setup.py)0
-rw-r--r--doc/records.txt (renamed from numpy/doc/records.txt)0
-rw-r--r--doc/swig/Makefile (renamed from numpy/doc/swig/Makefile)0
-rw-r--r--doc/swig/README (renamed from numpy/doc/swig/README)0
-rw-r--r--doc/swig/doc/Makefile (renamed from numpy/doc/swig/doc/Makefile)0
-rw-r--r--doc/swig/doc/numpy_swig.html (renamed from numpy/doc/swig/doc/numpy_swig.html)0
-rw-r--r--doc/swig/doc/numpy_swig.pdf (renamed from numpy/doc/swig/doc/numpy_swig.pdf)bin168839 -> 168839 bytes
-rw-r--r--doc/swig/doc/numpy_swig.txt (renamed from numpy/doc/swig/doc/numpy_swig.txt)0
-rw-r--r--doc/swig/doc/testing.html (renamed from numpy/doc/swig/doc/testing.html)0
-rw-r--r--doc/swig/doc/testing.pdf (renamed from numpy/doc/swig/doc/testing.pdf)bin72439 -> 72439 bytes
-rw-r--r--doc/swig/doc/testing.txt (renamed from numpy/doc/swig/doc/testing.txt)0
-rw-r--r--doc/swig/numpy.i (renamed from numpy/doc/swig/numpy.i)0
-rw-r--r--doc/swig/pyfragments.swg (renamed from numpy/doc/swig/pyfragments.swg)0
-rw-r--r--doc/swig/test/Array.i (renamed from numpy/doc/swig/test/Array.i)0
-rw-r--r--doc/swig/test/Array1.cxx (renamed from numpy/doc/swig/test/Array1.cxx)0
-rw-r--r--doc/swig/test/Array1.h (renamed from numpy/doc/swig/test/Array1.h)0
-rw-r--r--doc/swig/test/Array2.cxx (renamed from numpy/doc/swig/test/Array2.cxx)0
-rw-r--r--doc/swig/test/Array2.h (renamed from numpy/doc/swig/test/Array2.h)0
-rw-r--r--doc/swig/test/Farray.cxx (renamed from numpy/doc/swig/test/Farray.cxx)0
-rw-r--r--doc/swig/test/Farray.h (renamed from numpy/doc/swig/test/Farray.h)0
-rw-r--r--doc/swig/test/Farray.i (renamed from numpy/doc/swig/test/Farray.i)0
-rw-r--r--doc/swig/test/Fortran.cxx (renamed from numpy/doc/swig/test/Fortran.cxx)0
-rw-r--r--doc/swig/test/Fortran.h (renamed from numpy/doc/swig/test/Fortran.h)0
-rw-r--r--doc/swig/test/Fortran.i (renamed from numpy/doc/swig/test/Fortran.i)0
-rw-r--r--doc/swig/test/Makefile (renamed from numpy/doc/swig/test/Makefile)0
-rw-r--r--doc/swig/test/Matrix.cxx (renamed from numpy/doc/swig/test/Matrix.cxx)0
-rw-r--r--doc/swig/test/Matrix.h (renamed from numpy/doc/swig/test/Matrix.h)0
-rw-r--r--doc/swig/test/Matrix.i (renamed from numpy/doc/swig/test/Matrix.i)0
-rw-r--r--doc/swig/test/Tensor.cxx (renamed from numpy/doc/swig/test/Tensor.cxx)0
-rw-r--r--doc/swig/test/Tensor.h (renamed from numpy/doc/swig/test/Tensor.h)0
-rw-r--r--doc/swig/test/Tensor.i (renamed from numpy/doc/swig/test/Tensor.i)0
-rw-r--r--doc/swig/test/Vector.cxx (renamed from numpy/doc/swig/test/Vector.cxx)0
-rw-r--r--doc/swig/test/Vector.h (renamed from numpy/doc/swig/test/Vector.h)0
-rw-r--r--doc/swig/test/Vector.i (renamed from numpy/doc/swig/test/Vector.i)0
-rwxr-xr-xdoc/swig/test/setup.py (renamed from numpy/doc/swig/test/setup.py)0
-rwxr-xr-xdoc/swig/test/testArray.py (renamed from numpy/doc/swig/test/testArray.py)0
-rwxr-xr-xdoc/swig/test/testFarray.py (renamed from numpy/doc/swig/test/testFarray.py)0
-rw-r--r--doc/swig/test/testFortran.py (renamed from numpy/doc/swig/test/testFortran.py)0
-rwxr-xr-xdoc/swig/test/testMatrix.py (renamed from numpy/doc/swig/test/testMatrix.py)0
-rwxr-xr-xdoc/swig/test/testTensor.py (renamed from numpy/doc/swig/test/testTensor.py)0
-rwxr-xr-xdoc/swig/test/testVector.py (renamed from numpy/doc/swig/test/testVector.py)0
-rw-r--r--doc/ufuncs.txt (renamed from numpy/doc/ufuncs.txt)0
-rw-r--r--numpy/__init__.py30
-rw-r--r--numpy/doc/__init__.py14
-rw-r--r--numpy/doc/basics.py (renamed from numpy/doc/reference/basics.py)0
-rw-r--r--numpy/doc/broadcasting.py (renamed from numpy/doc/reference/broadcasting.py)0
-rw-r--r--numpy/doc/creation.py (renamed from numpy/doc/reference/creation.py)0
-rw-r--r--numpy/doc/glossary.py (renamed from numpy/doc/reference/glossary.py)0
-rw-r--r--numpy/doc/howtofind.py (renamed from numpy/doc/reference/howtofind.py)0
-rw-r--r--numpy/doc/indexing.py (renamed from numpy/doc/reference/indexing.py)0
-rw-r--r--numpy/doc/internals.py (renamed from numpy/doc/reference/internals.py)0
-rw-r--r--numpy/doc/io.py (renamed from numpy/doc/reference/io.py)0
-rw-r--r--numpy/doc/jargon.py (renamed from numpy/doc/reference/jargon.py)0
-rw-r--r--numpy/doc/methods_vs_functions.py (renamed from numpy/doc/reference/methods_vs_functions.py)0
-rw-r--r--numpy/doc/misc.py (renamed from numpy/doc/reference/misc.py)0
-rw-r--r--numpy/doc/performance.py (renamed from numpy/doc/reference/performance.py)0
-rw-r--r--numpy/doc/structured_arrays.py (renamed from numpy/doc/reference/structured_arrays.py)0
-rw-r--r--numpy/doc/ufuncs.py (renamed from numpy/doc/reference/ufuncs.py)0
103 files changed, 23 insertions, 21 deletions
diff --git a/numpy/doc/CAPI.txt b/doc/CAPI.txt
index 28738635e..28738635e 100644
--- a/numpy/doc/CAPI.txt
+++ b/doc/CAPI.txt
diff --git a/numpy/doc/DISTUTILS.txt b/doc/DISTUTILS.txt
index b2027e619..b2027e619 100644
--- a/numpy/doc/DISTUTILS.txt
+++ b/doc/DISTUTILS.txt
diff --git a/numpy/doc/EXAMPLE_DOCSTRING.txt b/doc/EXAMPLE_DOCSTRING.txt
index ee1326474..ee1326474 100644
--- a/numpy/doc/EXAMPLE_DOCSTRING.txt
+++ b/doc/EXAMPLE_DOCSTRING.txt
diff --git a/numpy/doc/HOWTO_BUILD_DOCS.txt b/doc/HOWTO_BUILD_DOCS.txt
index 9b1cca2f0..9b1cca2f0 100644
--- a/numpy/doc/HOWTO_BUILD_DOCS.txt
+++ b/doc/HOWTO_BUILD_DOCS.txt
diff --git a/numpy/doc/HOWTO_DOCUMENT.txt b/doc/HOWTO_DOCUMENT.txt
index 03c35283d..03c35283d 100644
--- a/numpy/doc/HOWTO_DOCUMENT.txt
+++ b/doc/HOWTO_DOCUMENT.txt
diff --git a/numpy/doc/README.txt b/doc/README.txt
index eacc3659e..eacc3659e 100644
--- a/numpy/doc/README.txt
+++ b/doc/README.txt
diff --git a/numpy/doc/cython/MANIFEST b/doc/cython/MANIFEST
index feb3ec22a..feb3ec22a 100644
--- a/numpy/doc/cython/MANIFEST
+++ b/doc/cython/MANIFEST
diff --git a/numpy/doc/cython/Makefile b/doc/cython/Makefile
index 7c9c72981..7c9c72981 100644
--- a/numpy/doc/cython/Makefile
+++ b/doc/cython/Makefile
diff --git a/numpy/doc/cython/README.txt b/doc/cython/README.txt
index ff0abb0fe..ff0abb0fe 100644
--- a/numpy/doc/cython/README.txt
+++ b/doc/cython/README.txt
diff --git a/numpy/doc/cython/c_numpy.pxd b/doc/cython/c_numpy.pxd
index 4a0bd1c01..4a0bd1c01 100644
--- a/numpy/doc/cython/c_numpy.pxd
+++ b/doc/cython/c_numpy.pxd
diff --git a/numpy/doc/cython/c_python.pxd b/doc/cython/c_python.pxd
index 46d2fd1a7..46d2fd1a7 100644
--- a/numpy/doc/cython/c_python.pxd
+++ b/doc/cython/c_python.pxd
diff --git a/numpy/doc/cython/numpyx.pyx b/doc/cython/numpyx.pyx
index cbc786ef0..cbc786ef0 100644
--- a/numpy/doc/cython/numpyx.pyx
+++ b/doc/cython/numpyx.pyx
diff --git a/numpy/doc/cython/run_test.py b/doc/cython/run_test.py
index 96388011e..96388011e 100755
--- a/numpy/doc/cython/run_test.py
+++ b/doc/cython/run_test.py
diff --git a/numpy/doc/cython/setup.py b/doc/cython/setup.py
index 270e11c56..270e11c56 100755
--- a/numpy/doc/cython/setup.py
+++ b/doc/cython/setup.py
diff --git a/numpy/doc/example.py b/doc/example.py
index 152e2a622..152e2a622 100644
--- a/numpy/doc/example.py
+++ b/doc/example.py
diff --git a/numpy/doc/html/api-objects.txt b/doc/html/api-objects.txt
index 81953990e..81953990e 100644
--- a/numpy/doc/html/api-objects.txt
+++ b/doc/html/api-objects.txt
diff --git a/numpy/doc/html/crarr.png b/doc/html/crarr.png
index 26b43c524..26b43c524 100644
--- a/numpy/doc/html/crarr.png
+++ b/doc/html/crarr.png
Binary files differ
diff --git a/numpy/doc/html/epydoc.css b/doc/html/epydoc.css
index 86d417068..86d417068 100644
--- a/numpy/doc/html/epydoc.css
+++ b/doc/html/epydoc.css
diff --git a/numpy/doc/html/epydoc.js b/doc/html/epydoc.js
index e787dbcf4..e787dbcf4 100644
--- a/numpy/doc/html/epydoc.js
+++ b/doc/html/epydoc.js
diff --git a/numpy/doc/html/example-module.html b/doc/html/example-module.html
index f08370632..f08370632 100644
--- a/numpy/doc/html/example-module.html
+++ b/doc/html/example-module.html
diff --git a/numpy/doc/html/example-pysrc.html b/doc/html/example-pysrc.html
index f771330e2..f771330e2 100644
--- a/numpy/doc/html/example-pysrc.html
+++ b/doc/html/example-pysrc.html
diff --git a/numpy/doc/html/frames.html b/doc/html/frames.html
index 6ebc67e75..6ebc67e75 100644
--- a/numpy/doc/html/frames.html
+++ b/doc/html/frames.html
diff --git a/numpy/doc/html/help.html b/doc/html/help.html
index b92302aeb..b92302aeb 100644
--- a/numpy/doc/html/help.html
+++ b/doc/html/help.html
diff --git a/numpy/doc/html/identifier-index.html b/doc/html/identifier-index.html
index c29b8c5c9..c29b8c5c9 100644
--- a/numpy/doc/html/identifier-index.html
+++ b/doc/html/identifier-index.html
diff --git a/numpy/doc/html/index.html b/doc/html/index.html
index 6ebc67e75..6ebc67e75 100644
--- a/numpy/doc/html/index.html
+++ b/doc/html/index.html
diff --git a/numpy/doc/html/module-tree.html b/doc/html/module-tree.html
index ad64d11b2..ad64d11b2 100644
--- a/numpy/doc/html/module-tree.html
+++ b/doc/html/module-tree.html
diff --git a/numpy/doc/html/redirect.html b/doc/html/redirect.html
index dbd50828c..dbd50828c 100644
--- a/numpy/doc/html/redirect.html
+++ b/doc/html/redirect.html
diff --git a/numpy/doc/html/toc-everything.html b/doc/html/toc-everything.html
index ce94bd1f0..ce94bd1f0 100644
--- a/numpy/doc/html/toc-everything.html
+++ b/doc/html/toc-everything.html
diff --git a/numpy/doc/html/toc-example-module.html b/doc/html/toc-example-module.html
index c691dccae..c691dccae 100644
--- a/numpy/doc/html/toc-example-module.html
+++ b/doc/html/toc-example-module.html
diff --git a/numpy/doc/html/toc.html b/doc/html/toc.html
index 7008e1695..7008e1695 100644
--- a/numpy/doc/html/toc.html
+++ b/doc/html/toc.html
diff --git a/numpy/doc/newdtype_example/example.py b/doc/newdtype_example/example.py
index 7ee64ca00..7ee64ca00 100644
--- a/numpy/doc/newdtype_example/example.py
+++ b/doc/newdtype_example/example.py
diff --git a/numpy/doc/newdtype_example/floatint.c b/doc/newdtype_example/floatint.c
index cf698a7f9..cf698a7f9 100644
--- a/numpy/doc/newdtype_example/floatint.c
+++ b/doc/newdtype_example/floatint.c
diff --git a/numpy/doc/newdtype_example/floatint/__init__.py b/doc/newdtype_example/floatint/__init__.py
index e69de29bb..e69de29bb 100644
--- a/numpy/doc/newdtype_example/floatint/__init__.py
+++ b/doc/newdtype_example/floatint/__init__.py
diff --git a/numpy/doc/newdtype_example/setup.py b/doc/newdtype_example/setup.py
index 3b9d75578..3b9d75578 100644
--- a/numpy/doc/newdtype_example/setup.py
+++ b/doc/newdtype_example/setup.py
diff --git a/numpy/doc/npy-format.txt b/doc/npy-format.txt
index 836468096..836468096 100644
--- a/numpy/doc/npy-format.txt
+++ b/doc/npy-format.txt
diff --git a/numpy/doc/pep_buffer.txt b/doc/pep_buffer.txt
index a154d2792..a154d2792 100644
--- a/numpy/doc/pep_buffer.txt
+++ b/doc/pep_buffer.txt
diff --git a/numpy/doc/pyrex/MANIFEST b/doc/pyrex/MANIFEST
index feb3ec22a..feb3ec22a 100644
--- a/numpy/doc/pyrex/MANIFEST
+++ b/doc/pyrex/MANIFEST
diff --git a/numpy/doc/pyrex/Makefile b/doc/pyrex/Makefile
index b5905e7be..b5905e7be 100644
--- a/numpy/doc/pyrex/Makefile
+++ b/doc/pyrex/Makefile
diff --git a/numpy/doc/pyrex/README.txt b/doc/pyrex/README.txt
index 9df1e6c8e..9df1e6c8e 100644
--- a/numpy/doc/pyrex/README.txt
+++ b/doc/pyrex/README.txt
diff --git a/numpy/doc/pyrex/c_numpy.pxd b/doc/pyrex/c_numpy.pxd
index 511acc4b1..511acc4b1 100644
--- a/numpy/doc/pyrex/c_numpy.pxd
+++ b/doc/pyrex/c_numpy.pxd
diff --git a/numpy/doc/pyrex/c_python.pxd b/doc/pyrex/c_python.pxd
index 53f6d9b19..53f6d9b19 100644
--- a/numpy/doc/pyrex/c_python.pxd
+++ b/doc/pyrex/c_python.pxd
diff --git a/numpy/doc/pyrex/notes b/doc/pyrex/notes
index 301581cee..301581cee 100644
--- a/numpy/doc/pyrex/notes
+++ b/doc/pyrex/notes
diff --git a/numpy/doc/pyrex/numpyx.c b/doc/pyrex/numpyx.c
index e250eae19..e250eae19 100644
--- a/numpy/doc/pyrex/numpyx.c
+++ b/doc/pyrex/numpyx.c
diff --git a/numpy/doc/pyrex/numpyx.pyx b/doc/pyrex/numpyx.pyx
index 068d251f6..068d251f6 100644
--- a/numpy/doc/pyrex/numpyx.pyx
+++ b/doc/pyrex/numpyx.pyx
diff --git a/numpy/doc/pyrex/run_test.py b/doc/pyrex/run_test.py
index 96388011e..96388011e 100755
--- a/numpy/doc/pyrex/run_test.py
+++ b/doc/pyrex/run_test.py
diff --git a/numpy/doc/pyrex/setup.py b/doc/pyrex/setup.py
index 7f7cf0fc1..7f7cf0fc1 100644
--- a/numpy/doc/pyrex/setup.py
+++ b/doc/pyrex/setup.py
diff --git a/numpy/doc/records.txt b/doc/records.txt
index 6c4824d41..6c4824d41 100644
--- a/numpy/doc/records.txt
+++ b/doc/records.txt
diff --git a/numpy/doc/swig/Makefile b/doc/swig/Makefile
index b64492f45..b64492f45 100644
--- a/numpy/doc/swig/Makefile
+++ b/doc/swig/Makefile
diff --git a/numpy/doc/swig/README b/doc/swig/README
index d557b305f..d557b305f 100644
--- a/numpy/doc/swig/README
+++ b/doc/swig/README
diff --git a/numpy/doc/swig/doc/Makefile b/doc/swig/doc/Makefile
index 9223f0481..9223f0481 100644
--- a/numpy/doc/swig/doc/Makefile
+++ b/doc/swig/doc/Makefile
diff --git a/numpy/doc/swig/doc/numpy_swig.html b/doc/swig/doc/numpy_swig.html
index ed127f330..ed127f330 100644
--- a/numpy/doc/swig/doc/numpy_swig.html
+++ b/doc/swig/doc/numpy_swig.html
diff --git a/numpy/doc/swig/doc/numpy_swig.pdf b/doc/swig/doc/numpy_swig.pdf
index 1d4642cf7..1d4642cf7 100644
--- a/numpy/doc/swig/doc/numpy_swig.pdf
+++ b/doc/swig/doc/numpy_swig.pdf
Binary files differ
diff --git a/numpy/doc/swig/doc/numpy_swig.txt b/doc/swig/doc/numpy_swig.txt
index bfde018bf..bfde018bf 100644
--- a/numpy/doc/swig/doc/numpy_swig.txt
+++ b/doc/swig/doc/numpy_swig.txt
diff --git a/numpy/doc/swig/doc/testing.html b/doc/swig/doc/testing.html
index 3622550df..3622550df 100644
--- a/numpy/doc/swig/doc/testing.html
+++ b/doc/swig/doc/testing.html
diff --git a/numpy/doc/swig/doc/testing.pdf b/doc/swig/doc/testing.pdf
index 9ffcf7575..9ffcf7575 100644
--- a/numpy/doc/swig/doc/testing.pdf
+++ b/doc/swig/doc/testing.pdf
Binary files differ
diff --git a/numpy/doc/swig/doc/testing.txt b/doc/swig/doc/testing.txt
index bfd5218e8..bfd5218e8 100644
--- a/numpy/doc/swig/doc/testing.txt
+++ b/doc/swig/doc/testing.txt
diff --git a/numpy/doc/swig/numpy.i b/doc/swig/numpy.i
index 72fc4f9c4..72fc4f9c4 100644
--- a/numpy/doc/swig/numpy.i
+++ b/doc/swig/numpy.i
diff --git a/numpy/doc/swig/pyfragments.swg b/doc/swig/pyfragments.swg
index 0deaa61e1..0deaa61e1 100644
--- a/numpy/doc/swig/pyfragments.swg
+++ b/doc/swig/pyfragments.swg
diff --git a/numpy/doc/swig/test/Array.i b/doc/swig/test/Array.i
index d56dd2d1c..d56dd2d1c 100644
--- a/numpy/doc/swig/test/Array.i
+++ b/doc/swig/test/Array.i
diff --git a/numpy/doc/swig/test/Array1.cxx b/doc/swig/test/Array1.cxx
index 0c09e02f9..0c09e02f9 100644
--- a/numpy/doc/swig/test/Array1.cxx
+++ b/doc/swig/test/Array1.cxx
diff --git a/numpy/doc/swig/test/Array1.h b/doc/swig/test/Array1.h
index 754c248fc..754c248fc 100644
--- a/numpy/doc/swig/test/Array1.h
+++ b/doc/swig/test/Array1.h
diff --git a/numpy/doc/swig/test/Array2.cxx b/doc/swig/test/Array2.cxx
index e3558f786..e3558f786 100644
--- a/numpy/doc/swig/test/Array2.cxx
+++ b/doc/swig/test/Array2.cxx
diff --git a/numpy/doc/swig/test/Array2.h b/doc/swig/test/Array2.h
index a6e5bfc30..a6e5bfc30 100644
--- a/numpy/doc/swig/test/Array2.h
+++ b/doc/swig/test/Array2.h
diff --git a/numpy/doc/swig/test/Farray.cxx b/doc/swig/test/Farray.cxx
index 3983c333b..3983c333b 100644
--- a/numpy/doc/swig/test/Farray.cxx
+++ b/doc/swig/test/Farray.cxx
diff --git a/numpy/doc/swig/test/Farray.h b/doc/swig/test/Farray.h
index 4199a287c..4199a287c 100644
--- a/numpy/doc/swig/test/Farray.h
+++ b/doc/swig/test/Farray.h
diff --git a/numpy/doc/swig/test/Farray.i b/doc/swig/test/Farray.i
index 25f6cd025..25f6cd025 100644
--- a/numpy/doc/swig/test/Farray.i
+++ b/doc/swig/test/Farray.i
diff --git a/numpy/doc/swig/test/Fortran.cxx b/doc/swig/test/Fortran.cxx
index 475d21ddc..475d21ddc 100644
--- a/numpy/doc/swig/test/Fortran.cxx
+++ b/doc/swig/test/Fortran.cxx
diff --git a/numpy/doc/swig/test/Fortran.h b/doc/swig/test/Fortran.h
index c243bb50f..c243bb50f 100644
--- a/numpy/doc/swig/test/Fortran.h
+++ b/doc/swig/test/Fortran.h
diff --git a/numpy/doc/swig/test/Fortran.i b/doc/swig/test/Fortran.i
index 131790dd6..131790dd6 100644
--- a/numpy/doc/swig/test/Fortran.i
+++ b/doc/swig/test/Fortran.i
diff --git a/numpy/doc/swig/test/Makefile b/doc/swig/test/Makefile
index 5360b1ced..5360b1ced 100644
--- a/numpy/doc/swig/test/Makefile
+++ b/doc/swig/test/Makefile
diff --git a/numpy/doc/swig/test/Matrix.cxx b/doc/swig/test/Matrix.cxx
index b953d7017..b953d7017 100644
--- a/numpy/doc/swig/test/Matrix.cxx
+++ b/doc/swig/test/Matrix.cxx
diff --git a/numpy/doc/swig/test/Matrix.h b/doc/swig/test/Matrix.h
index f37836cc4..f37836cc4 100644
--- a/numpy/doc/swig/test/Matrix.h
+++ b/doc/swig/test/Matrix.h
diff --git a/numpy/doc/swig/test/Matrix.i b/doc/swig/test/Matrix.i
index e721397a0..e721397a0 100644
--- a/numpy/doc/swig/test/Matrix.i
+++ b/doc/swig/test/Matrix.i
diff --git a/numpy/doc/swig/test/Tensor.cxx b/doc/swig/test/Tensor.cxx
index dce595291..dce595291 100644
--- a/numpy/doc/swig/test/Tensor.cxx
+++ b/doc/swig/test/Tensor.cxx
diff --git a/numpy/doc/swig/test/Tensor.h b/doc/swig/test/Tensor.h
index d60eb2d2e..d60eb2d2e 100644
--- a/numpy/doc/swig/test/Tensor.h
+++ b/doc/swig/test/Tensor.h
diff --git a/numpy/doc/swig/test/Tensor.i b/doc/swig/test/Tensor.i
index a1198dc9e..a1198dc9e 100644
--- a/numpy/doc/swig/test/Tensor.i
+++ b/doc/swig/test/Tensor.i
diff --git a/numpy/doc/swig/test/Vector.cxx b/doc/swig/test/Vector.cxx
index 2c90404da..2c90404da 100644
--- a/numpy/doc/swig/test/Vector.cxx
+++ b/doc/swig/test/Vector.cxx
diff --git a/numpy/doc/swig/test/Vector.h b/doc/swig/test/Vector.h
index 01da361c6..01da361c6 100644
--- a/numpy/doc/swig/test/Vector.h
+++ b/doc/swig/test/Vector.h
diff --git a/numpy/doc/swig/test/Vector.i b/doc/swig/test/Vector.i
index e86f21c37..e86f21c37 100644
--- a/numpy/doc/swig/test/Vector.i
+++ b/doc/swig/test/Vector.i
diff --git a/numpy/doc/swig/test/setup.py b/doc/swig/test/setup.py
index fadf8b5cd..fadf8b5cd 100755
--- a/numpy/doc/swig/test/setup.py
+++ b/doc/swig/test/setup.py
diff --git a/numpy/doc/swig/test/testArray.py b/doc/swig/test/testArray.py
index ba83d14d9..ba83d14d9 100755
--- a/numpy/doc/swig/test/testArray.py
+++ b/doc/swig/test/testArray.py
diff --git a/numpy/doc/swig/test/testFarray.py b/doc/swig/test/testFarray.py
index 614e149bd..614e149bd 100755
--- a/numpy/doc/swig/test/testFarray.py
+++ b/doc/swig/test/testFarray.py
diff --git a/numpy/doc/swig/test/testFortran.py b/doc/swig/test/testFortran.py
index d2c382869..d2c382869 100644
--- a/numpy/doc/swig/test/testFortran.py
+++ b/doc/swig/test/testFortran.py
diff --git a/numpy/doc/swig/test/testMatrix.py b/doc/swig/test/testMatrix.py
index 12061702d..12061702d 100755
--- a/numpy/doc/swig/test/testMatrix.py
+++ b/doc/swig/test/testMatrix.py
diff --git a/numpy/doc/swig/test/testTensor.py b/doc/swig/test/testTensor.py
index 3d0ce097e..3d0ce097e 100755
--- a/numpy/doc/swig/test/testTensor.py
+++ b/doc/swig/test/testTensor.py
diff --git a/numpy/doc/swig/test/testVector.py b/doc/swig/test/testVector.py
index 2ee918389..2ee918389 100755
--- a/numpy/doc/swig/test/testVector.py
+++ b/doc/swig/test/testVector.py
diff --git a/numpy/doc/ufuncs.txt b/doc/ufuncs.txt
index fa107cc21..fa107cc21 100644
--- a/numpy/doc/ufuncs.txt
+++ b/doc/ufuncs.txt
diff --git a/numpy/__init__.py b/numpy/__init__.py
index 66f80040c..119cb44cf 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -36,14 +36,17 @@ To search for objects of which the documentation contains keywords, do::
>>> np.lookfor('keyword')
+Topical documentation is available under the ``doc`` sub-module::
+
+ >>> from numpy import doc
+ >>> help(doc)
+
Available subpackages
---------------------
-core
- Defines a multi-dimensional array and useful procedures
- for Numerical computation.
+doc
+ Topical documentation on broadcasting, indexing, etc.
lib
- Basic functions used by several sub-packages and useful
- to have in the main name-space.
+ Basic functions used by several sub-packages.
random
Core Random Tools
linalg
@@ -52,26 +55,16 @@ fft
Core FFT routines
testing
Numpy testing tools
-
-The following sub-packages must be explicitly imported:
-
f2py
Fortran to Python Interface Generator.
distutils
Enhancements to distutils with support for
Fortran compilers support and more.
-Global symbols from subpackages
--------------------------------
-Do not import directly from `core` and `lib`: those functions
-have been imported into the `numpy` namespace.
-
-Utility tools
--------------
+Utilities
+---------
test
Run numpy unittests
-pkgload
- Load numpy packages
show_config
Show numpy build configuration
dual
@@ -147,7 +140,6 @@ else:
import random
import ctypeslib
import ma
- import doc
# Make these accessible from numpy name-space
# but not imported in from numpy import *
@@ -159,4 +151,4 @@ else:
'show_config'])
__all__.extend(core.__all__)
__all__.extend(lib.__all__)
- __all__.extend(['linalg', 'fft', 'random', 'ctypeslib', 'ma', 'doc'])
+ __all__.extend(['linalg', 'fft', 'random', 'ctypeslib', 'ma'])
diff --git a/numpy/doc/__init__.py b/numpy/doc/__init__.py
index 394f0b548..8664ea04d 100644
--- a/numpy/doc/__init__.py
+++ b/numpy/doc/__init__.py
@@ -1,2 +1,12 @@
-from numpy.doc.reference import *
-del reference
+import os
+
+ref_dir = os.path.join(os.path.dirname(__file__))
+
+__all__ = [f[:-3] for f in os.listdir(ref_dir) if f.endswith('.py') and
+ not f.startswith('__')]
+__all__.sort()
+
+__doc__ = 'The following topics are available:\n' + \
+ '\n - '.join([''] + __all__)
+
+__all__.extend(['__doc__'])
diff --git a/numpy/doc/reference/basics.py b/numpy/doc/basics.py
index dfb8fe74d..dfb8fe74d 100644
--- a/numpy/doc/reference/basics.py
+++ b/numpy/doc/basics.py
diff --git a/numpy/doc/reference/broadcasting.py b/numpy/doc/broadcasting.py
index 95e9b67f9..95e9b67f9 100644
--- a/numpy/doc/reference/broadcasting.py
+++ b/numpy/doc/broadcasting.py
diff --git a/numpy/doc/reference/creation.py b/numpy/doc/creation.py
index 1e80e5115..1e80e5115 100644
--- a/numpy/doc/reference/creation.py
+++ b/numpy/doc/creation.py
diff --git a/numpy/doc/reference/glossary.py b/numpy/doc/glossary.py
index 6a182adf4..6a182adf4 100644
--- a/numpy/doc/reference/glossary.py
+++ b/numpy/doc/glossary.py
diff --git a/numpy/doc/reference/howtofind.py b/numpy/doc/howtofind.py
index 29ad05318..29ad05318 100644
--- a/numpy/doc/reference/howtofind.py
+++ b/numpy/doc/howtofind.py
diff --git a/numpy/doc/reference/indexing.py b/numpy/doc/indexing.py
index 365edd67a..365edd67a 100644
--- a/numpy/doc/reference/indexing.py
+++ b/numpy/doc/indexing.py
diff --git a/numpy/doc/reference/internals.py b/numpy/doc/internals.py
index a74429368..a74429368 100644
--- a/numpy/doc/reference/internals.py
+++ b/numpy/doc/internals.py
diff --git a/numpy/doc/reference/io.py b/numpy/doc/io.py
index 3cde40bd0..3cde40bd0 100644
--- a/numpy/doc/reference/io.py
+++ b/numpy/doc/io.py
diff --git a/numpy/doc/reference/jargon.py b/numpy/doc/jargon.py
index e13ff5686..e13ff5686 100644
--- a/numpy/doc/reference/jargon.py
+++ b/numpy/doc/jargon.py
diff --git a/numpy/doc/reference/methods_vs_functions.py b/numpy/doc/methods_vs_functions.py
index 22eadccf7..22eadccf7 100644
--- a/numpy/doc/reference/methods_vs_functions.py
+++ b/numpy/doc/methods_vs_functions.py
diff --git a/numpy/doc/reference/misc.py b/numpy/doc/misc.py
index e978100bf..e978100bf 100644
--- a/numpy/doc/reference/misc.py
+++ b/numpy/doc/misc.py
diff --git a/numpy/doc/reference/performance.py b/numpy/doc/performance.py
index 1429e232f..1429e232f 100644
--- a/numpy/doc/reference/performance.py
+++ b/numpy/doc/performance.py
diff --git a/numpy/doc/reference/structured_arrays.py b/numpy/doc/structured_arrays.py
index 7bbd0deda..7bbd0deda 100644
--- a/numpy/doc/reference/structured_arrays.py
+++ b/numpy/doc/structured_arrays.py
diff --git a/numpy/doc/reference/ufuncs.py b/numpy/doc/ufuncs.py
index 4819e5268..4819e5268 100644
--- a/numpy/doc/reference/ufuncs.py
+++ b/numpy/doc/ufuncs.py