Merge branch 'docstring' of github.com:sciunto/scikit-image

.travis.yml

@@ -1,7 +1,7 @@
 # vim ft=yaml
 # travis-ci.org definition for skimage build
 #
-# We pretend to be erlang because we need can't use the python support in
+# We pretend to be erlang because we can't use the python support in
 # travis-ci; it uses virtualenvs, they do not have numpy, scipy, matplotlib,
 # and it is impractical to build them
 

doc/source/plots/hough_tf.py

@@ -20,8 +20,8 @@ plt.title('Input image')
 
 plt.subplot(1, 2, 2)
 plt.imshow(out, cmap=plt.cm.bone,
-           extent=(d[0], d[-1],
-                   np.rad2deg(angles[0]), np.rad2deg(angles[-1])))
+           extent=(np.rad2deg(angles[0]), np.rad2deg(angles[-1]),
+                   d[0], d[-1]))
 plt.title('Hough transform')
 plt.xlabel('Angle (degree)')
 plt.ylabel('Distance (pixel)')

skimage/draw/_draw.pyx

@@ -293,12 +293,12 @@ def ellipse_perimeter(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t yradius,
     cy, cx : int
         Centre coordinate of ellipse.
     yradius, xradius: int
-        Main radial values.
+        Minor and major semi-axes. ``(x/xradius)**2 + (y/yradius)**2 = 1``.
 
     Returns
     -------
     rr, cc : (N,) ndarray of int
-        Indices of pixels that belong to the circle perimeter.
+        Indices of pixels that belong to the ellipse perimeter.
         May be used to directly index into an array, e.g.
         ``img[rr, cc] = 1``.
 

skimage/transform/hough_transform.py

@@ -100,6 +100,9 @@ from skimage._shared.utils import deprecated
 
 @deprecated('hough_line')
 def hough(img, theta=None):
+    """
+    This function is deprecated. Use `hough_line` instead.
+    """
     return hough_line(img, theta)
 
 from ._hough_transform import _hough_circle