Skip to content

Commit

Permalink
Merge pull request #7114 from dongjoon-hyun/fix_typos_in_doc
Browse files Browse the repository at this point in the history
MAINT: Fix typos in docs
  • Loading branch information
jaimefrio committed Jan 25, 2016
2 parents d641eed + df9df7f commit e0acd3f
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion doc/CAPI.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ This is a very flexible function.
array of the type to be created (so the ``__array_finalize__`` method
must handle an array argument. But, it can be anything...)

Note: The returned array object will be unitialized unless the type is
Note: The returned array object will be uninitialized unless the type is
``PyArray_OBJECT`` in which case the memory will be set to ``NULL``.

``PyArray_SimpleNew(nd, dims, typenum)`` is a drop-in replacement for
Expand Down
8 changes: 4 additions & 4 deletions doc/DISTUTILS.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Below is an example of a minimal ``setup.py`` file for a pure SciPy package::
#setup(**configuration(top_path='').todict())
setup(configuration=configuration)

The arguments of the ``configuration`` function specifiy the name of
The arguments of the ``configuration`` function specify the name of
parent SciPy package (``parent_package``) and the directory location
of the main ``setup.py`` script (``top_path``). These arguments,
along with the name of the current package, should be passed to the
Expand Down Expand Up @@ -269,10 +269,10 @@ in writing setup scripts:
more information on arguments.

+ ``config.have_f77c()`` --- return True if Fortran 77 compiler is
available (read: a simple Fortran 77 code compiled succesfully).
available (read: a simple Fortran 77 code compiled successfully).

+ ``config.have_f90c()`` --- return True if Fortran 90 compiler is
available (read: a simple Fortran 90 code compiled succesfully).
available (read: a simple Fortran 90 code compiled successfully).

