Branch was updated using the 'autoupdate branch' Actions workflow.

.github/workflows/staging-deploy-pr.yml

@@ -90,7 +90,7 @@ jobs:
         run: rm -rf script/
 
       - name: Create a gzipped archive
-        run: tar -cfz app.tar.gz ./
+        run: tar -czf app.tar.gz ./
 
       - name: Install Heroku client development-only dependency
         run: npm install --no-save heroku-client

content/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise.md

@@ -1,7 +1,7 @@
 ---
 title: Verifying or approving a domain for your enterprise
 intro: 'You can verify your ownership of domains with {% data variables.product.company_short %} to confirm the identity of organizations owned by your enterprise account. You can also approve domains where organization members can receive email notifications.'
-product: '{% data reusables.gated-features.enterprise-accounts %}'
+product: '{% data reusables.gated-features.verify-and-approve-domain %}'
 versions:
   ghes: '>=3.2'
 permissions: Enterprise owners can verify or approve a domain for an enterprise account.

content/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise.md

@@ -1,7 +1,7 @@
 ---
 title: Restricting email notifications for your enterprise
 intro: You can prevent your enterprise's information from leaking into personal email accounts by restricting the domains where members can receive email notifications about activity in organizations owned by your enterprise.
-product: '{% data reusables.gated-features.enterprise-accounts %}'
+product: '{% data reusables.gated-features.restrict-email-domain %}'
 versions:
   ghes: '>=3.2'
 permissions: Enterprise owners can restrict email notifications for an enterprise.

content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md

@@ -40,6 +40,7 @@ You can upgrade your personal account from {% data variables.product.prodname_fr
 2. Under "Pro" on the "Compare plans" page, click **Upgrade to Pro**.
 {% data reusables.dotcom_billing.choose-monthly-or-yearly-billing %}
 {% data reusables.dotcom_billing.show-plan-details %}
+{% data reusables.dotcom_billing.enter-billing-info %}
 {% data reusables.dotcom_billing.enter-payment-info %}
 {% data reusables.dotcom_billing.finish_upgrade %}
 

content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md

@@ -33,8 +33,11 @@ We don't provide invoicing or support purchase orders for personal accounts. We
 
 {% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.update_payment_method %}
-1. If your account has an existing credit card that you want to update, click **New Card**.
+1. If your account has existing billing information that you want to update, click **Edit**.
-![Billing New Card button](/assets/images/help/billing/billing-new-card-button.png)
+![Billing New Card button](/assets/images/help/billing/billing-information-edit-button.png)
+{% data reusables.dotcom_billing.enter-billing-info %}
+1. If your account has an existing payment method that you want to update, click **Edit**.
+![Billing New Card button](/assets/images/help/billing/billing-payment-method-edit-button.png)
 {% data reusables.dotcom_billing.enter-payment-info %}
 
 ## Updating your organization's payment method
@@ -43,7 +46,6 @@ We don't provide invoicing or support purchase orders for personal accounts. We
 
 If your organization is outside of the US or if you're using a corporate checking account to pay for {% data variables.product.product_name %}, PayPal could be a helpful method of payment.
 
-
 {% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.update_payment_method %}
 1. If your account has an existing credit card that you want to update, click **New Card**.

content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/verifying-or-approving-a-domain-for-your-enterprise-account.md

@@ -1,7 +1,7 @@
 ---
 title: Verifying or approving a domain for your enterprise account
 intro: 'You can verify your ownership of domains with {% data variables.product.company_short %} to confirm the identity of organizations owned by your enterprise account. You can also approve domains that {% data variables.product.company_short %} can send email notifications to for members of organizations owned by your enterprise account.'
-product: '{% data reusables.gated-features.enterprise-accounts %}'
+product: '{% data reusables.gated-features.verify-and-approve-domain %}'
 versions:
   fpt: '*'
 permissions: Enterprise owners can verify or approve a domain for an enterprise account.

content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account/restricting-email-notifications-for-your-enterprise-account.md

@@ -1,7 +1,7 @@
 ---
 title: Restricting email notifications for your enterprise account
 intro: You can prevent your enterprise's information from leaking into personal email accounts by restricting the domains where members can receive email notifications about activity in organizations owned by your enterprise account.
-product: '{% data reusables.gated-features.enterprise-accounts %}'
+product: '{% data reusables.gated-features.restrict-email-domain %}'
 versions:
   fpt: '*'
 permissions: Enterprise owners can restrict email notifications for an enterprise account.

content/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization.md

@@ -32,7 +32,7 @@ For more information, see "[Verifying or approving a domain for your organizatio
 
 Outside collaborators are not subject to restrictions on email notifications for verified or approved domains. For more information about outside collaborators, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization#outside-collaborators)."
 
-If your organization is owned by an enterprise account, organization members will be able to receive notifications from any domains verified or approved for the enterprise account, in addition to any domains verified or approved for the organization. {% ifversion fpt %}For more information, see "[Verifying or approving a domain for your enterprise account](/github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account)."{% endif %}
+If your organization is owned by an enterprise account, organization members will be able to receive notifications from any domains verified or approved for the enterprise account, in addition to any domains verified or approved for the organization. {% ifversion fpt %}For more information, see "[Verifying or approving a domain for your enterprise account](/github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account)."{% endif %}{% ifversion ghes > 3.1 %}For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)."{% endif %}
 
 ## Restricting email notifications
 

content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md

@@ -1,6 +1,7 @@
 ---
 title: Verifying or approving a domain for your organization
 intro: 'You can verify your ownership of domains with {% data variables.product.company_short %} to confirm your organization''s identity. You can also approve domains that {% data variables.product.company_short %} can send email notifications to for members of your organization.'
+product: '{% data reusables.gated-features.verify-and-approve-domain %}'
 redirect_from:
   - /articles/verifying-your-organization-s-domain
   - /articles/verifying-your-organizations-domain
@@ -21,17 +22,13 @@ shortTitle: Verify or approve a domain
 
 ## About domain verification
 
-After verifying ownership of your organization's domains, a "Verified" badge will display on the organization's profile. If your organization is on {% data variables.product.prodname_ghe_cloud %} and has agreed to the Corporate Terms of Service, organization owners will be able to verify the identity of organization members by viewing each member's email address within the verified domain. For more information, see "[About your organization's profile page](/articles/about-your-organization-s-profile/)" and "<a href="/articles/upgrading-to-the-corporate-terms-of-service" class="dotcom-only">Upgrading to the Corporate Terms of Service</a>."
+After verifying ownership of your organization's domains, a "Verified" badge will display on the organization's profile. {% ifversion fpt %}If your organization is on {% data variables.product.prodname_ghe_cloud %} and has agreed to the Corporate Terms of Service, organization owners will be able to verify the identity of organization members by viewing each member's email address within the verified domain. For more information, see "[About your organization's profile page](/articles/about-your-organization-s-profile/)" and "<a href="/articles/upgrading-to-the-corporate-terms-of-service" class="dotcom-only">Upgrading to the Corporate Terms of Service</a>."{% endif %}
 
-{% ifversion fpt %}
+{% ifversion fpt %}If your organization is owned by an enterprise account, a{% elsif ghes %}A{% endif %} "Verified" badge will display on your organization's profile for any domains verified for the enterprise account, in addition to any domains verified for the organization. Organization owners can view any domains that an enterprise owner has verified or approved, and edit the domains if the organization owner is also an enterprise owner. {% ifversion fpt %}For more information, see "[Verifying or approving a domain for your enterprise account](/github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account)."{% endif %}{% ifversion ghes > 3.1 %}For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)."{% endif %}
-
-If your organization is owned by an enterprise account, a "Verified" badge will display on your organization's profile for any domains verified for the enterprise account, in addition to any domains verified for the organization. Organization owners can view any domains that an enterprise owner has verified or approved, and edit the domains if the organization owner is also an enterprise owners. For more information, see "[Verifying or approving a domain for your enterprise account](/github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account)."
-
-{% endif %}
 
 {% data reusables.organizations.verified-domains-details %}
 
-On {% data variables.product.prodname_ghe_cloud %}, after verifying ownership of your organization's domain, you can restrict email notifications for the organization to that domain. For more information, see "[Restricting email notifications for your organization](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)." {% data reusables.enterprise.link-to-ghec-trial %}
+{% ifversion fpt %}On {% data variables.product.prodname_ghe_cloud %}, after verifying ownership of your organization's domain, you can restrict email notifications for the organization to that domain. For more information, see "[Restricting email notifications for your organization](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)." {% data reusables.enterprise.link-to-ghec-trial %}{% endif %}
 
 ## About domain approval
 
