@@ -167,7 +167,21 @@ div.wide-table table th.stub {
     font-size:  large;
   }
 
-  .checklist { list-style: none; padding: 0; margin: 0; }
-  .checklist li { margin-left: 24px; padding-left: 23px;  margin-right: 6px; }
-  .checklist li:before { content: "\2610\2001"; margin-left: -24px; }
-  .checklist li p {display: inline; }
+
+.checklist {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+.checklist li {
+    margin-left: 24px;
+    padding-left: 23px;
+    margin-right: 6px;
+}
+.checklist li:before {
+    content: "\2610\2001";
+    margin-left: -24px;
+}
+.checklist li p {
+    display: inline;
+}
@@ -416,18 +416,22 @@ Variable names
 When feasible, please use our internal variable naming convention for objects
 of a given class and objects of any child class:
 
-+---------------+------------------------------------+
-| variable name |             base class             |
-+===============+====================================+
-| ``fig``       | `~matplotlib.figure.FigureBase`    |
-+---------------+------------------------------------+
-| ``ax``        | `~matplotlib.axes.Axes`            |
-+---------------+------------------------------------+
-| ``trans``     | `~matplotlib.transforms.Transform` |
-+---------------+------------------------------------+
-
-Generally, denote more than instance of the same class by adding numbers to
-the variable names, i.e. ``trans1``, ``trans2``.
++------------------------------------+---------------+------------------------------------------+
+|             base class             | variable      |                multiples                 |
++====================================+===============+==========================================+
+| `~matplotlib.figure.FigureBase`    | ``fig``       |                                          |
++------------------------------------+---------------+------------------------------------------+
+| `~matplotlib.axes.Axes`            | ``ax``        |                                          |
++------------------------------------+---------------+------------------------------------------+
+| `~matplotlib.transforms.Transform` | ``trans``     | ``trans_<source>_<target>`` or           |
++                                    +               +                                          +
+|                                    |               | ``trans_<source>`` when target is screen |
++------------------------------------+---------------+------------------------------------------+
+
+Generally, denote more than one instance of the same class by adding suffixes to
+the variable names. If a format isn't specified in the table, use numbers or
+letters as appropriate.
+
 
 .. _type-hints:
 
@@ -495,13 +499,13 @@ ensure that a reference is included in the descriptive text.
 
 API Change Notes
 """"""""""""""""
-.. include:: doc/api/next_api_changes/readme.rst
+.. include:: ../api/next_api_changes/README.rst
    :start-line: 5
    :end-line: 31
 
 What's new
 """"""""""
-.. include:: doc/users/next_whats_new/readme.rst
+.. include:: ../users/next_whats_new/README.rst
    :start-line: 5
    :end-line: 24