summaryrefslogtreecommitdiff
path: root/numpy/core/numeric.py
diff options
context:
space:
mode:
authorrgommers <ralf.gommers@googlemail.com>2011-03-02 12:55:04 +0800
committerrgommers <ralf.gommers@googlemail.com>2011-03-02 13:23:49 +0800
commit68e33f93d49d39cfd3789d85224a65036f03ee11 (patch)
tree67f413c015e877fe2fcbe13d7df451c28cc481fc /numpy/core/numeric.py
parent4ca2465fe169576b46dee783dd0279cfd536d9c4 (diff)
downloadnumpy-68e33f93d49d39cfd3789d85224a65036f03ee11.tar.gz
DOC: merge wiki edits for numpy.core.
Diffstat (limited to 'numpy/core/numeric.py')
-rw-r--r--numpy/core/numeric.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index fc935b4cb..fa9f19165 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -66,7 +66,7 @@ def zeros_like(a, dtype=None, order='K'):
"""
Return an array of zeros with the same shape and type as a given array.
- With default paramters, is equivalent to ``a.copy().fill(0)``.
+ With default parameters, is equivalent to ``a.copy().fill(0)``.
Parameters
----------
@@ -77,8 +77,8 @@ def zeros_like(a, dtype=None, order='K'):
Overrides the data type of the result.
order : {'C', 'F', 'A', or 'K'}, optional
Overrides the memory layout of the result. 'C' means C-order,
- 'F' means F-order, 'A' means 'F' if ``a`` is Fortran contiguous,
- 'C' otherwise. 'K' means match the layout of ``a`` as closely
+ 'F' means F-order, 'A' means 'F' if `a` is Fortran contiguous,
+ 'C' otherwise. 'K' means match the layout of `a` as closely
as possible.
Returns
@@ -763,7 +763,7 @@ def outer(a,b):
See also
--------
- numpy.inner, numpy.einsum
+ inner, einsum
References
----------
@@ -855,7 +855,7 @@ def tensordot(a, b, axes=2):
See Also
--------
- numpy.dot, numpy.einsum
+ dot, einsum
Notes
-----