summaryrefslogtreecommitdiff
path: root/doc/source/reference/ufuncs.rst
diff options
context:
space:
mode:
authorSebastian Berg <sebastian@sipsolutions.net>2013-04-10 21:53:44 +0200
committerSebastian Berg <sebastian@sipsolutions.net>2013-04-11 23:56:17 +0200
commit5c8b89c5bec14727b1cfb710494e0889d8c6568a (patch)
tree4a18b492c771b442e437bfa6641bdb84df0c4d5a /doc/source/reference/ufuncs.rst
parent230db778beaca454a95b0fb706330b6dcbd4a8f8 (diff)
downloadnumpy-5c8b89c5bec14727b1cfb710494e0889d8c6568a.tar.gz
DOC: Document NPY_RELAXED_STRIDES_CHECKING changes
This includes documentation in the release notes, as well as the reference guide and smaller corrections. Thanks to Nathaniel for major rewriting this.
Diffstat (limited to 'doc/source/reference/ufuncs.rst')
-rw-r--r--doc/source/reference/ufuncs.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/reference/ufuncs.rst b/doc/source/reference/ufuncs.rst
index afcb1302b..dcd4ae6d0 100644
--- a/doc/source/reference/ufuncs.rst
+++ b/doc/source/reference/ufuncs.rst
@@ -321,9 +321,9 @@ advanced usage and will not typically be used.
Specifies the calculation iteration order/memory layout of the output array.
Defaults to 'K'. 'C' means the output should be C-contiguous, 'F' means
- F-contiguous, 'A' means F-contiguous if the inputs are F-contiguous, C-contiguous
- otherwise, and 'K' means to match the element ordering of the inputs
- as closely as possible.
+ F-contiguous, 'A' means F-contiguous if the inputs are F-contiguous and
+ not also not C-contiguous, C-contiguous otherwise, and 'K' means to match
+ the element ordering of the inputs as closely as possible.
*dtype*