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

repo sync

content/billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md

@@ -30,8 +30,6 @@ When you downgrade your number of data packs, your change takes effect on your n
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.lfs-remove-data %}
 {% data reusables.large_files.downgrade_data_packs %}

content/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md

@@ -29,9 +29,7 @@ topics:
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.lfs-add-data %}
 {% data reusables.large_files.pack_selection %}
 {% data reusables.large_files.pack_confirm %}

content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md

@@ -28,9 +28,7 @@ topics:
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.lfs-data %}
 
 ### Further reading

content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md

@@ -43,9 +43,7 @@ Anyone can manage the spending limit for {% data variables.product.prodname_acti
 
 Organizations owners and billing managers can manage the spending limit for {% data variables.product.prodname_actions %} for an organization.
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.manage-spending-limit %}
 {% data reusables.dotcom_billing.monthly-spending-limit %}
 {% data reusables.dotcom_billing.update-spending-limit %}

content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md

@@ -30,9 +30,7 @@ Anyone can view {% data variables.product.prodname_actions %} usage for their ow
 
 Organization owners and billing managers can view {% data variables.product.prodname_actions %} usage for an organization. For organizations managed by an enterprise account, only the organization owners can view {% data variables.product.prodname_actions %} usage in the organization billing page.
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.actions-minutes %}
 {% data reusables.dotcom_billing.actions-packages-storage %}
 {% data reusables.dotcom_billing.actions-packages-report-download %}

content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md

@@ -43,9 +43,7 @@ Anyone can manage the spending limit for {% data variables.product.prodname_regi
 
 Organizations owners and billing managers can manage the spending limit for {% data variables.product.prodname_registry %} for an organization.
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.manage-spending-limit %}
 {% data reusables.dotcom_billing.monthly-spending-limit %}
 {% data reusables.dotcom_billing.update-spending-limit %}

content/billing/managing-billing-for-github-packages/viewing-your-github-packages-usage.md

@@ -28,9 +28,7 @@ Anyone can view {% data variables.product.prodname_registry %} usage for their o
 
 Organization owners and billing managers can view {% data variables.product.prodname_registry %} usage for an organization. For organizations managed by an enterprise account, only the organization owners can view {% data variables.product.prodname_registry %} usage in the organization billing page.
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.packages-data %}
 {% data reusables.dotcom_billing.actions-packages-storage %}
 {% data reusables.dotcom_billing.actions-packages-report-download %}

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

