diff --git a/docs/pipeline-api.md b/docs/pipeline-api.md
index 9f003a59f47..03a2600b863 100644
--- a/docs/pipeline-api.md
+++ b/docs/pipeline-api.md
@@ -1323,12 +1323,12 @@ string
 <h3 id="tekton.dev/v1.Combination">Combination
 (<code>map[string]string</code> alias)</h3>
 <div>
-<p>Combination holds a single combination from a Matrix with key as param.Name and value as param.Value</p>
+<p>Combination is a map, mainly defined to hold a single combination from a Matrix with key as param.Name and value as param.Value</p>
 </div>
 <h3 id="tekton.dev/v1.Combinations">Combinations
 (<code>[]github.com/tektoncd/pipeline/pkg/apis/pipeline/v1.Combination</code> alias)</h3>
 <div>
-<p>Combinations holds a list of combination for a given Matrix</p>
+<p>Combinations is a list of combinations</p>
 </div>
 <h3 id="tekton.dev/v1.ConfigSource">ConfigSource
 </h3>
@@ -8189,12 +8189,12 @@ int32
 <h3 id="tekton.dev/v1beta1.Combination">Combination
 (<code>map[string]string</code> alias)</h3>
 <div>
-<p>Combination holds a single combination from a Matrix with key as param.Name and value as param.Value</p>
+<p>Combination is a map, mainly defined to hold a single combination from a Matrix with key as param.Name and value as param.Value</p>
 </div>
 <h3 id="tekton.dev/v1beta1.Combinations">Combinations
 (<code>[]github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1.Combination</code> alias)</h3>
 <div>
-<p>Combinations holds a list of combination for a given Matrix</p>
+<p>Combinations is a list of combination</p>
 </div>
 <h3 id="tekton.dev/v1beta1.ConfigSource">ConfigSource
 </h3>
@@ -8968,7 +8968,11 @@ feature gate is enabled.</p>
 (<em>Appears on:</em><a href="#tekton.dev/v1beta1.TaskRunStatusFields">TaskRunStatusFields</a>)
 </p>
 <div>
-<p>PipelineResourceResult used to export the image name and digest as json</p>
+<p>PipelineResourceResult is used to write key/value pairs to TaskRun pod termination messages.
+The key/value pairs may come from the entrypoint binary, or represent a TaskRunResult.
+If they represent a TaskRunResult, the key is the name of the result and the value is the
+JSON-serialized value of the result.
+TODO(#6197): Rename this struct</p>
 </div>
 <table>
 <thead>
@@ -9006,6 +9010,8 @@ string
 </em>
 </td>
 <td>
+<p>ResourceName may be used in tests, but it is not populated in termination messages.
+It is preserved here for backwards compatibility and will not be ported to v1.</p>
 </td>
 </tr>
 <tr>
diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh
index e91c2915408..c0e9c0eb9cd 100755
--- a/hack/verify-codegen.sh
+++ b/hack/verify-codegen.sh
@@ -37,15 +37,20 @@ cp -aR "${REPO_ROOT_DIR}/pkg" "${TMP_DIFFROOT}"
 mkdir -p "${TMP_DIFFROOT}/vendor"
 cp -aR "${REPO_ROOT_DIR}/vendor" "${TMP_DIFFROOT}"
 
+mkdir -p "${TMP_DIFFROOT}/docs"
+cp -aR "${REPO_ROOT_DIR}/docs" "${TMP_DIFFROOT}"
+
 "${REPO_ROOT_DIR}/hack/update-codegen.sh"
 echo "Diffing ${REPO_ROOT_DIR} against freshly generated codegen"
 ret=0
 diff -Naupr "${REPO_ROOT_DIR}/pkg" "${TMP_DIFFROOT}/pkg" || ret=1
 diff -Naupr "${REPO_ROOT_DIR}/vendor" "${TMP_DIFFROOT}/vendor" || ret=1
+diff -Naupr "${REPO_ROOT_DIR}/docs/pipeline-api.md" "${TMP_DIFFROOT}/docs/pipeline-api.md" || ret=1
 
 # Restore working tree state
 rm -fr "${REPO_ROOT_DIR}/pkg"
 rm -fr "${REPO_ROOT_DIR}/vendor"
+rm -fr "${REPO_ROOT_DIR}/docs"
 cp -aR "${TMP_DIFFROOT}"/* "${REPO_ROOT_DIR}"
 
 if [[ $ret -eq 0 ]]