@@ -43,11 +40,7 @@ After you approve domains for your organization, you can restrict email notifica
 
 Enterprise owners cannot see which organization members or email addresses receive notifications within approved domains.
 
-{% ifversion fpt %}
+Enterprise owners can also approve additional domains for organizations owned by the enterprise. {% ifversion fpt %}For more information, see "[Verifying or approving a domain for your enterprise account](/github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account)."{% endif %}{% ifversion ghes > 3.1 %}For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)."{% endif %}
-
-Enterprise owners can also approve additional domains for organizations owned by the enterprise. For more information, see "[Verifying or approving a domain for your enterprise account](/github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account)."
-
-{% endif %}
 
 ## Verifying a domain for your organization
 

content/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization.md

@@ -102,7 +102,9 @@ Some of the features listed below are limited to organizations using {% data var
 | Configure code review assignments (see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)") | **X** |  |
 | Add collaborators to **all repositories** | **X** |  |
 | Access the organization audit log | **X** |  |
-| Edit the organization's profile page (see "[About your organization's profile](/github/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile)" for details) | **X** |  |  |
+| Edit the organization's profile page (see "[About your organization's profile](/github/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-organizations-profile)" for details) | **X** |  |  |{% ifversion ghes > 3.1 %}
+| Verify the organization's domains (see "[Verifying your organization's domain](/articles/verifying-your-organization-s-domain)" for details) | **X** |  |
+| Restrict email notifications to verified or approved domains (see "[Restricting email notifications for your organization](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)" for details) | **X** |  |{% endif %}
 | Delete **all teams** | **X** |  |
 | Delete the organization account, including all repositories | **X** |  |
 | Create teams (see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)" for details) | **X** | **X** |

data/reusables/dotcom_billing/enter-billing-info.md

@@ -0,0 +1 @@
+1. Under "Billing information", complete the form, then click **Save**.

data/reusables/enterprise-accounts/continue-verifying-domain.md

@@ -0,0 +1,4 @@
+9. To the right of the domain that's pending verification, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Continue verifying**.
+![Continue verifying domain button](/assets/images/help/enterprises/continue-verifying-domain-enterprise.png)
+10. Click **Verify**.
+![Verify button](/assets/images/help/organizations/verify-domain-final-button.png)

data/reusables/enterprise-accounts/domains-about-approval.md

@@ -2,9 +2,7 @@
 
 {% data reusables.enterprise-accounts.approved-domains-about %}
 
-After you approve domains for your enterprise account, you can restrict email notifications for activity within your enterprise account to users with verified email addresses within verified or approved domains. {% ifversion fpt%}For more information, see "[Restricting email notifications for your enterprise account](/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account)."{% endif %}
+After you approve domains for your enterprise account, you can restrict email notifications for activity within your enterprise account to users with verified email addresses within verified or approved domains. {% ifversion fpt%}For more information, see "[Restricting email notifications for your enterprise account](/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account)."{% endif %}{% ifversion ghes > 3.1 %}For more information, see "[Restricting email notifications for your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise)."{% endif %}
-
-{% data reusables.enterprise-accounts.approved-domains-about %}
 
 {% ifversion fpt%}To receive email notifications, the owner of the user account must verify the email address in on {% data variables.product.product_name %}. For more information, see "[Verifying your email address](/github/getting-started-with-github/verifying-your-email-address)."{% endif %}
 

data/reusables/enterprise-accounts/domains-about-verification.md

@@ -4,7 +4,7 @@ After you verify ownership of your enterprise account's domains, a "Verified" ba
 
 Organization owners will be able to verify the identity of organization members by viewing each member's email address within the verified domain.
 
