Backport PR matplotlib#23864: Correct and improve documentation for anchored artists

Author: story645

tutorials/text/annotations.py

@@ -444,10 +444,14 @@
 #
 # `.ConnectionPatch` is like an annotation without text. While `~.Axes.annotate`
 <<<<<<< HEAD
+<<<<<<< HEAD
 # is sufficient in most situations, `.ConnectionPatch` is useful when you want to
 =======
 # is sufficient in most situations, ``ConnectionPatch`` is useful when you want to
 >>>>>>> 056eb64245 (Backport PR #23705: DOC: Added link to class under discussion)
+=======
+# is sufficient in most situations, `.ConnectionPatch` is useful when you want to
+>>>>>>> 2b8315933d (Backport PR #23864: Correct and improve documentation for anchored artists)
 # connect points in different axes. ::
 #
 #   from matplotlib.patches import ConnectionPatch
@@ -464,10 +468,14 @@
 #    :align: center
 #
 <<<<<<< HEAD
+<<<<<<< HEAD
 # Here, we added the `.ConnectionPatch` to the *figure* (with `~.Figure.add_artist`)
 =======
 # Here, we added the ``ConnectionPatch`` to the *figure* (with `~.Figure.add_artist`)
 >>>>>>> 056eb64245 (Backport PR #23705: DOC: Added link to class under discussion)
+=======
+# Here, we added the `.ConnectionPatch` to the *figure* (with `~.Figure.add_artist`)
+>>>>>>> 2b8315933d (Backport PR #23864: Correct and improve documentation for anchored artists)
 # rather than to either axes: this ensures that it is drawn on top of both axes,
 # and is also necessary if using :doc:`constrained_layout
 # </tutorials/intermediate/constrainedlayout_guide>` for positioning the axes.