Add latest changes from gitlab-org/gitlab@master

9 files changed, 18 insertions, 14 deletions

diff --git a/doc/development/elasticsearch.md b/doc/development/elasticsearch.md
index bc958a27c90..4b87f1c28f1 100644
--- a/doc/development/elasticsearch.md
+++ b/doc/development/elasticsearch.md
@@ -135,10 +135,10 @@ This is not applicable yet as multiple indices functionality is not fully implem
 Currently GitLab can only handle a single version of setting. Any setting/schema changes would require reindexing everything from scratch. Since reindexing can take a long time, this can cause search functionality downtime.
 
 To avoid downtime, GitLab is working to support multiple indices that
-can function at the same time. Whenever the schema changes, the admin
+can function at the same time. Whenever the schema changes, the administrator
 will be able to create a new index and reindex to it, while searches
 continue to go to the older, stable index. Any data updates will be
-forwarded to both indices. Once the new index is ready, an admin can
+forwarded to both indices. Once the new index is ready, an administrator can
 mark it active, which will direct all searches to it, and remove the old
 index.
 
diff --git a/doc/development/geo.md b/doc/development/geo.md
index 38245e5f4e5..7d5aae49749 100644
--- a/doc/development/geo.md
+++ b/doc/development/geo.md
@@ -96,7 +96,7 @@ projects that need updating. Those projects can be:
 - Updated recently: Projects that have a `last_repository_updated_at`
   timestamp that is more recent than the `last_repository_successful_sync_at`
   timestamp in the `Geo::ProjectRegistry` model.
-- Manual: The admin can manually flag a repository to resync in the
+- Manual: The administrator can manually flag a repository to resync in the
   [Geo admin panel](../user/admin_area/geo_nodes.md).
 
 When we fail to fetch a repository on the secondary `RETRIES_BEFORE_REDOWNLOAD`
diff --git a/doc/development/snowplow/index.md b/doc/development/snowplow/index.md
index 552249344c7..59361e5206c 100644
--- a/doc/development/snowplow/index.md
+++ b/doc/development/snowplow/index.md
@@ -279,7 +279,8 @@ export default {
 ```
 
 The event data can be provided with a `tracking` object, declared in the `data` function,
-or as a `computed property`.
+or as a `computed property`. A `tracking` object is convenient when the default
+event properties are dynamic or provided at runtime.
 
 ```javascript
 export default {
@@ -292,6 +293,7 @@ export default {
         // category: '',
         // property: '',
         // value: '',
+        // experiment: '',
         // extra: {},
       },
     };
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 5abc4bd3122..ca024f685f1 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -277,7 +277,7 @@ On the Route 53 dashboard, click **Hosted zones** in the left navigation bar:
     1. Click **Create**.
 1. If you registered your domain through Route 53, you're done. If you used a different domain registrar, you need to update your DNS records with your domain registrar. You'll need to:
    1. Click on **Hosted zones** and select the domain you added above.
-   1. You'll see a list of `NS` records. From your domain registrar's admin panel, add each of these as `NS` records to your domain's DNS records. These steps may vary between domain registrars. If you're stuck, Google **"name of your registrar" add DNS records** and you should find a help article specific to your domain registrar.
+   1. You'll see a list of `NS` records. From your domain registrar's administrator panel, add each of these as `NS` records to your domain's DNS records. These steps may vary between domain registrars. If you're stuck, Google **"name of your registrar" add DNS records** and you should find a help article specific to your domain registrar.
 
 The steps for doing this vary depending on which registrar you use and is beyond the scope of this guide.
 
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index 66a961cefb8..a627f04fa46 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -117,6 +117,7 @@ SSO has the following effects when enabled:
   even if the project is forked.
 - For a Git activity, users must be signed-in through SSO before they can push to or
   pull from a GitLab repository.
+- Users must be signed-in through SSO before they can pull images using the [Dependency Proxy](../../packages/dependency_proxy/index.md).
 <!-- Add bullet for API activity when https://gitlab.com/gitlab-org/gitlab/-/issues/9152 is complete -->
 
 ## Providers
diff --git a/doc/user/packages/dependency_proxy/index.md b/doc/user/packages/dependency_proxy/index.md
index dd7ad7d4f8d..cd504851b1f 100644
--- a/doc/user/packages/dependency_proxy/index.md
+++ b/doc/user/packages/dependency_proxy/index.md
@@ -68,11 +68,6 @@ The requirement to authenticate is a breaking change added in 13.7. An [administ
 disable it](../../../administration/packages/dependency_proxy.md#disabling-authentication) if it
 has disrupted your existing Dependency Proxy usage.
 
-WARNING:
-If [SSO enforcement](../../group/saml_sso/index.md#sso-enforcement)
-is enabled for your Group, requests to the dependency proxy will fail. This bug is being tracked in
-[this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/294018).
-
 Because the Dependency Proxy is storing Docker images in a space associated with your group,
 you must authenticate against the Dependency Proxy.
 
@@ -91,6 +86,12 @@ You can authenticate using:
 - A [personal access token](../../../user/profile/personal_access_tokens.md) with the scope set to `read_registry` and `write_registry`.
 - A [group deploy token](../../../user/project/deploy_tokens/index.md#group-deploy-token) with the scope set to `read_registry` and `write_registry`.
 
+#### SAML SSO
+
+When [SSO enforcement](../../group/saml_sso/index.md#sso-enforcement)
+is enabled, users must be signed-in through SSO before they can pull images through the Dependency
+Proxy.
+
 #### Authenticate within CI/CD
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/280582) in GitLab 13.7.
diff --git a/doc/user/project/import/clearcase.md b/doc/user/project/import/clearcase.md
index 27a84476590..120c64e00f2 100644
--- a/doc/user/project/import/clearcase.md
+++ b/doc/user/project/import/clearcase.md
@@ -31,7 +31,7 @@ _Taken from the slides [ClearCase and the journey to Git](https://docplayer.net/
 
 ## Why migrate
 
-ClearCase can be difficult to manage both from a user and an admin perspective.
+ClearCase can be difficult to manage both from a user and an administrator perspective.
 Migrating to Git/GitLab there is:
 
 - **No licensing costs**, Git is GPL while ClearCase is proprietary.
diff --git a/doc/user/report_abuse.md b/doc/user/report_abuse.md
index 2b585315326..a8107d77113 100644
--- a/doc/user/report_abuse.md
+++ b/doc/user/report_abuse.md
@@ -64,5 +64,5 @@ in the abuse report's **Message** field.
 
 ## Managing abuse reports
 
-Admins are able to view and resolve abuse reports.
+Administrators are able to view and resolve abuse reports.
 For more information, see [abuse reports administration documentation](admin_area/review_abuse_reports.md).
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index f2ae23bd6f0..92d01e6a43e 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -306,10 +306,10 @@ GitLab instance.
 ## Search settings
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/292941) in GitLab 13.8 behind a feature flag, disabled by default.
-> - [Added to Group, Admin, and User settings](https://gitlab.com/groups/gitlab-org/-/epics/4842) in GitLab 13.9.
+> - [Added to Group, Administrator, and User settings](https://gitlab.com/groups/gitlab-org/-/epics/4842) in GitLab 13.9.
 > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/294025) in GitLab 13.11.
 
-You can search inside a Project, Group, Admin, or User's settings by entering
+You can search inside a Project, Group, Administrator, or User's settings by entering
 a search term in the search box located at the top of the page. The search results
 appear highlighted in the sections that match the search term.