diff options
-rw-r--r-- | doc/neps/nep-0030-duck-array-protocol.rst | 2 | ||||
-rw-r--r-- | doc/neps/nep-0031-uarray.rst | 2 | ||||
-rw-r--r-- | doc/source/dev/development_environment.rst | 2 | ||||
-rw-r--r-- | doc/source/reference/alignment.rst | 2 | ||||
-rw-r--r-- | doc/source/release/1.16.0-notes.rst | 2 | ||||
-rw-r--r-- | doc/source/release/1.16.1-notes.rst | 2 | ||||
-rw-r--r-- | doc/source/release/1.18.0-notes.rst | 2 | ||||
-rw-r--r-- | numpy/core/shape_base.py | 2 | ||||
-rw-r--r-- | tools/refguide_check.py | 4 |
9 files changed, 10 insertions, 10 deletions
diff --git a/doc/neps/nep-0030-duck-array-protocol.rst b/doc/neps/nep-0030-duck-array-protocol.rst index 353c5df1e..f98449ed6 100644 --- a/doc/neps/nep-0030-duck-array-protocol.rst +++ b/doc/neps/nep-0030-duck-array-protocol.rst @@ -114,7 +114,7 @@ An example of how the ``__duckarray__`` protocol could be used to write a seen below. The example here was chosen not only to demonstrate the usage of the ``duckarray`` function, but also to demonstrate its dependency on the NumPy API, demonstrated by checks on the array's ``shape`` attribute. Note that the -example is merely a simplified version of NumPy's actualy implementation of +example is merely a simplified version of NumPy's actually implementation of ``stack`` working on the first axis, and it is assumed that Dask has implemented the ``__duckarray__`` method. diff --git a/doc/neps/nep-0031-uarray.rst b/doc/neps/nep-0031-uarray.rst index d55719d4e..737d2b456 100644 --- a/doc/neps/nep-0031-uarray.rst +++ b/doc/neps/nep-0031-uarray.rst @@ -488,7 +488,7 @@ of three simple values: ``type``, ``value``, and ``coercible``. ``NotImplemented`` in the case of failure. ``__ua_function__`` has the signature ``(func, args, kwargs)`` and defines -the actual implementation of the function. It recieves the function and its +the actual implementation of the function. It receives the function and its arguments. Returning ``NotImplemented`` will cause a move to the default implementation of the function if one exists, and failing that, the next backend. diff --git a/doc/source/dev/development_environment.rst b/doc/source/dev/development_environment.rst index c73fb3858..874d277d8 100644 --- a/doc/source/dev/development_environment.rst +++ b/doc/source/dev/development_environment.rst @@ -53,7 +53,7 @@ When using pytest as a target (the default), you can .. note:: - Remember that all tests of NumPy should pass before commiting your changes. + Remember that all tests of NumPy should pass before committing your changes. Using ``runtests.py`` is the recommended approach to running tests. There are also a number of alternatives to it, for example in-place diff --git a/doc/source/reference/alignment.rst b/doc/source/reference/alignment.rst index ebc8f353c..5e4315b38 100644 --- a/doc/source/reference/alignment.rst +++ b/doc/source/reference/alignment.rst @@ -67,7 +67,7 @@ There are 4 relevant uses of the word ``align`` used in numpy: field alignment. In either case ``dtype.isalignedstruct`` is also set to True. * ``IsUintAligned`` is used to determine if an ndarray is "uint aligned" in - an analagous way to how ``IsAligned`` checks for true-alignment. + an analogous way to how ``IsAligned`` checks for true-alignment. Consequences of alignment ------------------------- diff --git a/doc/source/release/1.16.0-notes.rst b/doc/source/release/1.16.0-notes.rst index 1034d6e6c..e78e270f4 100644 --- a/doc/source/release/1.16.0-notes.rst +++ b/doc/source/release/1.16.0-notes.rst @@ -506,7 +506,7 @@ become more conspicuous. Now no warnings will be emitted. Umath and multiarray c-extension modules merged into a single module -------------------------------------------------------------------- The two modules were merged, according to `NEP 15`_. Previously `np.core.umath` -and `np.core.multiarray` were seperate c-extension modules. They are now python +and `np.core.multiarray` were separate c-extension modules. They are now python wrappers to the single `np.core/_multiarray_math` c-extension module. .. _`NEP 15` : http://www.numpy.org/neps/nep-0015-merge-multiarray-umath.html diff --git a/doc/source/release/1.16.1-notes.rst b/doc/source/release/1.16.1-notes.rst index 2a190ef91..d6fc25b44 100644 --- a/doc/source/release/1.16.1-notes.rst +++ b/doc/source/release/1.16.1-notes.rst @@ -58,7 +58,7 @@ Enhancements Compatibility notes =================== -* The changed error message emited by array comparison testing functions may +* The changed error message emitted by array comparison testing functions may affect doctests. See below for detail. * Casting from double and single denormals to float16 has been corrected. In diff --git a/doc/source/release/1.18.0-notes.rst b/doc/source/release/1.18.0-notes.rst index e66540410..60e11da4a 100644 --- a/doc/source/release/1.18.0-notes.rst +++ b/doc/source/release/1.18.0-notes.rst @@ -1,4 +1,4 @@ -The NumPy 1.18 release is currently in developement. Please check +The NumPy 1.18 release is currently in development. Please check the ``numpy/doc/release/upcoming_changes/`` folder for upcoming release notes. The ``numpy/doc/release/upcoming_changes/README.txt`` details how diff --git a/numpy/core/shape_base.py b/numpy/core/shape_base.py index 369d956fb..31b1c20b9 100644 --- a/numpy/core/shape_base.py +++ b/numpy/core/shape_base.py @@ -575,7 +575,7 @@ def _concatenate_shapes(shapes, axis): that was computed deeper in the recursion. These are returned as tuples to ensure that they can quickly be added - to existing slice tuple without creating a new tuple everytime. + to existing slice tuple without creating a new tuple every time. """ # Cache a result that will be reused. diff --git a/tools/refguide_check.py b/tools/refguide_check.py index a71279173..2c628091f 100644 --- a/tools/refguide_check.py +++ b/tools/refguide_check.py @@ -934,8 +934,8 @@ def main(argv): parser.add_argument("--doctest-warnings", action="store_true", help="Enforce warning checking for doctests") parser.add_argument("--rst", nargs='?', const='doc', default=None, - help=("Run also examples from *rst files" - "dicovered walking the directory(s) specified, " + help=("Run also examples from *rst files " + "discovered walking the directory(s) specified, " "defaults to 'doc'")) args = parser.parse_args(argv) |