diff --git a/doc/doxygen/yaml.md b/doc/doxygen/yaml.md
index f23b66e0da7..39a705c5b2f 100644
--- a/doc/doxygen/yaml.md
+++ b/doc/doxygen/yaml.md
@@ -1,5 +1,8 @@
 \page sec-yaml-documentation %Cantera YAML Documentation
 
+> **Note:** %Cantera provides \ref sec-yaml-conversion to generate YAML files
+> from Chemkin input data as well as legacy %Cantera formats.
+
 This short guide describes %Cantera YAML input files that define phases and
 interfaces for use in %Cantera simulations. Each link below represents an entry
 point to the \subpage sec-yaml-api; while you certainly can read them in order,
@@ -21,6 +24,3 @@ tips on troubleshooting the YAML file syntax rules, please look at the
     several types of homogeneous reactions, surface reactions, and
     electrochemical reactions. For each, there is a corresponding entry
     type.
-
-> **Note:** %Cantera provides \ref sec-yaml-conversion to generate YAML files
-> from Chemkin input data as well as legacy %Cantera formats.
diff --git a/doc/sphinx/yaml/index.rst b/doc/sphinx/yaml/index.rst
index 2c611a08588..2d4d2b048d9 100644
--- a/doc/sphinx/yaml/index.rst
+++ b/doc/sphinx/yaml/index.rst
@@ -9,3 +9,4 @@ YAML Input File Converters
    cti_conversion
    ctml_conversion
    ck_conversion
+   yaml_format
diff --git a/doc/sphinx/yaml/yaml_format.rst b/doc/sphinx/yaml/yaml_format.rst
new file mode 100644
index 00000000000..7c5586b721f
--- /dev/null
+++ b/doc/sphinx/yaml/yaml_format.rst
@@ -0,0 +1,7 @@
+*******************
+Cantera YAML Format
+*******************
+
+For information on the Cantera YAML format, refer to the
+:ct:`Cantera YAML Documentation <sec-yaml-documentation>`
+on the Cantera Developer website.
diff --git a/interfaces/cython/cantera/_utils.pyx b/interfaces/cython/cantera/_utils.pyx
index a914da72c73..3480f88f606 100644
--- a/interfaces/cython/cantera/_utils.pyx
+++ b/interfaces/cython/cantera/_utils.pyx
@@ -174,7 +174,7 @@ cdef class AnyMap(dict):
     A key-value store representing objects defined in Cantera's YAML input format.
 
     Extends the capabilities of a normal `dict` object by providing functions for
-    converting values between different unit systems. See YAML Format Reference for
+    converting values between different unit systems. See :ct:`sec-yaml-units` for
     details on how units are handled in YAML input files.
     """
     def __cinit__(self, *args, **kwawrgs):