Add latest changes from gitlab-org/gitlab@master

6 files changed, 20 insertions, 12 deletions

diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md
index 8a96b2aa9ae..f7047f145cf 100644
--- a/doc/api/protected_branches.md
+++ b/doc/api/protected_branches.md
@@ -421,20 +421,23 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://git
 | `id` | integer/string | yes | The ID or [URL-encoded path of the project](index.md#namespaced-path-encoding) owned by the authenticated user |
 | `name` | string | yes | The name of the branch |
 
-## Require code owner approvals for a single branch **(PREMIUM)**
+## Update a protected branch
 
-Update the "code owner approval required" option for the given protected branch.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101903) in GitLab 15.6.
+
+Updates a protected branch.
 
 ```plaintext
 PATCH /projects/:id/protected_branches/:name
 ```
 
 ```shell
-curl --request PATCH --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/protected_branches/feature-branch?code_owner_approval_required=true"
+curl --request PATCH --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/protected_branches/feature-branch?allow_force_push=true&code_owner_approval_required=true"
 ```
 
-| Attribute                                    | Type | Required | Description |
+| Attribute                                    | Type | Required | Description                                                                                                                                     |
 | -------------------------------------------- | ---- | -------- | ----------- |
-| `id`                                         | integer/string | yes | The ID or [URL-encoded path of the project](index.md#namespaced-path-encoding) owned by the authenticated user |
-| `name`                                       | string         | yes | The name of the branch |
-| `code_owner_approval_required`               | boolean        | no  | Prevent pushes to this branch if it matches an item in the [`CODEOWNERS` file](../user/project/code_owners.md). (defaults: false)|
+| `id`                                         | integer/string | yes | The ID or [URL-encoded path of the project](index.md#namespaced-path-encoding) owned by the authenticated user                                  |
+| `name`                                       | string         | yes | The name of the branch                                                                                                                          |
+| `allow_force_push`                           | boolean        | no  | When enabled, members who can push to this branch can also force push. |
+| `code_owner_approval_required` **(PREMIUM)** | boolean        | no  | Prevent pushes to this branch if it matches an item in the [`CODEOWNERS` file](../user/project/code_owners.md). Defaults to `false`. |
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index 730691a89e8..453182b8634 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -734,7 +734,7 @@ This includes projects shared with the group, but it **excludes** projects in
 subgroups or parent groups of the group being configured.
 
 You can configure this feature for both subgroups and immediate parent groups. A project
-in a subgroup has access to the templates for that subgroup, as well as
+in a subgroup has access to the templates for that subgroup and
 any immediate parent groups.
 
 To learn how to create templates for issues and merge requests, see
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index 4407986f354..eb26ea4fcc5 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -277,7 +277,7 @@ To delete a project:
 1. In the "Delete project" section, select **Delete project**.
 1. Confirm the action when asked to.
 
-This action deletes a project including all associated resources (issues, merge requests, and so on).
+This action deletes a project including all associated resources (such as issues and merge requests).
 
 WARNING:
 The default deletion behavior for projects was changed to [delayed project deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/32935)
diff --git a/doc/user/public_access.md b/doc/user/public_access.md
index 703932e50f6..fbab9d9bb51 100644
--- a/doc/user/public_access.md
+++ b/doc/user/public_access.md
@@ -18,6 +18,11 @@ for your GitLab instance). For example, <https://gitlab.com/public>.
 You can control the visibility of individual features with
 [project feature settings](permissions.md#project-features).
 
+The visibility setting of a project must be the same as or less restrictive
+than the visibility of its parent group.
+For example, a private group can include only private projects,
+while a public group can include private, internal, and public projects.
+
 ## Public projects and groups
 
 Public projects can be cloned **without any** authentication over HTTPS.
diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md
index f8c735eaea8..1ab22fb846d 100644
--- a/doc/user/reserved_names.md
+++ b/doc/user/reserved_names.md
@@ -26,7 +26,7 @@ under the `TOP_LEVEL_ROUTES`, `PROJECT_WILDCARD_ROUTES` and `GROUP_ROUTES` lists
 
 ## Reserved project names
 
-It is currently not possible to create a project with the following names:
+It is not possible to create a project with the following names:
 
 - `\-`
 - `badges`
@@ -52,7 +52,7 @@ It is currently not possible to create a project with the following names:
 
 ## Reserved group names
 
-Currently, the following names are reserved as top level groups:
+The following names are reserved as top level groups:
 
 - `\-`
 - `.well-known`
diff --git a/doc/user/workspace/index.md b/doc/user/workspace/index.md
index d7e014672aa..5bcd96cd4a5 100644
--- a/doc/user/workspace/index.md
+++ b/doc/user/workspace/index.md
@@ -15,7 +15,7 @@ The development, release, and timing of any products, features, or functionality
 sole discretion of GitLab Inc.
 
 NOTE:
-Workspace is currently in development.
+Workspace is in development.
 
 Workspace will be above the [top-level namespaces](../namespace/index.md) for you to manage
 everything you do as a GitLab administrator, including: