Add latest changes from gitlab-org/gitlab@master

2 files changed, 30 insertions, 0 deletions

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: