Merge remote-tracking branch 'matplotlib/v2.2.0-doc' into v2.2.x

tacaswell · tacaswell · commit 3dd8f1844d05 · 2018-03-15T17:19:26.000-04:00
diff --git a/doc/citing.rst b/doc/citing.rst
@@ -27,6 +27,12 @@ publication, please acknowledge this fact by citing `Hunter et al (2007)
 
 DOIs
 ----
+v2.2.0
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1189358.svg
+      :target: https://doi.org/10.5281/zenodo.1189358
+v2.1.2
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1154287.svg
+      :target: https://doi.org/10.5281/zenodo.1154287
 v2.1.1
    .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1098480.svg
       :target: https://doi.org/10.5281/zenodo.1098480
diff --git a/doc/conf.py b/doc/conf.py
@@ -155,7 +155,7 @@ def _check_deps():
 project = 'Matplotlib'
 copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '
              'Michael Droettboom and the Matplotlib development '
-             'team; 2012 - 2017 The Matplotlib development team')
+             'team; 2012 - 2018 The Matplotlib development team')
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
diff --git a/tutorials/text/annotations.py b/tutorials/text/annotations.py
@@ -516,11 +516,11 @@
     You may take a look at this example
     :ref:`sphx_glr_gallery_text_labels_and_annotations_annotation_demo.py`.
 
-Using ConnectorPatch
---------------------
+Using ConnectionPatch
+---------------------
 
-The ConnectorPatch is like an annotation without text. While the annotate
-function is recommended in most situations, the ConnectorPatch is useful when
+The ConnectionPatch is like an annotation without text. While the annotate
+function is recommended in most situations, the ConnectionPatch is useful when
 you want to connect points in different axes. ::
 
   from matplotlib.patches import ConnectionPatch
@@ -540,7 +540,7 @@
    Connect Simple01
 
 
-While the ConnectorPatch instance can be added to any axes, you may want to add
+While the ConnectionPatch instance can be added to any axes, you may want to add
 it to the axes that is latest in drawing order to prevent overlap by other
 axes.
 
