summaryrefslogtreecommitdiff
path: root/numpy/matlib.py
diff options
context:
space:
mode:
authorGabor Kovacs <kgabor79@gmail.com>2014-08-23 17:50:10 +0100
committerCharles Harris <charlesr.harris@gmail.com>2015-06-21 15:44:25 -0600
commit4e5545f0bcc654fb0c6752dcf72120e6e7340d28 (patch)
tree83775e28968635ac9588c021280469599b0a520b /numpy/matlib.py
parente3b2bc0b0f31482cd112660393245116ae55ecbf (diff)
downloadnumpy-4e5545f0bcc654fb0c6752dcf72120e6e7340d28.tar.gz
DOC: Update docs.
Update docs for boolean array indexing and nonzero order. Add links to row-major and column-major terms where they appear. Closes #3177
Diffstat (limited to 'numpy/matlib.py')
-rw-r--r--numpy/matlib.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/matlib.py b/numpy/matlib.py
index 677400367..656ca3458 100644
--- a/numpy/matlib.py
+++ b/numpy/matlib.py
@@ -11,8 +11,7 @@ __all__ = np.__all__[:] # copy numpy namespace
__all__ += ['rand', 'randn', 'repmat']
def empty(shape, dtype=None, order='C'):
- """
- Return a new matrix of given shape and type, without initializing entries.
+ """Return a new matrix of given shape and type, without initializing entries.
Parameters
----------
@@ -21,8 +20,9 @@ def empty(shape, dtype=None, order='C'):
dtype : data-type, optional
Desired output data-type.
order : {'C', 'F'}, optional
- Whether to store multi-dimensional data in C (row-major) or
- Fortran (column-major) order in memory.
+ Whether to store multi-dimensional data in row-major
+ (C-style) or column-major (Fortran-style) order in
+ memory.
See Also
--------