diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-05 12:18:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-05 12:18:51 +0300 |
commit | 01625f2465779254cfdd08697c4955cf3af05a1f (patch) | |
tree | c1610ee26e9ce2e2313f42103c9134f82d575e4e /doc | |
parent | 0e31e4396d76a8d723a26354278295fd0c51d9c7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/audit_events.md | 8 | ||||
-rw-r--r-- | doc/development/documentation/styleguide/index.md | 3 | ||||
-rw-r--r-- | doc/development/documentation/styleguide/word_list.md | 27 | ||||
-rw-r--r-- | doc/user/product_analytics/index.md | 1 |
4 files changed, 34 insertions, 5 deletions
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md index c4b0816492a..3a1a0a970e5 100644 --- a/doc/administration/audit_events.md +++ b/doc/administration/audit_events.md @@ -37,7 +37,7 @@ Audit events can be viewed at the group, project, instance, and sign-in level. E To view a group's audit events: 1. On the left sidebar, select **Search or go to** and find your group. -1. On the left sidebar, select **Secure > Audit events**. +1. Select **Secure > Audit events**. 1. Filter the audit events by the member of the project (user) who performed the action and date range. Group audit events can also be accessed using the [Group Audit Events API](../api/audit_events.md#group-audit-events). Group audit event queries are limited to a maximum of 30 days. @@ -45,7 +45,7 @@ Group audit events can also be accessed using the [Group Audit Events API](../ap ### Project audit events 1. On the left sidebar, select **Search or go to** and find your project. -1. On the left sidebar, select **Secure > Audit events**. +1. Select **Secure > Audit events**. 1. Filter the audit events by the member of the project (user) who performed the action and date range. Project audit events can also be accessed using the [Project Audit Events API](../api/audit_events.md#project-audit-events). Project audit event queries are limited to a maximum of 30 days. @@ -56,7 +56,7 @@ You can view audit events from user actions across an entire GitLab instance. To view instance audit events: 1. On the left sidebar, at the bottom, select **Admin Area**. -1. On the left sidebar, select **Monitoring > Audit Events**. +1. Select **Monitoring > Audit Events**. 1. Filter by the following: - Member of the project (user) who performed the action - Group @@ -82,7 +82,7 @@ You can export the current view (including filters) of your instance audit event CSV(comma-separated values) file. To export the instance audit events to CSV: 1. On the left sidebar, at the bottom, select **Admin Area**. -1. On the left sidebar, select **Monitoring > Audit Events**. +1. Select **Monitoring > Audit Events**. 1. Select the available search filters. 1. Select **Export as CSV**. diff --git a/doc/development/documentation/styleguide/index.md b/doc/development/documentation/styleguide/index.md index 33e10e2144c..4ca2a72fddb 100644 --- a/doc/development/documentation/styleguide/index.md +++ b/doc/development/documentation/styleguide/index.md @@ -1010,8 +1010,11 @@ To open the Admin Area: ```markdown 1. On the left sidebar, at the bottom, select **Admin Area**. +1. Select **Settings > CI/CD**. ``` +You do not need to repeat `On the left sidebar` in your second step. + To open the **Your work** menu item: ```markdown diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md index 556fba5c69a..610328806bc 100644 --- a/doc/development/documentation/styleguide/word_list.md +++ b/doc/development/documentation/styleguide/word_list.md @@ -380,6 +380,18 @@ Use **compute minutes** instead of these (or similar) terms: For more information, see [epic 2150](https://gitlab.com/groups/gitlab-com/-/epics/2150). +## configuration + +When you update a collection of settings, call it a **configuration**. + +## configure + +Use **configure** after a feature or product has been [set up](#setup-set-up). +For example: + +1. Set up your installation. +1. Configure your installation. + ## confirmation dialog Use **confirmation dialog** to describe the dialog that asks you to confirm an action. For example: @@ -1335,6 +1347,10 @@ see the [Microsoft Style Guide](https://learn.microsoft.com/en-us/style-guide/a- Use **Premium**, in uppercase, for the subscription tier. When you refer to **Premium** in the context of other subscription tiers, follow [the subscription tier](#subscription-tier) guidance. +## preferences + +Use **preferences** to describe user-specific, system-level settings like theme and layout. + ## prerequisites Use **prerequisites** when documenting the tasks that must be completed or the conditions that must be met before a user can complete a task. Do not use **requirements**. @@ -1556,6 +1572,17 @@ Use **setup** as a noun, and **set up** as a verb. For example: - Your remote office setup is amazing. - To set up your remote office correctly, consider the ergonomics of your work area. +Do not confuse **set up** with [**configure**](#configure). +**Set up** implies that it's the first time you've done something. For example: + +1. Set up your installation. +1. Configure your installation. + +## settings + +A **setting** changes the default behavior of the product. A **setting** consists of a key/value pair, +typically represented by a label with one or more options. + ## sign in, sign-in To describe the action of signing in, use: diff --git a/doc/user/product_analytics/index.md b/doc/user/product_analytics/index.md index 2319b7a5185..6ff1f5e6990 100644 --- a/doc/user/product_analytics/index.md +++ b/doc/user/product_analytics/index.md @@ -24,7 +24,6 @@ To leave feedback about Product Analytics bugs or functionality: - Comment on [issue 391970](https://gitlab.com/gitlab-org/gitlab/-/issues/391970). - Create an issue with the `group::product analytics` label. -- [Schedule a call](https://calendly.com/jheimbuck/30-minute-call) with the team. ## How product analytics works |