diff options
author | Matti Picus <matti.picus@gmail.com> | 2020-05-17 12:35:57 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-17 12:35:57 +0300 |
commit | bd8be5417632c019dbc1d36400052805f95a372c (patch) | |
tree | a10a8a468d7d7dd0d25f5b6ac53a7f7b4b37053a /doc/source | |
parent | 125b0c82053c42c43d1b4b36c6184ae71c75c548 (diff) | |
parent | 0a2893149e88e5c5bb69a29f78a4ad262a08cd29 (diff) | |
download | numpy-bd8be5417632c019dbc1d36400052805f95a372c.tar.gz |
Merge pull request #16269 from tbm/typo
DOC: Fix typos and cosmetic issues
Diffstat (limited to 'doc/source')
-rw-r--r-- | doc/source/reference/arrays.indexing.rst | 2 | ||||
-rw-r--r-- | doc/source/reference/c-api/array.rst | 2 | ||||
-rw-r--r-- | doc/source/reference/random/performance.rst | 4 | ||||
-rw-r--r-- | doc/source/reference/ufuncs.rst | 2 | ||||
-rw-r--r-- | doc/source/user/c-info.how-to-extend.rst | 2 | ||||
-rw-r--r-- | doc/source/user/c-info.python-as-glue.rst | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/doc/source/reference/arrays.indexing.rst b/doc/source/reference/arrays.indexing.rst index a425b6e8b..56b99f272 100644 --- a/doc/source/reference/arrays.indexing.rst +++ b/doc/source/reference/arrays.indexing.rst @@ -117,7 +117,7 @@ concepts to remember include: array([5, 6, 7, 8, 9]) - If the number of objects in the selection tuple is less than - *N* , then ``:`` is assumed for any subsequent dimensions. + *N*, then ``:`` is assumed for any subsequent dimensions. .. admonition:: Example diff --git a/doc/source/reference/c-api/array.rst b/doc/source/reference/c-api/array.rst index 83289010b..56fc59da3 100644 --- a/doc/source/reference/c-api/array.rst +++ b/doc/source/reference/c-api/array.rst @@ -1886,7 +1886,7 @@ Item selection and manipulation Equivalent to :meth:`ndarray.sort<numpy.ndarray.sort>` (*self*, *axis*, *kind*). Return an array with the items of *self* sorted along *axis*. The array - is sorted using the algorithm denoted by *kind* , which is an integer/enum pointing + is sorted using the algorithm denoted by *kind*, which is an integer/enum pointing to the type of sorting algorithms used. .. c:function:: PyObject* PyArray_ArgSort(PyArrayObject* self, int axis) diff --git a/doc/source/reference/random/performance.rst b/doc/source/reference/random/performance.rst index d70dd064a..74dad4cc3 100644 --- a/doc/source/reference/random/performance.rst +++ b/doc/source/reference/random/performance.rst @@ -81,7 +81,7 @@ performance was computed using a geometric mean. .. note:: - All timings were taken using Linux on a i5-3570 processor. + All timings were taken using Linux on an i5-3570 processor. Performance on different Operating Systems ****************************************** @@ -150,4 +150,4 @@ Exponentials 100 33.7 26.3 109.8 Linux timings used Ubuntu 18.04 and GCC 7.4. Windows timings were made on Windows 10 using Microsoft C/C++ Optimizing Compiler Version 19 (Visual - Studio 2015). All timings were produced on a i5-3570 processor. + Studio 2015). All timings were produced on an i5-3570 processor. diff --git a/doc/source/reference/ufuncs.rst b/doc/source/reference/ufuncs.rst index aad285122..6d58d1a6d 100644 --- a/doc/source/reference/ufuncs.rst +++ b/doc/source/reference/ufuncs.rst @@ -380,7 +380,7 @@ advanced usage and will not typically be used. result as a dimension with size one, so that the result will broadcast correctly against the inputs. This option can only be used for generalized ufuncs that operate on inputs that all have the same number of core - dimensions and with outputs that have no core dimensions , i.e., with + dimensions and with outputs that have no core dimensions, i.e., with signatures like ``(i),(i)->()`` or ``(m,m)->()``. If used, the location of the dimensions in the output can be controlled with ``axes`` and ``axis``. diff --git a/doc/source/user/c-info.how-to-extend.rst b/doc/source/user/c-info.how-to-extend.rst index 7aeed57cf..d75242092 100644 --- a/doc/source/user/c-info.how-to-extend.rst +++ b/doc/source/user/c-info.how-to-extend.rst @@ -163,7 +163,7 @@ ignored. The *args* argument contains all of the arguments passed in to the function as a tuple. You can do anything you want at this point, but usually the easiest way to manage the input arguments is to call :c:func:`PyArg_ParseTuple` (args, format_string, -addresses_to_C_variables...) or :c:func:`PyArg_UnpackTuple` (tuple, "name" , +addresses_to_C_variables...) or :c:func:`PyArg_UnpackTuple` (tuple, "name", min, max, ...). A good description of how to use the first function is contained in the Python C-API reference manual under section 5.5 (Parsing arguments and building values). You should pay particular diff --git a/doc/source/user/c-info.python-as-glue.rst b/doc/source/user/c-info.python-as-glue.rst index 201bd8417..9fe5f8f6e 100644 --- a/doc/source/user/c-info.python-as-glue.rst +++ b/doc/source/user/c-info.python-as-glue.rst @@ -671,7 +671,7 @@ simply have a shared library available to you). Items to remember are: - A shared library must be compiled in a special way ( *e.g.* using the ``-shared`` flag with gcc). -- On some platforms (*e.g.* Windows) , a shared library requires a +- On some platforms (*e.g.* Windows), a shared library requires a .def file that specifies the functions to be exported. For example a mylib.def file might contain:: @@ -802,7 +802,7 @@ Calling the function The function is accessed as an attribute of or an item from the loaded shared-library. Thus, if ``./mylib.so`` has a function named -``cool_function1`` , I could access this function either as: +``cool_function1``, I could access this function either as: .. code-block:: python |