diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst index b4f6d598b571..81aeedcb1802 100644 --- a/doc/api/api_changes.rst +++ b/doc/api/api_changes.rst @@ -2902,7 +2902,7 @@ Changes for 0.50 canvas.show() vbox.pack_start(canvas) - If you use the NavigationToolbar, this in now intialized with a + If you use the NavigationToolbar, this in now initialized with a FigureCanvas, not a Figure. The examples embedding_in_gtk.py, embedding_in_gtk2.py, and mpl_with_glade.py all reflect the new API so use these as a guide. diff --git a/doc/users/prev_whats_new/changelog.rst b/doc/users/prev_whats_new/changelog.rst index bd6eca31cad9..38da677dedf3 100644 --- a/doc/users/prev_whats_new/changelog.rst +++ b/doc/users/prev_whats_new/changelog.rst @@ -596,7 +596,7 @@ the `API changes <../../api/api_changes.html>`_. 2010-06-30 Added autoscale convenience method and corresponding pyplot function for simplified control of autoscaling; and changed axis, set_xlim, and set_ylim so that by - default, they turn off the autoscaling on the relevent + default, they turn off the autoscaling on the relevant axis or axes. Therefore one can call set_xlim before plotting a line, for example, and the limits will be retained. - EF diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py index 98450e69863b..b4765cd19894 100644 --- a/lib/matplotlib/artist.py +++ b/lib/matplotlib/artist.py @@ -39,7 +39,7 @@ def allow_rasterization(draw): """ Decorator for Artist.draw method. Provides routines that run before and after the draw call. The before and after functions - are useful for changing artist-dependant renderer attributes or making + are useful for changing artist-dependent renderer attributes or making other setup function calls, such as starting and flushing a mixed-mode renderer. """ diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index cd2595cedf87..c9e926c52b0e 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -4038,7 +4038,7 @@ def hexbin(self, x, y, C=None, gridsize=100, bins=None, Make a hexagonal binning plot of *x* versus *y*, where *x*, *y* are 1-D sequences of the same length, *N*. If *C* is *None* - (the default), this is a histogram of the number of occurences + (the default), this is a histogram of the number of occurrences of the observations at (x[i],y[i]). If *C* is specified, it specifies values at the coordinate diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py index 4462cd620ce6..3dab3749ebf0 100644 --- a/lib/matplotlib/axes/_base.py +++ b/lib/matplotlib/axes/_base.py @@ -3827,7 +3827,7 @@ def get_children(self): def contains(self, mouseevent): """ - Test whether the mouse event occured in the axes. + Test whether the mouse event occurred in the axes. Returns *True* / *False*, {} """ diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py index 870c5e8f6f72..79f9ce02c522 100644 --- a/lib/matplotlib/axis.py +++ b/lib/matplotlib/axis.py @@ -1702,7 +1702,7 @@ class XAxis(Axis): axis_name = 'x' def contains(self, mouseevent): - """Test whether the mouse event occured in the x axis. + """Test whether the mouse event occurred in the x axis. """ if callable(self._contains): return self._contains(self, mouseevent) diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index e727b4cddb76..739984423bf4 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -382,7 +382,7 @@ def _iter_collection_raw_paths(self, master_transform, paths, all_transforms): """ This is a helper method (along with :meth:`_iter_collection`) to make - it easier to write a space-efficent :meth:`draw_path_collection` + it easier to write a space-efficient :meth:`draw_path_collection` implementation in a backend. This method yields all of the base path/transform @@ -433,7 +433,7 @@ def _iter_collection(self, gc, master_transform, all_transforms, """ This is a helper method (along with :meth:`_iter_collection_raw_paths`) to make it easier to write - a space-efficent :meth:`draw_path_collection` implementation in a + a space-efficient :meth:`draw_path_collection` implementation in a backend. This method yields all of the path, offset and graphics diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py index 35df7b6a3617..3ff8338e8a1b 100644 --- a/lib/matplotlib/backends/backend_agg.py +++ b/lib/matplotlib/backends/backend_agg.py @@ -79,7 +79,7 @@ class RendererAgg(RendererBase): # FigureCanvas acquire a lock on the fontd at the start of the # draw, and release it when it is done. This allows multiple # renderers to share the cached fonts, but only one figure can - # draw at at time and so the font cache is used by only one + # draw at time and so the font cache is used by only one # renderer at a time lock = threading.RLock() diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index b80f3dd05f3c..bfcce87f4f44 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -548,7 +548,7 @@ def draw(self, renderer, *args, **kwargs): def contains(self, mouseevent): """ - Test whether the mouse event occured within the image. + Test whether the mouse event occurred within the image. """ if callable(self._contains): return self._contains(self, mouseevent) @@ -1195,7 +1195,7 @@ def get_window_extent(self, renderer=None): raise ValueError("unknown type of bbox") def contains(self, mouseevent): - """Test whether the mouse event occured within the image.""" + """Test whether the mouse event occurred within the image.""" if callable(self._contains): return self._contains(self, mouseevent) diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index 2f684efd68f6..85daa66d2271 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -2312,7 +2312,7 @@ def plotfile(fname, cols=(0,), plotfuncs=None, comments='#', skiprows=0, checkrows=5, delimiter=',', names=None, subplots=True, newfig=True, **kwargs): """ - Plot the data in in a file. + Plot the data in a file. *cols* is a sequence of column identifiers to plot. An identifier is either an int or a string. If it is an int, it indicates the diff --git a/setup.cfg.template b/setup.cfg.template index e8ba46861b60..1f384d3df860 100644 --- a/setup.cfg.template +++ b/setup.cfg.template @@ -85,7 +85,7 @@ # # The Agg, Ps, Pdf and SVG backends do not require external # dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, or TkAgg -# if you have disabled the relevent extension modules. Agg will be used +# if you have disabled the relevant extension modules. Agg will be used # by default. # #backend = Agg