@@ -52,9 +52,7 @@ If you downgrade your organization from {% data variables.product.prodname_team
 
 If you downgrade your organization from {% data variables.product.prodname_ghe_cloud %} to {% data variables.product.prodname_team %} or {% data variables.product.prodname_free_team %}, the account will lose access to advanced security, compliance, and deployment controls. {% data reusables.gated-features.more-info %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 1. Under "Current plan", use the **Edit** drop-down and click the downgrade option you want.
   ![Downgrade button](/assets/images/help/billing/downgrade-option-button.png)
 {% data reusables.dotcom_billing.confirm_cancel_org_plan %}
@@ -65,9 +63,7 @@ If you downgrade your organization from {% data variables.product.prodname_ghe_c
 
 {% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[Switching your organization from per-repository to per-user pricing](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#switching-your-organization-from-per-repository-to-per-user-pricing)."
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 5. Under "Subscriptions", select the "Edit" drop-down, and click **Edit plan**.
     ![Edit Plan dropdown](/assets/images/help/billing/edit-plan-dropdown.png)
 1. Under "Billing/Plans",  next to the plan you want to change, click **Downgrade**.
@@ -82,9 +78,7 @@ To reduce the number of paid seats your organization uses, you can remove member
 - "[Converting an organization member to an outside collaborator](/articles/converting-an-organization-member-to-an-outside-collaborator)"
 - "[Managing an individual's access to an organization repository](/articles/managing-an-individual-s-access-to-an-organization-repository)"
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 1. Under "Current plan", use the **Edit** drop-down and click **Remove seats**.
   ![remove seats dropdown](/assets/images/help/billing/remove-seats-dropdown.png)
 1. Under "Remove seats", select the number of seats you'd like to downgrade to.

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

@@ -49,9 +49,7 @@ You can upgrade your organization from {% data variables.product.prodname_free_t
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.upgrade_org %}
 {% data reusables.dotcom_billing.choose_org_plan %}
 {% data reusables.dotcom_billing.choose-monthly-or-yearly-billing %}
@@ -70,9 +68,7 @@ If you'd like to use an enterprise account with {% data variables.product.prodna
 
 If you'd like additional users to have access to your {% data variables.product.prodname_team %} organization's private repositories, you can purchase more seats anytime.
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.add-seats %}
 {% data reusables.dotcom_billing.number-of-seats %}
 {% data reusables.dotcom_billing.confirm-add-seats %}
@@ -81,9 +77,7 @@ If you'd like additional users to have access to your {% data variables.product.
 
 {% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[About per-user pricing](/articles/about-per-user-pricing)."
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 5. To the right of your plan name, use the **Edit** drop-down menu, and select **Edit plan**.
   ![Edit drop-down menu](/assets/images/help/billing/per-user-upgrade-button.png)
 6. To the right of "Advanced tools for teams", click **Upgrade now**.

content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md

@@ -30,9 +30,7 @@ When you cancel a pending change, your subscription will not change on your next
 
 ### Viewing and managing pending changes to your organization's subscription
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.review-pending-changes %}
 {% data reusables.dotcom_billing.cancel-pending-changes %}
 {% data reusables.dotcom_billing.confirm-cancel-pending-changes %}

content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md

@@ -46,8 +46,6 @@ Your receipts include your {% data variables.product.prodname_dotcom %} subscrip
 {% endnote %}
 
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.user_settings.payment-info-link %}
 {% data reusables.dotcom_billing.extra_info_receipt %}

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

@@ -31,7 +31,6 @@ We don't provide invoicing or support purchase orders for personal accounts. We
 
 ### Updating your personal account's payment method
 
-{% data reusables.user_settings.access_settings %}
 {% 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**.
@@ -45,9 +44,7 @@ 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.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% 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**.
 ![Billing New Card button](/assets/images/help/billing/billing-new-card-button.png)

content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md

@@ -32,17 +32,13 @@ When you change your billing cycle's duration, your {% data variables.product.pr
 
 #### Changing the duration of a per-user subscription
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.change_plan_duration %}
 {% data reusables.dotcom_billing.confirm_duration_change %}
 
 #### Changing the duration of a legacy per-repository plan
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 4. Under "Billing overview", click **Change plan**.
   ![Billing overview change plan button](/assets/images/help/billing/billing_overview_change_plan.png)
 5. At the top right corner, click **Switch to monthly billing** or **Switch to yearly billing**.

content/billing/managing-your-github-billing-settings/removing-a-payment-method.md

@@ -39,9 +39,7 @@ If you're paying for your {% data variables.product.product_name %} subscription
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.user_settings.payment-info-link %}
 {% data reusables.dotcom_billing.remove-payment-method %}
 {% data reusables.dotcom_billing.remove_payment_info %}

content/billing/managing-your-github-billing-settings/setting-your-billing-email.md

@@ -28,26 +28,25 @@ If you'd like to change your billing email, see "[Changing your primary email ad
 
 ### Setting your organization's billing email
 
-Your organization's billing email is where {% data variables.product.product_name %} sends receipts and other billing-related communication.
+Your organization's billing email is where {% data variables.product.product_name %} sends receipts and other billing-related communication. The email address does not need to be unique to the organization account.
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-4. Under **Billing email**, type a valid email address. The email does not need to be unique to the organization account.
-  ![Billing email textbox](/assets/images/help/settings/org-billing-email.png)
-5. To confirm your changes, click **Update profile**.
-  ![Update profile button](/assets/images/help/settings/update-profile-button.png)
+{% data reusables.organizations.billing-settings %}
+1. Under "Billing management", to the right of the billing email address, click **Edit**.
+  ![Current billing emails](/assets/images/help/billing/billing-change-email.png)
+2. Type a valid email address, then click **Update**.
+  ![Change billing email address modal](/assets/images/help/billing/billing-change-email-modal.png)
 
 ### Managing additional recipients for your organization's billing email
 
 If you have users that want to receive billing reports, you can add their email addresses as billing email recipients. This feature is only available to organizations that are not managed by an enterprise.
 
+{% data reusables.dotcom_billing.org-billing-perms %}
+
 #### Adding a recipient for billing notifications
 
-{% data reusables.organizations.navigate-to-org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 1. Under "Billing management", to the right of "Email recipients", click **Add**.
   ![Add recipient](/assets/images/help/billing/billing-add-email-recipient.png)
 1. Type the email address of the recipient, then click **Add**.
@@ -57,18 +56,14 @@ If you have users that want to receive billing reports, you can add their email
 
 One address must always be designated as the primary recipient. The address with this designation can't be removed until a new primary recipient is selected.
 
-{% data reusables.organizations.navigate-to-org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 1. Under "Billing management", find the email address you want to set as the primary recipient.
 1. To the right of the email address, use the "Edit" drop-down menu, and click **Mark as primary**.
   ![Mark primary recipient](/assets/images/help/billing/billing-change-primary-email-recipient.png)
 
 #### Removing a recipient from billing notifications
 
-{% data reusables.organizations.navigate-to-org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 1. Under "Email recipients", find the email address you want to remove.
 1. For the user's entry in the list, click **Edit**.
   ![Edit recipient](/assets/images/help/billing/billing-edit-email-recipient.png)

content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md

@@ -29,8 +29,6 @@ topics:
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.view-payment-history %}
 {% data reusables.dotcom_billing.download_receipt %}

content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md

@@ -28,9 +28,7 @@ topics:
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.next_billing_date %}
 
 ### Further reading

content/billing/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization.md

@@ -23,9 +23,7 @@ topics:
 
 ### Updating your organization's credit card
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.update_payment_method %}
 1. Under "Payment method", click **New Card**.
 ![Billing New Card button](/assets/images/help/billing/billing-new-card-button.png)

content/billing/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md

@@ -26,9 +26,7 @@ topics:
 
 ### Upgrading an organization's number of paid seats
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.add-seats %}
 {% data reusables.dotcom_billing.number-of-seats %}
 {% data reusables.dotcom_billing.confirm-add-seats %}
@@ -37,8 +35,6 @@ After you add seats, the payment method on file for the organization will be cha
 
 ### Downgrading an organization's number of paid seats to free
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.downgrade-org-to-free %}
 {% data reusables.dotcom_billing.confirm_cancel_org_plan %}