-After you verify domains for your enterprise account, you can restrict email notifications to verified domains for all the organizations owned by your enterprise account. {% ifversion fpt%}For more information, see "[Restricting email notifications for your enterprise account](/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account)."{% endif %}
+After you verify domains for your enterprise account, you can restrict email notifications to verified domains for all the organizations owned by your enterprise account. {% ifversion fpt%}For more information, see "[Restricting email notifications for your enterprise account](/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account)."{% endif %}{% ifversion ghes > 3.1 %}For more information, see "[Restricting email notifications for your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise)."{% endif %}
 
 Even if you don't restrict email notifications for the enterprise account, if an organization owner has restricted email notifications for the organization, organization members will be able to receive notifications at any domains verified or approved for the enterprise account, in addition to any domains verified or approved for the organization. For more information about restricting notifications for an organization, see "[Restricting email notifications for your organization](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)."
 

data/reusables/enterprise-accounts/domains-verifying.md

@@ -11,6 +11,6 @@ To verify your enterprise account's domain, you must have access to modify domai
    dig _github-challenge-<em>ENTERPRISE-ACCOUNT</em>.<em>example.com</em> +nostats +nocomments +nocmd TXT
    ```
 1. After confirming your TXT record is added to your DNS, follow steps one through four above to navigate to your enterprise account's approved and verified domains.
-{% data reusables.organizations.continue-verifying-domain %}
+{% data reusables.enterprise-accounts.continue-verifying-domain %}
 1. Optionally, after the "Verified" badge is visible on your organizations' profiles, delete the TXT entry from the DNS record at your domain hosting service.
 ![Verified badge](/assets/images/help/organizations/verified-badge.png)

data/reusables/enterprise-accounts/email-restrictions-about.md

@@ -6,6 +6,10 @@ When you restrict email notifications, enterprise members can only use an email
 The domains can be inherited from the enterprise account or configured for the specific organization. For more information, see "[Verifying or approving a domain for your enterprise account](/github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account)" and "[Restricting email notifications for your organization](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)."
 {% endif %}
 
+{%  ifversion ghes > 3.1 %}
+The domains can be inherited from the enterprise account or configured for the specific organization. For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)" and "[Restricting email notifications for your organization](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)."
+{% endif %}
+
 {% data reusables.notifications.email-restrictions-verification %}
 
 If email restrictions are enabled for an enterprise account, organization owners cannot disable email restrictions for any organization owned by the enterprise account. If changes occur that result in an organization having no verified or approved domains, either inherited from an enterprise account that owns the organization or for the specific organization, email restrictions will be disabled for the organization.

data/reusables/enterprise-accounts/email-restrictions-restricting.md

@@ -1,7 +1,7 @@
-Before you can restrict email notifications for your enterprise account, you must verify or approve at least one domain for the enterprise account. {% ifversion fpt %} For more information, see "[Verifying or approving a domain for your enterprise account](/github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account)."{% endif %}
+Before you can restrict email notifications for your enterprise account, you must verify or approve at least one domain for the enterprise account. {% ifversion fpt %} For more information, see "[Verifying or approving a domain for your enterprise account](/github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account)."{% endif %}{% ifversion ghes > 3.1 %} For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)."{% endif %}
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.verified-domains-tab %}
-{% data reusables.organizations.restrict-email-notifications %}
+{% data reusables.enterprise-accounts.restrict-email-notifications-enterprise %}
 1. Click **Save**.

data/reusables/enterprise-accounts/restrict-email-notifications-enterprise.md

@@ -0,0 +1,2 @@
+1. Under "Notification preferences", select **Restrict email notifications to only approved or verified domains**.
+  ![Checkbox to restrict email notifications to verified domain emails](/assets/images/help/enterprises/restrict-email-notifications-to-domain-enterprise.png)

data/reusables/gated-features/restrict-email-domain.md

@@ -1 +1 @@
-Restricting email notifications to domain email is available with {% data variables.product.prodname_ghe_cloud %}. For more information, see "[GitHub's products](/articles/githubs-products)."
+Restriction of email notifications to approved or verified domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[GitHub's products](/articles/githubs-products)."

data/reusables/gated-features/verify-and-approve-domain.md

@@ -0,0 +1 @@
+Verification and approval of domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[GitHub's products](/articles/githubs-products)."

data/reusables/organizations/restrict-email-notifications.md

@@ -1,2 +1,2 @@
-1. Under "Enforcement preferences", select **Restrict email notifications to domain email**.
+1. Under "Notification preferences", select **Restrict email notifications to only approved or verified domains**.
   ![Checkbox to restrict email notifications to verified domain emails](/assets/images/help/organizations/restrict-email-notifications-to-domain.png)