Merge pull request github#35335 from github/repo-sync

Repo sync

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address.md

@@ -16,7 +16,7 @@ topics:
 shortTitle: Verify your email address
 ---
 
-## About email verification{% ifversion ghec %} for personal accounts{% endif %}
+## About email verification for personal accounts
 
 You can verify your email address after signing up for a new account, or when you add a new email address. If an email address is undeliverable or bouncing, it will be unverified.
 
@@ -38,15 +38,15 @@ If you do not verify your email address, you will not be able to:
 > * {% data reusables.user-settings.no-verification-disposable-emails %}
 > * {% data reusables.user-settings.verify-org-approved-email-domain %}
 
-{% ifversion ghec %}
+## About email verification for {% data variables.enterprise.prodname_managed_users %}
 
-## About email verification{% ifversion ghec %} for {% data variables.enterprise.prodname_managed_users %}{% endif %}
+If you are a member of an {% data variables.enterprise.prodname_emu_enterprise %} and your account was created from August 2024, your email address is unverified by default. Having an unverified email address does not affect most actions you can take on {% data variables.product.prodname_dotcom %}. However, in rare cases it may prevent you from accessing some third-party {% data variables.product.prodname_github_apps %} and {% data variables.product.prodname_oauth_apps %}.
 
-If you are a member of an {% data variables.enterprise.prodname_emu_enterprise %}, your email address is considered unverified if it is used as a verified email by another account on {% data variables.product.prodname_dotcom %}. To verify the email, you will need to unverify the email address for the other account, then verify it for your {% data variables.enterprise.prodname_managed_user %}. See "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/changing-your-primary-email-address)."
+Until you verify your email address, your account will use a placeholder email address with your enterprise's shortcode appended for certain operations. For example, the REST API endpoint for users will return `[email protected]`. In rare cases, you may find that third-party apps or your company's email provider do not handle the placeholder email correctly.
 
-Having an unverified email address does not affect most actions you can take on {% data variables.product.prodname_dotcom %}. However, it may prevent you from accessing some third-party {% data variables.product.prodname_github_apps %} and {% data variables.product.prodname_oauth_apps %}.
+You cannot verify an email address for your {% data variables.enterprise.prodname_managed_user %} if the email address is already verified by another account on {% data variables.product.prodname_dotcom_the_website %}. To verify the email, you will need to unverify the email address on the conflicting account, then verify it for your {% data variables.enterprise.prodname_managed_user %}. See "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/changing-your-primary-email-address)."
 
-{% endif %}
+Once you verify an email with a {% data variables.enterprise.prodname_managed_user %}, you won't be able to use the email to sign up for a personal account on {% data variables.product.prodname_dotcom_the_website %}.
 
 ## Verifying your email address
 
@@ -74,16 +74,12 @@ If you click on the link in the confirmation email within 24 hours and you are d
 1. Sign in to your account.
 1. Click on the verification link in the email we sent you.
 
-{% ifversion ghec %}
-
 ### Email is already verified by another user
 
 If you see the error message `Error adding EMAIL: Email is already verified by another user`, you must either unverify the email for the other account before proceeding, or choose a different email address to verify.
 
 To unverify an email address, delete it in your email settings, then optionally re-add it without verifying to keep any commits linked to your account. See "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/changing-your-primary-email-address)."
 
-{% endif %}
-
 ## Further reading
 
 * "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/changing-your-primary-email-address)"

content/actions/security-for-github-actions/using-artifact-attestations/enforcing-artifact-attestations-with-a-kubernetes-admission-controller.md

@@ -60,7 +60,7 @@ Once the policy controller has been deployed, you need to add the GitHub `TrustR
 helm upgrade trust-policies --install --atomic \
  --namespace artifact-attestations \
  oci://ghcr.io/github/artifact-attestations-helm-charts/trust-policies \
- --version v0.6.1 \
+ --version v0.6.2 \
  --set policy.enabled=true \
  --set policy.organization=MY-ORGANIZATION
 ```
@@ -98,7 +98,7 @@ For example, to enforce attestations for images that match the pattern `ghcr.io/
 helm upgrade trust-policies --install --atomic \
  --namespace artifact-attestations \
  oci://ghcr.io/github/artifact-attestations-helm-charts/trust-policies \
- --version v0.6.1 \
+ --version v0.6.2 \
  --set policy.enabled=true \
  --set policy.organization=MY-ORGANIZATION \
  --set-json 'policy.exemptImages=["index.docker.io/library/busybox**"]' \
@@ -137,7 +137,7 @@ helm show values oci://ghcr.io/github/artifact-attestations-helm-charts/policy-c
 For trust policy options:
 
 ```bash copy
-helm show values oci://ghcr.io/github/artifact-attestations-helm-charts/trust-policies --version v0.6.1
+helm show values oci://ghcr.io/github/artifact-attestations-helm-charts/trust-policies --version v0.6.2
 ```
 
 For more information on the Sigstore Policy Controller, see the [Sigstore Policy Controller documentation](https://docs.sigstore.dev/policy-controller/overview/).

content/get-started/start-your-journey/creating-an-account-on-github.md

@@ -36,6 +36,8 @@ Note that the steps in this article don't apply to {% data variables.product.pro
 
 During sign up, you'll be asked to verify your email address. Without a verified email address, you won't be able to complete some basic {% data variables.product.prodname_dotcom %} tasks, such as creating a repository.
 
+Some enterprises create {% data variables.enterprise.prodname_managed_users %} for their users. You can't sign up for a personal account with an email address that's already verified for a {% data variables.enterprise.prodname_managed_user %}.
+
 If you're having problems verifying your email address, there are some troubleshooting steps you can take. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address#troubleshooting-email-verification)."
 
 ## Next steps