diff --git a/doc/source/tutorial/weave.rst b/doc/source/tutorial/weave.rst index 6ed8377fe661..12cff1949d27 100644 --- a/doc/source/tutorial/weave.rst +++ b/doc/source/tutorial/weave.rst @@ -1254,7 +1254,7 @@ TypeError. if(PyCallable_Check(py_obj) && PyInstance_Check(py_obj)) return "callable"; if(PyInstance_Check(py_obj)) return "instance"; if(PyCallable_Check(py_obj)) return "callable"; - return "unkown type"; + return "unknown type"; } Since the ``inline`` is also executed within the ``try/catch`` block, you can diff --git a/scipy/sparse/sparsetools/numpy.i b/scipy/sparse/sparsetools/numpy.i index 16c94cf3179f..3764666170c6 100644 --- a/scipy/sparse/sparsetools/numpy.i +++ b/scipy/sparse/sparsetools/numpy.i @@ -42,7 +42,7 @@ static const char* pytype_string(PyObject* py_obj) { if (PyModule_Check( py_obj)) return "module" ; if (PyInstance_Check(py_obj)) return "instance" ; - return "unkown type"; + return "unknown type"; } /* Given a NumPy typecode, return a string describing the type. diff --git a/scipy/spatial/qhull.pyx b/scipy/spatial/qhull.pyx index e28b15981bb5..bc6e6debdd3d 100644 --- a/scipy/spatial/qhull.pyx +++ b/scipy/spatial/qhull.pyx @@ -981,7 +981,7 @@ class Delaunay(object): Notes ----- - The tesselation is computed using the Qhull libary [Qhull]_. + The tesselation is computed using the Qhull library [Qhull]_. .. versionadded:: 0.9 diff --git a/scipy/special/add_newdocs.py b/scipy/special/add_newdocs.py index f1a5fd8a4e1a..b1ba1cb939a0 100755 --- a/scipy/special/add_newdocs.py +++ b/scipy/special/add_newdocs.py @@ -825,7 +825,7 @@ def add_newdoc(place, name, doc): add_newdoc("scipy.special", "kelvin", """ - (Be, Ke, Bep, Kep)=kelvin(x) returns the tuple (Be, Ke, Bep, Kep) which containes + (Be, Ke, Bep, Kep)=kelvin(x) returns the tuple (Be, Ke, Bep, Kep) which contains complex numbers representing the real and imaginary Kelvin functions and their derivatives evaluated at x. For example, kelvin(x)[0].real = ber x and kelvin(x)[0].imag = bei x with similar @@ -1085,14 +1085,14 @@ def add_newdoc(place, name, doc): add_newdoc("scipy.special", "obl_ang1", """ (s,sp)=obl_ang1(m,n,c,x) computes the oblate sheroidal angular function - of the first kind and its derivative (with respect to x) for mode paramters + of the first kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. """) add_newdoc("scipy.special", "obl_ang1_cv", """ (s,sp)=obl_ang1_cv(m,n,c,cv,x) computes the oblate sheroidal angular function - of the first kind and its derivative (with respect to x) for mode paramters + of the first kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed characteristic value. """) @@ -1106,14 +1106,14 @@ def add_newdoc(place, name, doc): add_newdoc("scipy.special", "obl_rad1", """ (s,sp)=obl_rad1(m,n,c,x) computes the oblate sheroidal radial function - of the first kind and its derivative (with respect to x) for mode paramters + of the first kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. """) add_newdoc("scipy.special", "obl_rad1_cv", """ (s,sp)=obl_rad1_cv(m,n,c,cv,x) computes the oblate sheroidal radial function - of the first kind and its derivative (with respect to x) for mode paramters + of the first kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed characteristic value. """) @@ -1121,14 +1121,14 @@ def add_newdoc(place, name, doc): add_newdoc("scipy.special", "obl_rad2", """ (s,sp)=obl_rad2(m,n,c,x) computes the oblate sheroidal radial function - of the second kind and its derivative (with respect to x) for mode paramters + of the second kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. """) add_newdoc("scipy.special", "obl_rad2_cv", """ (s,sp)=obl_rad2_cv(m,n,c,cv,x) computes the oblate sheroidal radial function - of the second kind and its derivative (with respect to x) for mode paramters + of the second kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed characteristic value. """) @@ -1182,14 +1182,14 @@ def add_newdoc(place, name, doc): add_newdoc("scipy.special", "pro_ang1", """ (s,sp)=pro_ang1(m,n,c,x) computes the prolate sheroidal angular function - of the first kind and its derivative (with respect to x) for mode paramters + of the first kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. """) add_newdoc("scipy.special", "pro_ang1_cv", """ (s,sp)=pro_ang1_cv(m,n,c,cv,x) computes the prolate sheroidal angular function - of the first kind and its derivative (with respect to x) for mode paramters + of the first kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed characteristic value. """) @@ -1203,14 +1203,14 @@ def add_newdoc(place, name, doc): add_newdoc("scipy.special", "pro_rad1", """ (s,sp)=pro_rad1(m,n,c,x) computes the prolate sheroidal radial function - of the first kind and its derivative (with respect to x) for mode paramters + of the first kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. """) add_newdoc("scipy.special", "pro_rad1_cv", """ (s,sp)=pro_rad1_cv(m,n,c,cv,x) computes the prolate sheroidal radial function - of the first kind and its derivative (with respect to x) for mode paramters + of the first kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed characteristic value. """) @@ -1218,14 +1218,14 @@ def add_newdoc(place, name, doc): add_newdoc("scipy.special", "pro_rad2", """ (s,sp)=pro_rad2(m,n,c,x) computes the prolate sheroidal radial function - of the second kind and its derivative (with respect to x) for mode paramters + of the second kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and |x|<1.0. """) add_newdoc("scipy.special", "pro_rad2_cv", """ (s,sp)=pro_rad2_cv(m,n,c,cv,x) computes the prolate sheroidal radial function - of the second kind and its derivative (with respect to x) for mode paramters + of the second kind and its derivative (with respect to x) for mode parameters m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed characteristic value. """) diff --git a/scipy/weave/common_info.py b/scipy/weave/common_info.py index 3b71348e0514..814ca50e3559 100644 --- a/scipy/weave/common_info.py +++ b/scipy/weave/common_info.py @@ -32,7 +32,7 @@ if(PyCallable_Check(py_obj) && PyInstance_Check(py_obj)) return "callable"; if(PyInstance_Check(py_obj)) return "instance"; if(PyCallable_Check(py_obj)) return "callable"; - return "unkown type"; + return "unknown type"; } void throw_error(PyObject* exc, const char* msg) diff --git a/scipy/weave/cpp_namespace_spec.py b/scipy/weave/cpp_namespace_spec.py index e75196bb6abd..ebd25f25d58b 100755 --- a/scipy/weave/cpp_namespace_spec.py +++ b/scipy/weave/cpp_namespace_spec.py @@ -54,7 +54,7 @@ class ft_converter(cpp_namespace_converter): class cpp_namespace_converter(base_converter): _build_information = [common_info.swig_info()] def __init__(self,class_name=None): - self.type_name = 'unkown cpp_object' + self.type_name = 'unknown cpp_object' self.name = 'no name' if class_name: # customize support_code for whatever type I was handed. diff --git a/scipy/weave/doc/tutorial.txt b/scipy/weave/doc/tutorial.txt index 544dee24227e..2a7720400fa8 100644 --- a/scipy/weave/doc/tutorial.txt +++ b/scipy/weave/doc/tutorial.txt @@ -1248,7 +1248,7 @@ TypeError. if(PyCallable_Check(py_obj) && PyInstance_Check(py_obj)) return "callable"; if(PyInstance_Check(py_obj)) return "instance"; if(PyCallable_Check(py_obj)) return "callable"; - return "unkown type"; + return "unknown type"; } Since the ``inline`` is also executed within the ``try/catch`` block, you can diff --git a/scipy/weave/doc/tutorial_original.html b/scipy/weave/doc/tutorial_original.html index 931470cdac92..2aed7fcae08b 100644 --- a/scipy/weave/doc/tutorial_original.html +++ b/scipy/weave/doc/tutorial_original.html @@ -1348,7 +1348,7 @@

A quick look at the code

if(PyCallable_Check(py_obj) && PyInstance_Check(py_obj)) return "callable"; if(PyInstance_Check(py_obj)) return "instance"; if(PyCallable_Check(py_obj)) return "callable"; - return "unkown type"; + return "unknown type"; }