Merge branch 'aqualls-emoji-scrubbing' into 'master'

Clean up bad plural of 'emoji' in docs

See merge request !125782



Merged-by: Diana Logan <dlogan@gitlab.com>
Approved-by: Diana Logan <dlogan@gitlab.com>
Co-authored-by: Amy Qualls <aqualls@gitlab.com>

doc/.vale/gitlab/Markdown_emoji.yml

 ---
 # Warning: gitlab.Markdown_emoji
 #
-# Check for use of GLFM emoji syntax (https://docs.gitlab.com/ee/user/markdown.html#emojis), which doesn't render correctly in documentation.
+# Check for use of GLFM emoji syntax (https://docs.gitlab.com/ee/user/markdown.html#emoji), which doesn't render correctly in documentation.
 #
 # For a list of all options, see https://vale.sh/docs/topics/styles/
 extends: existence
-message: "Replace '%s' with GitLab SVGs or Unicode emojis."
+message: "Replace '%s' with GitLab SVGs or Unicode emoji."
 link: https://docs.gitlab.com/ee/development/documentation/styleguide/#gitlab-svg-icons
 level: warning
 scope: text

doc/administration/raketasks/project_import_export.md

@@ -99,10 +99,10 @@ To fix the issue:
 1. Change the file permissions to `0400`.
 1. Move the file to a public folder (for example `/tmp/`).
 
-### `Name can contain only letters, digits, emojis ...`
+### `Name can contain only letters, digits, emoji ...`
 
 ```plaintext
-Name can contain only letters, digits, emojis, '_', '.', '+', dashes, or spaces. It must start with a letter,
+Name can contain only letters, digits, emoji, '_', '.', '+', dashes, or spaces. It must start with a letter,
 digit, emoji, or '_', and Path can contain only letters, digits, '_', '-', or '.'. It cannot start
 with '-', end in '.git', or end in '.atom'.
 ```

doc/api/award_emoji.md

@@ -6,12 +6,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Emoji reactions API **(FREE)**
 
-> [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/409884) from "award emojis" to "emoji reactions" in GitLab 16.0.
+> [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/409884) from "award emoji" to "emoji reactions" in GitLab 16.0.
 
 An [emoji reaction](../user/award_emojis.md) tells a thousand words.
 
 We call GitLab objects on which you can react with an emoji "awardables".
-You can react with emojis on the following:
+You can react with emoji on the following:
 
 - [Epics](../user/group/epics/index.md) ([API](epics.md)). **(PREMIUM)**
 - [Issues](../user/project/issues/index.md) ([API](issues.md)).

doc/api/graphql/custom_emoji.md

@@ -4,7 +4,7 @@ group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Use custom emojis with GraphQL **(FREE)**
+# Use custom emoji with GraphQL **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37911) in GitLab 13.6 [with a flag](../../administration/feature_flags.md) named `custom_emoji`. Disabled by default.
 > - Enabled on GitLab.com in GitLab 14.0.
@@ -14,7 +14,7 @@ On self-managed GitLab, by default this feature is not available. To make it ava
 On GitLab.com, this feature is available.
 This feature is ready for production use.
 
-To use custom emojis in comments and descriptions, you can add them to a top-level group using the GraphQL API.
+To use custom emoji in comments and descriptions, you can add them to a top-level group using the GraphQL API.
 
 Parameters:
 
@@ -38,7 +38,7 @@ mutation CreateCustomEmoji($groupPath: ID!) {
 }
 ```
 
-After adding a custom emoji to the group, members can use it in the same way as other emojis in the comments.
+After adding a custom emoji to the group, members can use it in the same way as other emoji in the comments.
 
 ## Get custom emoji for a group
 

doc/api/graphql/index.md

@@ -57,7 +57,7 @@ You can work with sample queries that pull data from public projects on GitLab.c
 - [Create an audit report](audit_report.md)
 - [Identify issue boards](sample_issue_boards.md)
 - [Query users](users_example.md)
-- [Use custom emojis](custom_emoji.md)
+- [Use custom emoji](custom_emoji.md)
 
 The [get started](getting_started.md) page includes different methods to customize GraphQL queries.
 

doc/development/documentation/styleguide/index.md

@@ -1201,7 +1201,7 @@ include a visual representation to help readers understand it, you can:
   an area of the screen.
 - Create a short video of the interaction and link to it.
 
-## Emojis
+## Emoji
 
 Don't use the Markdown emoji format, for example `:smile:`, for any purpose. Use
 [GitLab SVG icons](#gitlab-svg-icons) instead.

doc/development/documentation/styleguide/word_list.md

@@ -458,9 +458,9 @@ Instead of:
 
 Do not use **e-mail** with a hyphen. When plural, use **emails** or **email messages**. ([Vale](../testing.md#vale) rule: [`SubstitutionSuggestions.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/SubstitutionSuggestions.yml))
 
-## emojis
+## emoji
 
-Use **emojis** to refer to the plural form of **emoji**.
+Use **emoji** to refer to the plural form of **emoji**.
 
 ## enable
 

doc/operations/incident_management/incident_timeline_events.md

