summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscoder <stefan_ml@behnel.de>2018-04-08 14:43:57 +0200
committerGitHub <noreply@github.com>2018-04-08 14:43:57 +0200
commit59f26d1896afa71bd1409fee20b24380da293079 (patch)
tree1246688fe3caa645a77f9db09e1157875f1e2466
parentd883b86f92a724a4d61fcbf97cb35c70d558c610 (diff)
parent81c0e8da1d0a8eb45c18a076a8cf518e50fa0c59 (diff)
downloadcython-59f26d1896afa71bd1409fee20b24380da293079.tar.gz
Merge pull request #2187 from luzpaz/misc-typos
Misc. typos
-rw-r--r--Cython/Includes/cpython/long.pxd2
-rw-r--r--Cython/Includes/cpython/pystate.pxd2
-rw-r--r--Cython/Includes/libcpp/deque.pxd2
-rw-r--r--Cython/Includes/libcpp/vector.pxd2
-rw-r--r--docs/src/reference/compilation.rst2
-rw-r--r--docs/src/userguide/numpy_tutorial.rst4
6 files changed, 7 insertions, 7 deletions
diff --git a/Cython/Includes/cpython/long.pxd b/Cython/Includes/cpython/long.pxd
index a5b0fc0a2..eb8140d41 100644
--- a/Cython/Includes/cpython/long.pxd
+++ b/Cython/Includes/cpython/long.pxd
@@ -146,4 +146,4 @@ cdef extern from "Python.h":
# pointer. If pylong cannot be converted, an OverflowError will be
# raised. This is only assured to produce a usable void pointer
# for values created with PyLong_FromVoidPtr(). For values outside
- # 0..LONG_MAX, both signed and unsigned integers are acccepted.
+ # 0..LONG_MAX, both signed and unsigned integers are accepted.
diff --git a/Cython/Includes/cpython/pystate.pxd b/Cython/Includes/cpython/pystate.pxd
index f58503f9e..9c3b4a0ed 100644
--- a/Cython/Includes/cpython/pystate.pxd
+++ b/Cython/Includes/cpython/pystate.pxd
@@ -4,7 +4,7 @@ from .object cimport PyObject
cdef extern from "Python.h":
- # We make these an opague types. If the user wants specific attributes,
+ # We make these an opaque types. If the user wants specific attributes,
# they can be declared manually.
ctypedef struct PyInterpreterState:
diff --git a/Cython/Includes/libcpp/deque.pxd b/Cython/Includes/libcpp/deque.pxd
index 78862e5e0..675cf595d 100644
--- a/Cython/Includes/libcpp/deque.pxd
+++ b/Cython/Includes/libcpp/deque.pxd
@@ -5,7 +5,7 @@ cdef extern from "<deque>" namespace "std" nogil:
# these should really be allocator_type.size_type and
# allocator_type.difference_type to be true to the C++ definition
- # but cython doesn't support defered access on template arguments
+ # but cython doesn't support deferred access on template arguments
ctypedef size_t size_type
ctypedef ptrdiff_t difference_type
diff --git a/Cython/Includes/libcpp/vector.pxd b/Cython/Includes/libcpp/vector.pxd
index 4f21dd3b9..0c03762e3 100644
--- a/Cython/Includes/libcpp/vector.pxd
+++ b/Cython/Includes/libcpp/vector.pxd
@@ -5,7 +5,7 @@ cdef extern from "<vector>" namespace "std" nogil:
# these should really be allocator_type.size_type and
# allocator_type.difference_type to be true to the C++ definition
- # but cython doesn't support defered access on template arguments
+ # but cython doesn't support deferred access on template arguments
ctypedef size_t size_type
ctypedef ptrdiff_t difference_type
diff --git a/docs/src/reference/compilation.rst b/docs/src/reference/compilation.rst
index 34f2bf260..cb74ad581 100644
--- a/docs/src/reference/compilation.rst
+++ b/docs/src/reference/compilation.rst
@@ -479,7 +479,7 @@ You can see them also by typing ```%%cython?`` in IPython or a Jupyter notebook.
-l LIB, --lib LIB Add a library to link the extension against (can be specified multiple times).
--L dir Add a path to the list of libary directories (can be specified multiple times).
+-L dir Add a path to the list of library directories (can be specified multiple times).
-I INCLUDE, --include INCLUDE Add a path to the list of include directories (can be specified multiple times).
diff --git a/docs/src/userguide/numpy_tutorial.rst b/docs/src/userguide/numpy_tutorial.rst
index af2419563..76f2effb3 100644
--- a/docs/src/userguide/numpy_tutorial.rst
+++ b/docs/src/userguide/numpy_tutorial.rst
@@ -214,7 +214,7 @@ After building this and continuing my (very informal) benchmarks, I get:
So in the end, adding types make the Cython code slower?
-What happend is that most of the time spend in this code is spent on line
+What happened is that most of the time spend in this code is spent on line
54. ::
value += g[smid - s, tmid - t] * f[v, w]
@@ -404,7 +404,7 @@ code work for multiple NumPy data types?
Yes, with the help of a new feature called fused types.
You can learn more about it at :ref:`this section of the documentation
<fusedtypes>`.
-It is similar to C++ 's templates. It generates mutiple function declarations
+It is similar to C++ 's templates. It generates multiple function declarations
at compile time, and then chooses the right one at run-time based on the
types of the arguments provided. By comparing types in if-conditions, it
is also possible to execute entirely different code paths depending