content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md

@@ -49,9 +49,7 @@ Billing managers **are not** able to:
 
 The invited person will receive an invitation email asking them to become a billing manager for your organization. Once the invited person clicks the accept link in their invitation email, they will automatically be added to the organization as a billing manager. If they don't already have a GitHub account, they will be directed to sign up for one, and they will be automatically added to the organization as a billing manager after they create an account.
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 1. Under "Billing management", next to "Billing managers", click **Add**.
   ![Invite billing manager](/assets/images/help/billing/settings_billing_managers_list.png)
 6. Type the username or email address of the person you want to add and click **Send invitation**.

content/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization.md

@@ -18,8 +18,6 @@ topics:
 
 {% endwarning %}
 
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-{% data reusables.organizations.billing_plans %}
+{% data reusables.organizations.billing-settings %}
 1. In the "Billing managers" list under "Billing management", next to the name of the person you want to remove, click **Remove**.
 ![Remove billing manager](/assets/images/help/billing/settings_billing_managers_remove_manager.png)

data/reusables/organizations/billing-settings.md

@@ -0,0 +1,6 @@
+{% data reusables.user_settings.access_settings %}
+2. In the settings sidebar, click **Organizations**.
+![Organizations settings in the sidebar](/assets/images/help/settings/settings-sidebar-organizations.png)
+{% data reusables.profile.org_settings %}
+4. If you're an organization owner, in the left sidebar, click **Billing & plans**.
+![Billing & plans in the organization settings sidebar](/assets/images/help/organizations/billing-settings.png)

data/reusables/profile/org_settings.md

@@ -1,3 +1,3 @@
-{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "[email protected]" %}2. Click **Settings** next to the organization.
+{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "[email protected]" %}2. Next to the organization, click **Settings**.
   ![The settings button](/assets/images/help/organizations/settings-button.png){% else %}2. Under your organization name, click {% octicon "gear" aria-label="The Settings gear icon" %} **Settings**.
   ![The settings button](/assets/images/help/organizations/organization-settings-tab.png){% endif %}