summaryrefslogtreecommitdiff
path: root/numpy/linalg/linalg.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2019-11-25 13:14:19 -0700
committerGitHub <noreply@github.com>2019-11-25 13:14:19 -0700
commitb2747fbb920da098a06e3f7fcf7d0952b9be4af0 (patch)
tree6318e1ac9e603de84243d81f12c0a158df4964e2 /numpy/linalg/linalg.py
parentfb3e779ef2e3133fd5ed7acf2b8de81d31248197 (diff)
downloadnumpy-b2747fbb920da098a06e3f7fcf7d0952b9be4af0.tar.gz
MAINT: Small clarification spelling fixes.
Diffstat (limited to 'numpy/linalg/linalg.py')
-rw-r--r--numpy/linalg/linalg.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index d38ab9d05..f1b2c2228 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -2326,18 +2326,18 @@ def norm(x, ord=None, axis=None, keepdims=False):
----------
x : array_like
Input array. If `axis` is None, `x` must be 1-D or 2-D, unless `ord`
- is None. If both `axis` is None and `ord` is None, a vector norm of
- ``x.ravel`` wil be returned.
+ is None. If both `axis` and `ord` are None, the 2-norm of
+ ``x.ravel`` will be returned.
ord : {non-zero int, inf, -inf, 'fro', 'nuc'}, optional
Order of the norm (see table under ``Notes``). inf means numpy's
- `inf` object. Default is None.
+ `inf` object. The default is None.
axis : {None, int, 2-tuple of ints}, optional.
If `axis` is an integer, it specifies the axis of `x` along which to
compute the vector norms. If `axis` is a 2-tuple, it specifies the
axes that hold 2-D matrices, and the matrix norms of these matrices
are computed. If `axis` is None then either a vector norm (when `x`
- is 1-D) or a matrix norm (when `x` is 2-D) is returned. Default is
- None.
+ is 1-D) or a matrix norm (when `x` is 2-D) is returned. The default
+ is None.
.. versionadded:: 1.8.0