matplotlib · jklymak · Jan 17, 2022 · Jan 8, 2022 · Jan 8, 2022
diff --git a/doc/api/next_api_changes/behavior/20715-JKS.rst b/doc/api/next_api_changes/behavior/20715-JKS.rst
@@ -1,8 +1,8 @@
 ``Type1Font`` objects include more properties
 ---------------------------------------------
 
-The `.type1font.Type1Font.prop` dictionary now includes more keys, such
-as ``CharStrings`` and ``Subrs``. The value of the ``Encoding`` key is
+The ``matplotlib._type1font.Type1Font.prop`` dictionary now includes more keys,
+such as ``CharStrings`` and ``Subrs``. The value of the ``Encoding`` key is
 now a dictionary mapping codes to glyph names. The
-`.type1font.Type1Font.transform` method now correctly removes
+``matplotlib._type1font.Type1Font.transform`` method now correctly removes
 ``UniqueID`` properties from the font.
diff --git a/doc/api/next_api_changes/deprecations/22133-OG.rst b/doc/api/next_api_changes/deprecations/22133-OG.rst
@@ -0,0 +1,6 @@
+``AFM``, ``configfont_pattern`` and ``Type1Font`` deprecated
+------------------------------------------------------------
+
+The modules ``matplotlib.AFM``, ``matplotlib.configfont_pattern``, and
+``matplotlib.Type1Font`` are considered internal and public access is
+deprecated.
diff --git a/doc/api/prev_api_changes/api_changes_0.91.0.rst b/doc/api/prev_api_changes/api_changes_0.91.0.rst
@@ -36,7 +36,7 @@ Changes for 0.91.0
   pfa/pfb file, to get metrics and kerning information for a Type 1
   font.
 
-* The :class:`.AFM` class now supports querying CapHeight and stem
+* The ``AFM`` class now supports querying CapHeight and stem
   widths. The get_name_char method now has an isord kwarg like
   get_width_char.
 

diff --git a/doc/api/prev_api_changes/api_changes_0.98.x.rst b/doc/api/prev_api_changes/api_changes_0.98.x.rst
@@ -63,8 +63,8 @@ Changes for 0.98.x
   :meth:`matplotlib.axes.Axes.set_ylim` now return a copy of the
   ``viewlim`` array to avoid modify-in-place surprises.
 
-* :meth:`matplotlib.afm.AFM.get_fullname` and
-  :meth:`matplotlib.afm.AFM.get_familyname` no longer raise an
+* ``matplotlib.afm.AFM.get_fullname`` and
+  ``matplotlib.afm.AFM.get_familyname`` no longer raise an
   exception if the AFM file does not specify these optional
   attributes, but returns a guess based on the required FontName
   attribute.

diff --git a/doc/api/prev_api_changes/api_changes_3.5.0/behaviour.rst b/doc/api/prev_api_changes/api_changes_3.5.0/behaviour.rst
@@ -229,8 +229,8 @@ defaults to *False*.
 
 Type 1 fonts have a large part of their code encrypted as an obsolete
 copy-protection measure. This part is now available decrypted as the
-``decrypted`` attribute of `~.type1font.Type1Font`. This decrypted data is not
-yet parsed, but this is a prerequisite for implementing subsetting.
+``decrypted`` attribute of ``matplotlib.type1font.Type1Font``. This decrypted
+data is not yet parsed, but this is a prerequisite for implementing subsetting.
 
 3D contourf polygons placed between levels
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~