@@ -139,7 +139,7 @@ Added tags are displayed next to the timestamp.
 Incident timeline events support the following [GitLab Flavored Markdown](../../user/markdown.md) features.
 
 - [Code](../../user/markdown.md#code-spans-and-blocks).
-- [Emojis](../../user/markdown.md#emojis).
+- [Emoji](../../user/markdown.md#emoji).
 - [Emphasis](../../user/markdown.md#emphasis).
 - [GitLab-specific references](../../user/markdown.md#gitlab-specific-references).
 - [Images](../../user/markdown.md#images), rendered as a link to the uploaded image.

doc/operations/incident_management/status_page.md

@@ -19,8 +19,8 @@ Selecting an incident displays a detail page with more information about a parti
 ![Status Page detail](img/status_page_detail_v12_10.png)
 
 - Status on the incident, including when the incident was last updated.
-- The incident title, including any emojis.
-- The description of the incident, including emojis.
+- The incident title, including any emoji.
+- The description of the incident, including emoji.
 - Any file attachments provided in the incident description, or comments with a
   valid image extension. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/205166) in GitLab 13.1.
 - A chronological ordered list of updates to the incident.

doc/user/award_emojis.md

@@ -6,11 +6,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Emoji reactions **(FREE)**
 
-> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/409884) from "award emojis" to "emoji reactions" in GitLab 16.0.
-> - Reacting with emojis on work items (such as tasks, objectives, and key results) [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/393599) in GitLab 16.0.
+> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/409884) from "award emoji" to "emoji reactions" in GitLab 16.0.
+> - Reacting with emoji on work items (such as tasks, objectives, and key results) [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/393599) in GitLab 16.0.
 
 When you're collaborating online, you get fewer opportunities for high-fives
-and thumbs-ups. React with emojis on:
+and thumbs-ups. React with emoji on:
 
 - [Issues](project/issues/index.md).
 - [Tasks](tasks.md).
@@ -51,14 +51,14 @@ To add an emoji reaction:
 
 To remove an emoji reaction, select the emoji again.
 
-## Custom emojis
+## Custom emoji
 
-You can upload custom emojis to a GitLab instance with the GraphQL API.
-For more information, see [Use custom emojis with GraphQL](../api/graphql/custom_emoji.md).
+You can upload custom emoji to a GitLab instance with the GraphQL API.
+For more information, see [Use custom emoji with GraphQL](../api/graphql/custom_emoji.md).
 
-Custom emojis don't show in the emoji picker.
+Custom emoji don't show in the emoji picker.
 To use them in a text box, type the filename without the extension and surrounded by colons.
 For example, for a file named `thank-you.png`, type `:thank-you:`.
 
-For a list of custom emojis available for GitLab.com, see
+For a list of custom emoji available for GitLab.com, see
 [the `custom_emoji` project](https://gitlab.com/custom_emoji/custom_emoji/-/tree/main/img).

doc/user/markdown.md

@@ -58,7 +58,7 @@ Features not found in standard Markdown:
 
 - [Color chips written in `HEX`, `RGB` or `HSL`](#colors)
 - [Diagrams and flowcharts](#diagrams-and-flowcharts)
-- [Emoji](#emojis)
+- [Emoji](#emoji)
 - [Front matter](#front-matter)
 - [Inline diffs](#inline-diff)
 - [Math equations and symbols written in LaTeX](#math)
@@ -207,9 +207,9 @@ installation of GitLab, a GitLab administrator [must enable it](../administratio
 To make Kroki available in GitLab, a GitLab administrator must enable it.
 For more information, see the [Kroki integration](../administration/integration/kroki.md) page.
 
-### Emojis
+### Emoji
 
-[View this topic in GitLab](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/user/markdown.md#emojis).
+[View this topic in GitLab](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/user/markdown.md#emoji).
 
 ::Tabs
 
@@ -250,13 +250,13 @@ for a list of all supported emoji codes. :thumbsup:
 
 ::EndTabs
 
-#### Emojis and your operating system
+#### Emoji and your operating system
 
-The previous emoji example uses hard-coded images. Rendered emojis
+The previous emoji example uses hard-coded images. Rendered emoji
 in GitLab may be different depending on the OS and browser used.
 
-Most emojis are natively supported on macOS, Windows, iOS, Android, and fall back on image-based
-emojis where there is no support.
+Most emoji are natively supported on macOS, Windows, iOS, Android, and fall back on image-based
+emoji where there is no support.
 
 <!-- vale gitlab.Spelling = NO -->
 
@@ -266,7 +266,7 @@ this font installed by default.
 
 <!-- vale gitlab.Spelling = YES -->
 
-To learn more about adding custom emojis, see [Custom emojis](award_emojis.md#custom-emojis).
+To learn more about adding custom emoji, see [Custom emoji](award_emojis.md#custom-emoji).
 
 ### Front matter
 

doc/user/profile/index.md

@@ -39,7 +39,7 @@ Prerequisites:
   - Have a project that hosts [GitLab Pages](../project/pages/index.md). For more information,
   see [changing your username in the GitLab Team Handbook](https://about.gitlab.com/handbook/tools-and-tips/#change-your-username-at-gitlabcom).
 - Your username must be between 2 and 255 characters in length, and must not:
-  - Contain special characters or emojis.
+  - Contain special characters or emoji.
   - End with `.<reserved file extension>`, for example `jon.png`. However, `jonpng` is valid.
 
 To change your username:

doc/user/reserved_names.md

@@ -20,7 +20,7 @@ under the `TOP_LEVEL_ROUTES`, `PROJECT_WILDCARD_ROUTES` and `GROUP_ROUTES` lists
 ## Limitations on project and group names
 
 - Project or group names must start with a letter, digit, emoji, or "_".
-- Project or group names can only contain letters, digits, emojis, "_", ".", "+", dashes, or spaces.
+- Project or group names can only contain letters, digits, emoji, "_", ".", "+", dashes, or spaces.
 - Project or group slugs must start with a letter or digit.
 - Project or group slugs can only contain letters, digits, '_', '.', '+', or dashes.
 - Project or group slugs must not contain consecutive special characters.