+ ``config.get_version()`` --- return version string of the current package,
``None`` if version information could not be detected. This methods
Expand Down Expand Up @@ -426,7 +426,7 @@ at some point.
Extra features in NumPy Distutils
'''''''''''''''''''''''''''''''''

Specifing config_fc options for libraries in setup.py script
Specifying config_fc options for libraries in setup.py script
------------------------------------------------------------

It is possible to specify config_fc options in setup.py scripts.
Expand Down
2 changes: 1 addition & 1 deletion doc/f2py/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<HTML>
<HEAD>
<META name="Author" content="Pearu Peterson">
<!-- You may add here some keywords (comma separeted list) -->
<!-- You may add here some keywords (comma separated list) -->
<META name="Keywords" content="fortran,python,interface,f2py,f2py2e,wrapper,fpig">
<TITLE>F2PY - Fortran to Python Interface Generator</TITLE>
<LINK rel="stylesheet" type="text/css" href="/styles/userstyle.css">
Expand Down
8 changes: 4 additions & 4 deletions doc/neps/return-of-revenge-of-matmul-pep.rst
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ numeric operators also apply in an elementwise manner to arrays; the
reverse convention would lead to more special cases.)

So that's why matrix multiplication doesn't and can't just use ``*``.
Now, in the the rest of this section, we'll explain why it nonetheless
Now, in the rest of this section, we'll explain why it nonetheless
meets the high bar for adding a new operator.


Expand Down Expand Up @@ -451,7 +451,7 @@ appear in many important applications, and that numerical libraries
like numpy are used by a substantial proportion of Python's user base.
But numerical libraries aren't just about matrix formulas, and being
important doesn't necessarily mean taking up a lot of code: if matrix
formulas only occured in one or two places in the average
formulas only occurred in one or two places in the average
numerically-oriented project, then it still wouldn't be worth adding a
new operator. So how common is matrix multiplication, really?

Expand Down Expand Up @@ -1107,7 +1107,7 @@ by other means, and that causes painful reverberations through the
larger ecosystem. Defining a new language (presumably with its own
parser which would have to be kept in sync with Python's, etc.), just
to support a single binary operator, is neither practical nor
desireable. In the numerical context, Python's competition is
desirable. In the numerical context, Python's competition is
special-purpose numerical languages (Matlab, R, IDL, etc.). Compared
to these, Python's killer feature is exactly that one can mix
specialized numerical code with code for XML parsing, web page
Expand Down Expand Up @@ -1195,7 +1195,7 @@ References
test the null hypothesis that :math:`H\beta = r`; a large :math:`S`
then indicates that this hypothesis is unlikely to be true. For
example, in an analysis of human height, the vector :math:`\beta`
might contain one value which was the the average height of the
might contain one value which was the average height of the
measured men, and another value which was the average height of the
measured women, and then setting :math:`H = [1, -1], r = 0` would
let us test whether men and women are the same height on
Expand Down
2 changes: 1 addition & 1 deletion doc/source/reference/arrays.ndarray.rst
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ Truth value of an array (:func:`bool()`):

Truth-value testing of an array invokes
:meth:`ndarray.__nonzero__`, which raises an error if the number of
elements in the the array is larger than 1, because the truth value
elements in the array is larger than 1, because the truth value
of such arrays is ambiguous. Use :meth:`.any() <ndarray.any>` and
:meth:`.all() <ndarray.all>` instead to be clear about what is meant
in such cases. (If the number of elements is 0, the array evaluates
Expand Down
2 changes: 1 addition & 1 deletion doc/source/reference/c-api.array.rst
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ From scratch
.. c:function:: PyObject* PyArray_SimpleNew(int nd, npy_intp* dims, int typenum)
Create a new unitialized array of type, *typenum*, whose size in
Create a new uninitialized array of type, *typenum*, whose size in
each of *nd* dimensions is given by the integer array, *dims*.
This function cannot be used to create a flexible-type array (no
itemsize given).
Expand Down
2 changes: 1 addition & 1 deletion doc/source/reference/c-api.iterator.rst
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ Construction and Destruction
If the operand is flagged as write-only and a copy is needed,
an uninitialized temporary array will be created and then copied
to back to ``op[i]`` on destruction, instead of doing
the unecessary copy operation.
the unnecessary copy operation.
.. c:var:: NPY_ITER_NBO
.. c:var:: NPY_ITER_ALIGNED
Expand Down
2 changes: 1 addition & 1 deletion doc/source/reference/c-api.types-and-structures.rst
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ PyArrayDescr_Type
represents signed integer, a 'u' represents unsigned integer, 'f'
represents floating point, 'c' represents complex floating point, 'S'
represents 8-bit character string, 'U' represents 32-bit/character
unicode string, and 'V' repesents arbitrary.
unicode string, and 'V' represents arbitrary.

.. c:member:: char PyArray_Descr.type
Expand Down
2 changes: 1 addition & 1 deletion doc/source/reference/distutils.rst
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ for these files are:
equivalent to #name=item1, item2, item1, item2, item1, item2, item1,
item2#

4. "\*/ "on a line by itself marks the end of the the variable expansion
4. "\*/ "on a line by itself marks the end of the variable expansion
naming. The next line is the first line that will be repeated using
the named rules.

Expand Down
2 changes: 1 addition & 1 deletion doc/source/reference/swig.interface-file.rst
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ Routines
* ``PyArrayObject* ary``, a NumPy array.

Require the given ``PyArrayObject`` to to be Fortran ordered. If
the the ``PyArrayObject`` is already Fortran ordered, do nothing.
the ``PyArrayObject`` is already Fortran ordered, do nothing.
Else, set the Fortran ordering flag and recompute the strides.


Expand Down
2 changes: 1 addition & 1 deletion doc/source/user/building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Building from source
====================

A general overview of building NumPy from source is given here, with detailed
instructions for specific platforms given seperately.
instructions for specific platforms given separately.

Prerequisites
-------------
Expand Down
2 changes: 1 addition & 1 deletion doc/source/user/c-info.ufunc-tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ automatically generates a ufunc from a C function with the correct signature.
*unused*
Unused; kept for compatiblity. Just set it to zero.
Unused; kept for compatibility. Just set it to zero.
.. index::
pair: ufunc; adding new
Expand Down

0 comments on commit e0acd3f

Please sign in to comment.