summaryrefslogtreecommitdiff
path: root/doc/source/reference/routines.matlib.rst
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@googlemail.com>2012-07-07 14:29:45 +0200
committerRalf Gommers <ralf.gommers@googlemail.com>2012-07-07 14:29:45 +0200
commit5df8f24ba2ccf97b0fabd60d3f215be8f03a08bc (patch)
tree56cd744f0366f9a124f8730f86dbf2808d3f80a5 /doc/source/reference/routines.matlib.rst
parent3b9a0fea12ae89fe6ce745d9af0beb3df17260b8 (diff)
downloadnumpy-5df8f24ba2ccf97b0fabd60d3f215be8f03a08bc.tar.gz
DOC: merge wiki docs - edits under doc/.
Diffstat (limited to 'doc/source/reference/routines.matlib.rst')
-rw-r--r--doc/source/reference/routines.matlib.rst27
1 files changed, 26 insertions, 1 deletions
diff --git a/doc/source/reference/routines.matlib.rst b/doc/source/reference/routines.matlib.rst
index 7f8a9eabb..a35eaec78 100644
--- a/doc/source/reference/routines.matlib.rst
+++ b/doc/source/reference/routines.matlib.rst
@@ -7,5 +7,30 @@ This module contains all functions in the :mod:`numpy` namespace, with
the following replacement functions that return :class:`matrices
<matrix>` instead of :class:`ndarrays <ndarray>`.
-.. automodule:: numpy.matlib
+.. currentmodule:: numpy
+
+Functions that are also in the numpy namespace and return matrices
+
+.. autosummary::
+
+ mat
+ matrix
+ asmatrix
+ bmat
+
+
+Replacement functions in `matlib`
+
+.. currentmodule:: numpy.matlib
+
+.. autosummary::
+ :toctree: generated/
+ empty
+ zeros
+ ones
+ eye
+ identity
+ repmat
+ rand
+ randn