Merge branch 'selhorn-email-nohyphen' into 'master'

Removed hyphen from email

See merge request gitlab-org/gitlab!64876

doc/administration/auth/oidc.md

@@ -231,7 +231,7 @@ standard Azure B2C user flows [do not send the OpenID `email` claim](https://git
 other words, they do not work with the [`allow_single_sign_on` or `auto_link_user`
 parameters](../../integration/omniauth.md#initial-omniauth-configuration).
 With a standard Azure B2C policy, GitLab cannot create a new account or
-link to an existing one with an e-mail address.
+link to an existing one with an email address.
 
 Carefully follow the instructions for [creating a custom policy](https://docs.microsoft.com/en-us/azure/active-directory-b2c/tutorial-create-user-flows?pivots=b2c-custom-policy).
 
@@ -330,7 +330,7 @@ gitlab_rails['omniauth_providers'] = [
 the respective client IDs in the XML policy files.
 
 - Add `https://jwt.ms` as a redirect URI to the app, and use the [custom policy tester](https://docs.microsoft.com/en-us/azure/active-directory-b2c/tutorial-create-user-flows?pivots=b2c-custom-policy#test-the-custom-policy).
-Make sure the payload includes `email` that matches the user's e-mail access.
+Make sure the payload includes `email` that matches the user's email access.
 
 - After you enable the custom policy, users might see "Invalid username or password" after they try to sign in. This might be a configuration
 issue with the `IdentityExperienceFramework` app. See [this Microsoft comment](https://docs.microsoft.com/en-us/answers/questions/50355/unable-to-sign-on-using-custom-policy.html?childToView=122370#comment-122370)

doc/administration/incoming_email.md

@@ -16,7 +16,7 @@ GitLab has several features based on receiving incoming email messages:
 - [New merge request by email](../user/project/merge_requests/creating_merge_requests.md#new-merge-request-by-email):
   allow GitLab users to create a new merge request by sending an email to a
   user-specific email address.
-- [Service Desk](../user/project/service_desk.md): provide e-mail support to
+- [Service Desk](../user/project/service_desk.md): provide email support to
   your customers through GitLab.
 
 ## Requirements

doc/administration/troubleshooting/debug.md

@@ -119,7 +119,7 @@ an SMTP server, but you're not seeing mail delivered. Here's how to check the se
    irb(main):003:0> Notify.test_email('youremail@email.com', 'Hello World', 'This is a test message').deliver_now
    ```
 
-   If you do not receive an e-mail and/or see an error message, then check
+   If you do not receive an email and/or see an error message, then check
    your mail server settings.
 
 ## Advanced Issues

doc/api/settings.md

@@ -258,7 +258,7 @@ listed in the descriptions of the relevant settings.
 | `disabled_oauth_sign_in_sources`         | array of strings | no                                   | Disabled OAuth sign-in sources. |
 | `dns_rebinding_protection_enabled`       | boolean          | no                                   | Enforce DNS rebinding attack protection. |
 | `domain_denylist_enabled`                | boolean          | no                                   | (**If enabled, requires:** `domain_denylist`) Allows blocking sign-ups from emails from specific domains. |
-| `domain_denylist`                        | array of strings | no                                   | Users with e-mail addresses that match these domain(s) **cannot** sign up. Wildcards allowed. Use separate lines for multiple entries. Ex: `domain.com`, `*.domain.com`. |
+| `domain_denylist`                        | array of strings | no                                   | Users with email addresses that match these domain(s) **cannot** sign up. Wildcards allowed. Use separate lines for multiple entries. Ex: `domain.com`, `*.domain.com`. |
 | `domain_allowlist`                       | array of strings | no                                   | Force people to use only corporate emails for sign-up. Default is `null`, meaning there is no restriction. |
 | `dsa_key_restriction`                    | integer          | no                                   | The minimum allowed bit length of an uploaded DSA key. Default is `0` (no restriction). `-1` disables DSA keys. |
 | `ecdsa_key_restriction`                  | integer          | no                                   | The minimum allowed curve size (in bits) of an uploaded ECDSA key. Default is `0` (no restriction). `-1` disables ECDSA keys. |
@@ -413,7 +413,7 @@ listed in the descriptions of the relevant settings.
 | `unique_ips_limit_time_window`           | integer          | required by: `unique_ips_limit_enabled` | How many seconds an IP is counted towards the limit. |
 | `usage_ping_enabled`                     | boolean          | no                                   | Every week GitLab reports license usage back to GitLab, Inc. |
 | `user_default_external`                  | boolean          | no                                   | Newly registered users are external by default. |
-| `user_default_internal_regex`            | string           | no                                   | Specify an e-mail address regex pattern to identify default internal users. |
+| `user_default_internal_regex`            | string           | no                                   | Specify an email address regex pattern to identify default internal users. |
 | `user_oauth_applications`                | boolean          | no                                   | Allow users to register any application to use GitLab as an OAuth provider. |
 | `user_show_add_ssh_key_message`          | boolean          | no                                   | When set to `false` disable the `You won't be able to pull or push project code via SSH` warning shown to users with no uploaded SSH key. |
 | `version_check_enabled`                  | boolean          | no                                   | Let GitLab inform you when an update is available. |

doc/api/users.md

@@ -1352,7 +1352,7 @@ Parameters:
 
 - `id` (required) - ID of specified user
 - `email` (required) - email address
-- `skip_confirmation` (optional) - Skip confirmation and assume e-mail is verified - true or false (default)
+- `skip_confirmation` (optional) - Skip confirmation and assume email is verified - true or false (default)
 
 ## Delete email for current user
 

doc/development/documentation/styleguide/word_list.md

@@ -60,6 +60,10 @@ Do not use. If the user doesn't find the process to be these things, we lose the
 
 Do not use Latin abbreviations. Use **for example**, **such as**, **for instance**, or **like** instead. ([Vale](../testing.md#vale) rule: [`LatinTerms.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/LatinTerms.yml))
 
+## email
+
+Do not use **e-mail** with a hyphen. When plural, use **emails** or **email messages**.
+
 ## enable
 
 See [the Microsoft style guide](https://docs.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/e/enable-enables) for guidance.

doc/development/scalability.md

@@ -243,7 +243,7 @@ Ruby on Rails applications. In GitLab, Sidekiq performs the heavy
 lifting of many activities, including:
 
 - Updating merge requests after a push.
-- Sending e-mails.
+- Sending email messages.
 - Updating user authorizations.
 - Processing CI builds and pipelines.
 
@@ -276,7 +276,7 @@ in a timely manner:
   this to `ProcessCommitWorker`.
 - Redistribute/gerrymander Sidekiq processes by queue
   types. Long-running jobs (for example, relating to project import) can often
-  squeeze out jobs that run fast (for example, delivering e-mail). [This technique
+  squeeze out jobs that run fast (for example, delivering email). [This technique
   was used in to optimize our existing Sidekiq deployment](https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/7219#note_218019483).
 - Optimize jobs. Eliminating unnecessary work, reducing network calls
   (including SQL and Gitaly), and optimizing processor time can yield significant

doc/integration/shibboleth.md

@@ -67,7 +67,7 @@ The following changes are needed to enable Shibboleth:
    your users appear to be authenticated by Shibboleth and Apache, but GitLab
    rejects their account with a URI that contains "e-mail is invalid" then your
    Shibboleth Identity Provider or Attribute Authority may be asserting multiple
-   e-mail addresses. In this instance, you might consider setting the
+   email addresses. In this instance, you might consider setting the
    `multi_values` argument to `first`.
 
    The file should look like this:

doc/user/admin_area/review_abuse_reports.md

@@ -14,7 +14,7 @@ reports in the Admin Area.
 
 ## Receiving notifications of abuse reports
 
-To receive notifications of new abuse reports by e-mail, follow these steps:
+To receive notifications of new abuse reports by email, follow these steps:
 
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
 1. On the left sidebar, select **Settings > Reporting**.

doc/user/group/settings/import_export.md

@@ -70,7 +70,7 @@ For more details on the specific data persisted in a group export, see the
 
    ![Export group panel](img/export_panel_v13_0.png)
 
-1. After the export is generated, you should receive an e-mail with a link to the [exported contents](#exported-contents)
+1. After the export is generated, you should receive an email with a link to the [exported contents](#exported-contents)
    in a compressed tar archive, with contents in NDJSON format.
 
 1. Alternatively, you can come back to the project settings and download the

doc/user/project/import/bitbucket_server.md

@@ -51,7 +51,7 @@ The Bitbucket Server importer works as follows:
 ### User assignment
 
 When issues/pull requests are being imported, the Bitbucket importer tries to
-find the author's e-mail address with a confirmed e-mail address in the GitLab
+find the author's email address with a confirmed email address in the GitLab
 user database. If no such user is available, the project creator is set as
 the author. The importer appends a note in the comment to mark the original
 creator.

doc/user/project/merge_requests/creating_merge_requests.md

@@ -231,7 +231,7 @@ _In GitLab 11.7, we updated the format of the generated email address.
 However the older format is still supported, allowing existing aliases
 or contacts to continue working._
 
-### Adding patches when creating a merge request via e-mail
+### Adding patches when creating a merge request via email
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22723) in GitLab 11.5.
 

doc/user/project/pages/lets_encrypt_for_gitlab_pages.md

@@ -60,7 +60,7 @@ might be slightly different. Follow the
    sudo certbot certonly -a manual -d example.com --email your@email.com
    ```
 
-   Alternatively, you can register without adding an e-mail account,
+   Alternatively, you can register without adding an email account,
    but you aren't notified about the certificate expiration's date:
 
    ```shell

doc/user/project/service_desk.md

@@ -234,7 +234,7 @@ The configuration options are the same as for configuring
 > Introduced in [GitLab 13.11](https://gitlab.com/gitlab-org/gitlab/-/issues/214900)
 
 Service Desk can be configured to read Microsoft Exchange Online mailboxes with the Microsoft
-Graph API instead of IMAP. Follow the [documentation in the incoming e-mail section for setting up an OAuth2 application for Microsoft Graph](../../administration/incoming_email.md#microsoft-graph).
+Graph API instead of IMAP. Follow the [documentation in the incoming email section for setting up an OAuth2 application for Microsoft Graph](../../administration/incoming_email.md#microsoft-graph).
 
 - Example for Omnibus GitLab installations:
 

doc/user/project/settings/import_export.md

@@ -156,7 +156,7 @@ To export a project and its data, follow these steps:
 
    ![Export button](img/import_export_export_button.png)
 
-1. Once the export is generated, you should receive an e-mail with a link to
+1. Once the export is generated, you should receive an email with a link to
    download the file:
 
    ![Email download link](img/import_export_mail_link.png)