From 8c436538a0b61bcd79a4f26e87462262d41e1d1b Mon Sep 17 00:00:00 2001 From: DaveyJH <80708826+DaveyJH@users.noreply.github.com> Date: Fri, 10 Jun 2022 16:23:45 +0000 Subject: [PATCH] fix #18528 : Remove `-` from `no-reply` Remove the erroneous `-` from instances of `no-reply` in 'setting your commit email address' doc, including reusable. This results in `noreply` which is the format the noreply email address is presented in. A search through all files returns other instances of 'no-reply', some in code style, some not. I will have a read through the relevant docs and see if these should be changed but am uncertain about some at first glance as I/my machine seem to meet `if` criteria that negates the rendering of this wording. Adding them as a separate commit seems more logical as it allows dropping those changes as they may be deemed not related to #18528. Hope that is an acceptable practice! --- .../setting-your-commit-email-address.md | 4 ++-- data/reusables/user-settings/set_your_email_address_in_git.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address.md b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address.md index b40af318da..2a2c0f6284 100644 --- a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address.md +++ b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address.md @@ -41,7 +41,7 @@ For web-based Git operations, you can set your commit email address on {% ifvers {% endif %} -{% ifversion fpt or ghec %}If you'd like to keep your personal email address private, you can use a `no-reply` email address from {% data variables.product.product_name %} as your commit email address. To use your `noreply` email address for commits you push from the command line, use that email address when you set your commit email address in Git. To use your `noreply` address for web-based Git operations, set your commit email address on GitHub and choose to **Keep my email address private**. +{% ifversion fpt or ghec %}If you'd like to keep your personal email address private, you can use a `noreply` email address from {% data variables.product.product_name %} as your commit email address. To use your `noreply` email address for commits you push from the command line, use that email address when you set your commit email address in Git. To use your `noreply` address for web-based Git operations, set your commit email address on GitHub and choose to **Keep my email address private**. You can also choose to block commits you push from the command line that expose your personal email address. For more information, see "[Blocking command line pushes that expose your personal email](/articles/blocking-command-line-pushes-that-expose-your-personal-email-address)."{% endif %} @@ -51,7 +51,7 @@ To ensure that commits are attributed to you and appear in your contributions gr {% note %} -**Note:** If you created your account on {% data variables.product.product_location %} _after_ July 18, 2017, your `no-reply` email address for {% data variables.product.product_name %} is a seven-digit ID number and your username in the form of ID+username@users.noreply.github.com. If you created your account on {% data variables.product.product_location %} _prior to_ July 18, 2017, your `no-reply` email address from {% data variables.product.product_name %} is username@users.noreply.github.com. You can get an ID-based `no-reply` email address for {% data variables.product.product_name %} by selecting (or deselecting and reselecting) **Keep my email address private** in your email settings. +**Note:** If you created your account on {% data variables.product.product_location %} _after_ July 18, 2017, your `noreply` email address for {% data variables.product.product_name %} is a seven-digit ID number and your username in the form of ID+username@users.noreply.github.com. If you created your account on {% data variables.product.product_location %} _prior to_ July 18, 2017, your `noreply` email address from {% data variables.product.product_name %} is username@users.noreply.github.com. You can get an ID-based `noreply` email address for {% data variables.product.product_name %} by selecting (or deselecting and reselecting) **Keep my email address private** in your email settings. {% endnote %} diff --git a/data/reusables/user-settings/set_your_email_address_in_git.md b/data/reusables/user-settings/set_your_email_address_in_git.md index 0c675057f7..fd5166d1cd 100644 --- a/data/reusables/user-settings/set_your_email_address_in_git.md +++ b/data/reusables/user-settings/set_your_email_address_in_git.md @@ -1 +1 @@ -Set an email address in Git. You can use {% ifversion fpt or ghec %}your [{% data variables.product.product_name %}-provided `no-reply` email address](/articles/setting-your-commit-email-address) or {% endif %}any email address. +Set an email address in Git. You can use {% ifversion fpt or ghec %}your [{% data variables.product.product_name %}-provided `noreply` email address](/articles/setting-your-commit-email-address) or {% endif %}any email address.