Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 15 deletions

diff --git a/doc/api/openapi/openapi_interactive.md b/doc/api/openapi/openapi_interactive.md
index 95d7bba8081..e34b003e32c 100644
--- a/doc/api/openapi/openapi_interactive.md
+++ b/doc/api/openapi/openapi_interactive.md
@@ -10,19 +10,27 @@ Introduces the interactive documentation tool for the GitLab API.
 
 ## About the OpenAPI specification
 
-The [OpenAPI specification](https://swagger.io/specification/) (formerly called Swagger) defines a standard, language-agnostic interface to RESTful APIs. OpenAPI definition files are written in the YAML format, which is automatically rendered by the GitLab browser into a more human-readable interface. For general information about the GitLab APIs, see [API Docs](../README.md).
+The [OpenAPI specification](https://swagger.io/specification/) (formerly called Swagger) defines a
+standard, language-agnostic interface to RESTful APIs. OpenAPI definition files are written in the
+YAML format, which is automatically rendered by the GitLab browser into a more human-readable interface.
+
+For general information about the GitLab APIs, see [API Docs](../README.md).
 
 ## Overview
 
-The [interactive API documentation tool](openapi.yaml) allows API testing directly on the GitLab.com
-website. Only a few of the available endpoints are documented with the OpenAPI spec, but the current
-list demonstrates the functionality of the tool.
+<!--
+The following link is absolute rather than relative because it needs to be viewed through the GitLab
+Open API file viewer: https://docs.gitlab.com/ee/user/project/repository/index.html#openapi-viewer.
+-->
+The [interactive API documentation tool](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/api/openapi/openapi.yaml)
+allows API testing directly on the GitLab.com website. Only a few of the available endpoints are
+documented with the OpenAPI spec, but the current list demonstrates the functionality of the tool.
 
 ![API viewer screenshot](img/apiviewer01-fs8.png)
 
 ## Endpoint parameters
 
-When you expand an endpoint listing, you'll see a description, input parameters (if required),
+When you expand an endpoint listing, you see a description, input parameters (if required),
 and example server responses. Some parameters include a default or a list of allowed values.
 
 ![API viewer screenshot](img/apiviewer04-fs8.png)
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 8313c7e05e2..9ffb2f5de9f 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -2918,13 +2918,11 @@ You can specify a [fallback cache key](#fallback-cache-key) to use if the specif
 ##### Multiple caches
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32814) in GitLab 13.10.
-> - It's [deployed behind a feature flag](../../user/feature_flags.md), disabled by default.
-> - It's disabled on GitLab.com.
-> - It's not recommended for production use.
-> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-multiple-caches). **(FREE SELF)**
-
-WARNING:
-This feature might not be available to you. Check the **version history** note above for details.
+> - [Deployed behind a feature flag](../../user/feature_flags.md), disabled by default.
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/321877) in GitLab 13.11.
+> - Enabled on GitLab.com.
+> - Recommended for production use.
+> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-multiple-caches). **(FREE SELF)**
 
 You can have a maximum of four caches:
 
@@ -2953,10 +2951,10 @@ the fallback is fetched multiple times if multiple caches are not found.
 
 ##### Enable or disable multiple caches **(FREE SELF)**
 
-The multiple caches feature is under development and not ready for production use.
-It is deployed behind a feature flag that is **disabled by default**.
+The multiple caches feature is under development but ready for production use.
+It is deployed behind a feature flag that is **enabled by default**.
 [GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
-can enable it.
+can opt to disable it.
 
 To enable it: