summaryrefslogtreecommitdiff
path: root/doc/CAPI.rst.txt
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-08-18 11:16:06 -0600
committerCharles Harris <charlesr.harris@gmail.com>2013-08-18 11:20:45 -0600
commit8ddb0ce0acafe75d78df528b4d2540dfbf4b364d (patch)
tree156b23f48f14c7c1df699874007c521b5482d1a4 /doc/CAPI.rst.txt
parent13b0b272f764c14bc4ac34f5b19fd030d9c611a4 (diff)
downloadpython-numpy-8ddb0ce0acafe75d78df528b4d2540dfbf4b364d.tar.gz
python-numpy-8ddb0ce0acafe75d78df528b4d2540dfbf4b364d.tar.bz2
python-numpy-8ddb0ce0acafe75d78df528b4d2540dfbf4b364d.zip
STY: Giant whitespace cleanup.
Now is as good a time as any with open PR's at a low.
Diffstat (limited to 'doc/CAPI.rst.txt')
-rw-r--r--doc/CAPI.rst.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/CAPI.rst.txt b/doc/CAPI.rst.txt
index 41241ce5a..4bd51baca 100644
--- a/doc/CAPI.rst.txt
+++ b/doc/CAPI.rst.txt
@@ -15,7 +15,7 @@ of the API) that will need to be changed:
* If you used any of the function pointers in the ``PyArray_Descr``
structure you will have to modify your usage of those. First,
- the pointers are all under the member named ``f``. So ``descr->cast``
+ the pointers are all under the member named ``f``. So ``descr->cast``
is now ``descr->f->cast``. In addition, the
casting functions have eliminated the strides argument (use
``PyArray_CastTo`` if you need strided casting). All functions have
@@ -238,7 +238,7 @@ segfaults may result.
There are 6 (binary) flags that describe the memory area used by the
data buffer. These constants are defined in ``arrayobject.h`` and
determine the bit-position of the flag. Python exposes a nice attribute-
-based interface as well as a dictionary-like interface for getting
+based interface as well as a dictionary-like interface for getting
(and, if appropriate, setting) these flags.
Memory areas of all kinds can be pointed to by an ndarray, necessitating
@@ -254,7 +254,7 @@ PyArray_FromAny function.
``NPY_FORTRAN``
True if the array is (Fortran-style) contiguous in memory.
-Notice that contiguous 1-d arrays are always both ``NPY_FORTRAN`` contiguous
+Notice that contiguous 1-d arrays are always both ``NPY_FORTRAN`` contiguous
and C contiguous. Both of these flags can be checked and are convenience
flags only as whether or not an array is ``NPY_CONTIGUOUS`` or ``NPY_FORTRAN``
can be determined by the ``strides``, ``dimensions``, and ``itemsize``