Add latest changes from gitlab-org/gitlab@master

4 files changed, 61 insertions, 19 deletions

diff --git a/doc/user/admin_area/settings/floc.md b/doc/user/admin_area/settings/floc.md
new file mode 100644
index 00000000000..e1d10727341
--- /dev/null
+++ b/doc/user/admin_area/settings/floc.md
@@ -0,0 +1,40 @@
+---
+stage: none
+group: unassigned
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+---
+
+# Federated Learning of Cohorts (FLoC) **(FREE SELF)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60933) in GitLab Free 13.12.
+
+Federated Learning of Conhorts (FLoC) is a feature that the Chrome browser has
+rolled out, where users are categorized into different cohorts, so that
+advertisers can use this data to uniquely target and track users. For more
+information, visit the [FLoC repository](https://github.com/WICG/floc).
+
+To avoid users being tracked and categorized in any GitLab instance, FLoC is
+disabled by default by sending the following header:
+
+```plaintext
+Permissions-Policy: interest-cohort=()
+```
+
+To enable it:
+
+1. Go to the Admin Area (**{admin}**) and select **Settings > General**.
+1. Expand **Federated Learning of Cohorts**.
+1. Check the box.
+1. Click **Save changes**.
+
+<!-- ## Troubleshooting
+
+Include any troubleshooting steps that you can foresee. If you know beforehand what issues
+one might have when setting this up, or when something is changed, or on upgrading, it's
+important to describe those, too. Think of things that may go wrong and include them here.
+This is important to minimize requests for support, and to avoid doc comments with
+questions that you know someone might ask.
+
+Each scenario can be a third-level heading, e.g. `### Getting error message X`.
+If you have none to add when creating a doc, leave this section in place
+but commented out to help encourage others to add to it in the future. -->
diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md
index a1f4c6a06e2..a66502d9466 100644
--- a/doc/user/admin_area/settings/index.md
+++ b/doc/user/admin_area/settings/index.md
@@ -28,6 +28,7 @@ Access the default page for admin area settings by navigating to **Admin Area >
 | [External Authentication](external_authorization.md#configuration) | External Classification Policy Authorization |
 | [Web terminal](../../../administration/integration/terminal.md#limiting-websocket-connection-time) | Set max session time for web terminal. |
 | [Web IDE](../../project/web_ide/index.md#enabling-live-preview) | Manage Web IDE Features. |
+| [FLoC](floc.md) | Enable or disable [Federated Learning of Cohorts (FLoC)](https://en.wikipedia.org/wiki/Federated_Learning_of_Cohorts) tracking. |
 
 ## Integrations
 
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index 212823853e4..967d9b19709 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -25,6 +25,9 @@ learn how to proceed to keep your apps up and running:
 - [One-click install method](#install-with-one-click-deprecated)
 - [CI/CD template method](#install-using-gitlab-cicd-deprecated)
 
+NOTE:
+Despite being deprecated, the recommended way for installing GitLab integrated applications is by the GitLab CI/CD method presented below. We are working on a [cluster management project template](https://gitlab.com/gitlab-org/gitlab/-/issues/327908) with a simple upgrade path from the CI/CD based method.
+
 ## Install using GitLab CI/CD (DEPRECATED)
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20822) in GitLab 12.6.
diff --git a/doc/user/project/wiki/index.md b/doc/user/project/wiki/index.md
index 22915efef94..51e306bf1fc 100644
--- a/doc/user/project/wiki/index.md
+++ b/doc/user/project/wiki/index.md
@@ -7,7 +7,7 @@ type: reference, how-to
 
 # Wiki **(FREE)**
 
-If you don't want to keep your documentation in your repository, but you do want
+If you don't want to keep your documentation in your repository, but you want
 to keep it in the same project as your code, you can use the wiki GitLab provides
 in each GitLab project. Every wiki is a separate Git repository, so you can create
 wiki pages in the web interface, or [locally using Git](#create-or-edit-wiki-pages-locally).
@@ -34,8 +34,8 @@ with sibling pages listed in alphabetical order. To view a list of all pages, se
 When a wiki is created, it is empty. On your first visit, create the landing page
 users see when viewing the wiki:
 
-1. Go to the page for your project or group.
-1. In the left sidebar, select **Wiki**, then **Create your first page**.
+1. Go to your project or group and select **Wiki**.
+1. Select **Create your first page**.
 1. Select a **Format** for styling your text.
 1. Add a welcome message in the **Content** section. You can always edit it later.
 1. Add a **Commit message**. Git requires a commit message, so GitLab creates one
@@ -46,8 +46,7 @@ users see when viewing the wiki:
 
 Users with Developer [permissions](../../permissions.md) can create new wiki pages:
 
-1. Go to the page for your project or group.
-1. In the left sidebar, select **Wiki**.
+1. Go to your project or group and select **Wiki**.
 1. Select **New page** on this page, or any other wiki page.
 1. Select a content format.
 1. Add a title for your new page. Page titles use
@@ -111,8 +110,8 @@ may not be able to check out the wiki locally afterward.
 
 You need Developer [permissions](../../permissions.md) or higher to edit a wiki page:
 
-1. Go to the page for your project or group.
-1. In the left sidebar, select **Wiki**, and go to the page you want to edit.
+1. Go to your project or group and select **Wiki**.
+1. Go to the page you want to edit.
 1. Select the edit icon (**{pencil}**).
 1. Edit the content.
 1. Select **Save changes**.
@@ -126,8 +125,8 @@ For an example, read [Table of contents](../../markdown.md#table-of-contents).
 
 You need Maintainer [permissions](../../permissions.md) or higher to delete a wiki page:
 
-1. Go to the page for your project or group.
-1. In the left sidebar, select **Wiki**, and go to the page you want to delete.
+1. Go to your project or group and select **Wiki**.
+1. Go to the page you want to delete.
 1. Select **Delete page**.
 1. Confirm the deletion.
 
@@ -135,8 +134,8 @@ You need Maintainer [permissions](../../permissions.md) or higher to delete a wi
 
 You need Developer [permissions](../../permissions.md) or higher to move a wiki page:
 
-1. Go to the page for your project or group.
-1. In the left sidebar, select **Wiki**, and go to the page you want to move.
+1. Go to your project or group and select **Wiki**.
+1. Go to the page you want to move.
 1. Select the edit icon (**{pencil}**).
 1. Add the new path to the **Title** field. For example, if you have a wiki page
    called `about` under `company` and you want to move it to the wiki's root,
@@ -164,8 +163,8 @@ From the history page you can see:
 
 You can see the changes made in a version of a wiki page, similar to versioned diff file views:
 
-1. Go to the page for your project or group.
-1. In the left sidebar, select **Wiki**, and go to the wiki page you're interested in.
+1. Go to your project or group and select **Wiki**.
+1. Go to the wiki page you're interested in.
 1. Select **Page history** to see all page versions.
 1. Select the commit message in the **Changes** column for the version you're interested in.
 
@@ -192,8 +191,7 @@ You need Developer [permissions](../../permissions.md) or higher to customize th
 navigation sidebar. This process creates a wiki page named `_sidebar` which fully
 replaces the default sidebar navigation:
 
-1. Go to the page for your project or group.
-1. In the left sidebar, select **Wiki**.
+1. Go to your project or group and select **Wiki**.
 1. In the top right corner of the page, select **Edit sidebar**.
 1. When complete, select **Save changes**.
 
@@ -243,7 +241,7 @@ and above. Group wiki repositories can be moved using the
 
 To add a link to an external wiki from a project's left sidebar:
 
-1. In your project, go to **Settings > Integrations**.
+1. Go to your project and select **Settings > Integrations**.
 1. Select **External wiki**.
 1. Add the URL to your external wiki.
 1. (Optional) Select **Test settings** to verify the connection.
@@ -258,16 +256,16 @@ To hide the internal wiki from the sidebar, [disable the project's wiki](#disabl
 
 To hide the link to an external wiki:
 
-1. In your project, go to **Settings > Integrations**.
+1. Go to your project and select **Settings > Integrations**.
 1. Select **External wiki**.
-1. Unselect **Enable integration**.
+1. In the **Enable integration** section, clear the **Active** checkbox.
 1. Select **Save changes**.
 
 ## Disable the project's wiki
 
 To disable a project's internal wiki:
 
-1. In your project, go to **Settings > General**.
+1. Go to your project and select **Settings > General**.
 1. Expand **Visibility, project features, permissions**.
 1. Scroll down to find **Wiki** and toggle it off (in gray).
 1. Select **Save changes**.