Merged revisions 6850 via svnmerge from

jdh2358 · jdh2358 · commit 1be9a1a7f8c5 · 2009-01-29T18:12:56.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6850 | jdh2358 | 2009-01-29 10:11:07 -0800 (Thu, 29 Jan 2009) | 1 line applied Sandro's doc patch ........ svn path=/trunk/matplotlib/; revision=6851
diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst
@@ -44,7 +44,7 @@ in mind.
 * if your changes are non-trivial, please make an entry in the
   :file:`CHANGELOG`
 
-* if you change the API, please document it in :file:`API_CHANGES`,
+* if you change the API, please document it in :file:`doc/api/api_changes.rst`,
   and consider posting to `matplotlib-devel
   <http://lists.sourceforge.net/mailman/listinfo/matplotlib-devel>`_
 
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -252,7 +252,7 @@ requirements necessary to generate a new figure. Once these steps have been
 taken, these figures can be included in the usual way::
 
    .. plot:: pyplots/tex_unicode_demo.py
-      :include-source
+      :include-source:
 
 Examples
 --------
diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
@@ -137,7 +137,7 @@ The :class:`matplotlib.backend_bases.RendererBase` instance, which is
 used to calculate the text size, is not known until the figure is
 drawn (:meth:`matplotlib.figure.Figure.draw`).  After the window is
 drawn and the text instance knows its renderer, you can call
-:meth:`matplotlib.text.Text.get_window_extent``.  One way to solve
+:meth:`matplotlib.text.Text.get_window_extent`.  One way to solve
 this chicken and egg problem is to wait until the figure is draw by
 connecting
 (:meth:`matplotlib.backend_bases.FigureCanvasBase.mpl_connect`) to the
@@ -374,7 +374,7 @@ Multiple y-axis scales
 
 A frequent request is to have two scales for the left and right
 y-axis, which is possible using :func:`~matplotlib.pyplot.twinx` (more
-than two scales are not currently supported, though it is on the wishq
+than two scales are not currently supported, though it is on the wish
 list).  This works pretty well, though there are some quirks when you
 are trying to interactively pan and zoom, since both scales do not get
 the signals.
@@ -483,7 +483,7 @@ this::
 
 This is not what show does and unfortunately, because doing blocking
 calls across user interfaces can be tricky, is currently unsupported,
-though we have made some pregress towards supporting blocking events.
+though we have made some progress towards supporting blocking events.
 
 
 .. _howto-contribute:
