Merge pull request matplotlib#3650 from cbrueffer/misc

tacaswell · tacaswell · commit 0a1a52482e6a · 2014-10-16T12:51:24.000-04:00
DOC : Typo fixes.
Conflicts:
	lib/matplotlib/axis.py

Conflicts due to pep8 work on master branch.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -615,7 +615,7 @@ def annotate(self, *args, **kwargs):
             position of the label `s`
 
         xycoords : string, optional, default: "data"
-            string that indicates what tye of coordinates `xy` is. Examples:
+            string that indicates what type of coordinates `xy` is. Examples:
             "figure points", "figure pixels", "figure fraction", "axes
             points", .... See `matplotlib.text.Annotation` for more details.
 
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -2001,9 +2001,11 @@ def _get_offset_text(self):
 
     def _get_pixel_distance_along_axis(self, where, perturb):
         """
-        Returns the amount, in data coordinates, that a single pixel corresponds to in the
-        locality given by "where", which is also given in data coordinates, and is an y coordinate.
-        "perturb" is the amount to perturb the pixel.  Usually +0.5 or -0.5.
+        Returns the amount, in data coordinates, that a single pixel
+        corresponds to in the locality given by *where*, which is also given
+        in data coordinates, and is a y coordinate.
+
+        *perturb* is the amount to perturb the pixel.  Usually +0.5 or -0.5.
 
         Implementing this routine for an axis is optional; if present, it will ensure that no
         ticks are lost due to round-off at the extreme ends of an axis.
diff --git a/lib/mpl_toolkits/axes_grid1/axes_divider.py b/lib/mpl_toolkits/axes_grid1/axes_divider.py
@@ -1,11 +1,11 @@
 """
-The axes_divider module provide helper classes to adjust the positions of
-multiple axes at the drawing time.
+The axes_divider module provides helper classes to adjust the positions of
+multiple axes at drawing time.
 
- Divider: this is the class that is used calculates the axes
+ Divider: this is the class that is used to calculate the axes
     position. It divides the given rectangular area into several sub
     rectangles. You initialize the divider by setting the horizontal
-    and vertical list of sizes that the division will be based on. You
+    and vertical lists of sizes that the division will be based on. You
     then use the new_locator method, whose return value is a callable
     object that can be used to set the axes_locator of the axes.
 
@@ -31,7 +31,7 @@ class Divider(object):
     horizontal and vertical lists of sizes
     (:mod:`mpl_toolkits.axes_grid.axes_size`) that the division will
     be based on. You then use the new_locator method to create a
-    callable object that can be used to as the axes_locator of the
+    callable object that can be used as the axes_locator of the
     axes.
     """
 
@@ -49,7 +49,7 @@ def __init__(self, fig, pos, horizontal, vertical,
                     for vertical division
         :param aspect: if True, the overall rectangular area is reduced
                     so that the relative part of the horizontal and
-                    vertical scales have same scale.
+                    vertical scales have the same scale.
         :param anchor: Determine how the reduced rectangle is placed
                        when aspect is True.
         """
