Add latest changes from gitlab-org/gitlab@master

5 files changed, 14 insertions, 13 deletions

diff --git a/doc/api/branches.md b/doc/api/branches.md
index 9518a8d5032..fa508292e5c 100644
--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -27,7 +27,7 @@ Parameters:
 | Attribute | Type           | Required | Description |
 |:----------|:---------------|:---------|:------------|
 | `id`      | integer/string | yes      | ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding) owned by the authenticated user.|
-| `search`  | string         | no       | Return list of branches containing the search string. You can use `^term` and `term$` to find branches that begin and end with `term` respectively. |
+| `search`  | string         | no       | Return list of branches containing the search string. You can use `^term` to find branches that begin with `term`, and `term$` to find branches that end with `term`. |
 | `regex`   | string         | no       | Return list of branches with names matching a [re2](https://github.com/google/re2/wiki/Syntax) regular expression. |
 
 Example request:
diff --git a/doc/api/members.md b/doc/api/members.md
index 950289effd2..02fa4be3d64 100644
--- a/doc/api/members.md
+++ b/doc/api/members.md
@@ -316,9 +316,8 @@ This API endpoint works on top-level groups only. It does not work on subgroups.
 
 This function takes [pagination](rest/index.md#pagination) parameters `page` and `per_page` to restrict the list of users.
 
-[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/262875) in GitLab 13.7, the `search` and
-`sort` parameters allow you to search for billable group members by name and sort the results,
-respectively.
+[In GitLab 13.7 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/262875), use the `search` parameter
+to search for billable group members by name and `sort` to sort the results.
 
 ```plaintext
 GET /groups/:id/billable_members
diff --git a/doc/api/namespaces.md b/doc/api/namespaces.md
index 25c26ee9339..15ce73fdbc3 100644
--- a/doc/api/namespaces.md
+++ b/doc/api/namespaces.md
@@ -9,8 +9,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 Usernames and group names fall under a special category called
 [namespaces](../user/namespace/index.md).
 
-For users and groups supported API calls see the [users](users.md) and
-[groups](groups.md) documentation respectively.
+You might also want to view documentation for:
+
+- [Users](users.md)
+- [Groups](groups.md)
 
 [Pagination](rest/index.md#pagination) is used.
 
diff --git a/doc/api/secure_files.md b/doc/api/secure_files.md
index 86ed2e005a4..0b85bf05410 100644
--- a/doc/api/secure_files.md
+++ b/doc/api/secure_files.md
@@ -58,7 +58,7 @@ Example response:
         "checksum": "16630b189ab34b2e3504f4758e1054d2e478deda510b2b08cc0ef38d12e80aa2",
         "checksum_algorithm": "sha256",
         "created_at": "2022-02-22T22:22:22.222Z",
-        "expires_at": "2022-09-21T14:56:00.000Z",
+        "expires_at": "2023-09-21T14:55:59.000Z",
         "metadata": {
             "id":"75949910542696343243264405377658443914",
             "issuer": {
@@ -74,7 +74,7 @@ Example response:
                 "OU":"ABC123XYZ",
                 "UID":"ABC123XYZ"
             },
-            "expires_at":"2022-09-21T14:56:00.000Z"
+            "expires_at":"2023-09-21T14:55:59.000Z"
         }
     }
 ]
diff --git a/doc/api/settings.md b/doc/api/settings.md
index a0441b6e760..c7ba93d310e 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -486,11 +486,11 @@ listed in the descriptions of the relevant settings.
 | `signin_enabled`                         | string           | no                                   | (Deprecated: Use `password_authentication_enabled_for_web` instead) Flag indicating if password authentication is enabled for the web interface. |
 | `signup_enabled`                         | boolean          | no                                   | Enable registration. Default is `true`. |
 | `silent_mode_enabled`                    | boolean          | no                                   | Enable [Silent mode](../administration/silent_mode/index.md). Default is `false`. |
-| `slack_app_enabled` **(PREMIUM)**        | boolean          | no                                   | (**If enabled, requires:** `slack_app_id`, `slack_app_secret` and `slack_app_secret`) Enable Slack app. |
-| `slack_app_id` **(PREMIUM)**             | string           | required by: `slack_app_enabled`     | The app ID of the Slack-app. |
-| `slack_app_secret` **(PREMIUM)**         | string           | required by: `slack_app_enabled`     | The app secret of the Slack-app. |
-| `slack_app_signing_secret` **(PREMIUM)** | string           | no                                   | The signing secret of the Slack-app. |
-| `slack_app_verification_token` **(PREMIUM)** | string       | required by: `slack_app_enabled`     | The verification token of the Slack-app. |
+| `slack_app_enabled`                      | boolean          | no                                   | (**If enabled, requires:** `slack_app_id`, `slack_app_secret` and `slack_app_secret`) Enable Slack app. |
+| `slack_app_id`                           | string           | required by: `slack_app_enabled`     | The app ID of the Slack-app. |
+| `slack_app_secret`                       | string           | required by: `slack_app_enabled`     | The app secret of the Slack-app. |
+| `slack_app_signing_secret`               | string           | no                                   | The signing secret of the Slack-app. |
+| `slack_app_verification_token`           | string           | required by: `slack_app_enabled`     | The verification token of the Slack-app. |
 | `snippet_size_limit`                     | integer          | no                                   | Max snippet content size in **bytes**. Default: 52428800 Bytes (50 MB).|
 | `snowplow_app_id`                        | string           | no                                   | The Snowplow site name / application ID. (for example, `gitlab`) |
 | `snowplow_collector_hostname`            | string           | required by: `snowplow_enabled`      | The Snowplow collector hostname. (for example, `snowplow.trx.gitlab.net`) |