Merge pull request #28072 from github/repo-sync

Repo sync

Author: docs-bot

content/admin/monitoring-managing-and-updating-your-instance/configuring-high-availability/initiating-a-failover-to-your-replica-appliance.md

@@ -45,7 +45,9 @@ The time required to failover depends on how long it takes to manually promote t
      ghe-repl-status -vv
      ```
 
-1. On the replica appliance, to stop replication and promote the replica appliance to primary status, use the `ghe-repl-promote` command. This will also automatically put the primary node in maintenance mode if it’s reachable.
+1. Enable maintenance mode on all active replica appliances. For more information, see "[AUTOTITLE](/admin/administering-your-instance/enabling-and-scheduling-maintenance-mode)."
+
+1. On the replica appliance you'd like to fail over to, to stop replication and promote the replica appliance to primary status, use the `ghe-repl-promote` command.
 
    ```shell
    ghe-repl-promote

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

@@ -32,7 +32,7 @@ shortTitle: About Git LFS billing
 
 {% note %}
 
-**Note:** On October 1st, 2023, the billing model for {% data variables.large_files.product_name_short %} is changing. Data packs will be replaced by metered billing. Learn more about this change in the [{% data variables.product.prodname_github_community %} discussion](https://github.com/orgs/community/discussions/61362).
+**Note:** On October 1st, 2023, the billing model for {% data variables.large_files.product_name_short %} is changing. Data packs will be replaced by usage-based billing. Learn more about this change in the [{% data variables.product.prodname_github_community %} discussion](https://github.com/orgs/community/discussions/61362).
 
 {% endnote %}
 

content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md

@@ -139,7 +139,7 @@ Organization owners can:
 - See the total {% data variables.product.prodname_github_codespaces %} compute and storage usage for your organization for the current month to date. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 - Configure your organization settings to manage the cost of {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization)."
 
-To estimate the costs for metered services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces).
+To estimate the costs for usage-based billing, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces).
 
 ## About billing for {% data variables.product.prodname_codespaces %} prebuilds
 

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

@@ -49,7 +49,7 @@ Organization owners and billing managers can view {% data variables.product.prod
    {% note %}
 
    **Notes**:
-   - The costs shown here are the cumulative costs within the current monthly billing period. The metered costs for {% data variables.product.prodname_github_codespaces %} shown on this page are reset to zero at the start of each monthly billing period. Outstanding costs from previous months are not shown.
+   - The costs shown here are the cumulative costs within the current monthly billing period. The usage-based costs for {% data variables.product.prodname_github_codespaces %} shown on this page are reset to zero at the start of each monthly billing period. Outstanding costs from previous months are not shown.
    - The figures on this page are updated every hour.
 
    {% endnote %}

content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md

@@ -102,6 +102,7 @@ If your enterprise does not use {% data variables.product.prodname_emus %}, you
 - Billing managers for individual organizations
 - Anyone with a pending invitation to become a billing manager
 - Anyone with a pending invitation to become an outside collaborator on a public repository owned by your organization
+- Users of {% data variables.visual_studio.prodname_vss_ghe %} whose accounts on {% data variables.product.prodname_dotcom_the_website %} are not linked, and who do not meet any of the other criteria for per-user pricing
 
 ### Accounts that consume a license on {% data variables.product.prodname_ghe_server %}
 

content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md

@@ -1,6 +1,6 @@
 ---
 title: Connecting an Azure subscription
-intro: 'You can connect an Azure Subscription to your organization{% ifversion ghec %} or enterprise account{% endif %} to enable and pay for any {% data variables.product.prodname_dotcom %} metered services.'
+intro: 'You can connect an Azure Subscription to your organization{% ifversion ghec %} or enterprise account{% endif %} to enable and pay for usage-based billing for {% data variables.product.prodname_dotcom %}.'
 redirect_from:
   - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/connecting-an-azure-subscription-to-your-enterprise
   - /github/setting-up-and-managing-billing-and-payments-on-github/connecting-an-azure-subscription-to-your-enterprise
@@ -61,6 +61,7 @@ To connect your Azure subscription, you must have owner permissions to the Azure
 
    {% endnote %}
 1. Click **Connect**.
+1. To the right of "Metered billing via Azure", click **Enable**.
 
 {% ifversion ghec %}
 

content/billing/managing-your-github-billing-settings/about-billing-on-github.md

@@ -115,7 +115,7 @@ You must manage billing settings, payment method, and paid features and products
 
 {% data reusables.sponsors.paypal-deprecation %}
 
-{% ifversion fpt or ghec %}For qualifying metered or usage-based services, you may choose to pay for the services from your {% data variables.product.prodname_dotcom %} account or from an Azure subscription. The terms of the billing method you choose will apply to services billed in this manner.{% endif %}
+{% ifversion fpt or ghec %}For qualifying usage-based services, you may choose to pay for the services from your {% data variables.product.prodname_dotcom %} account or from an Azure subscription. The terms of the billing method you choose will apply to services billed in this manner.{% endif %}
 
 For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings)."
 

content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md

@@ -22,28 +22,21 @@ For privacy reasons, enterprise owners cannot directly access the details of use
 
 ## About the calculation of consumed licenses
 
-If a user meets one or more of the following conditions, {% data variables.product.company_short %} bills for the user.
-
-- The user utilizes deployments of {% data variables.product.prodname_ghe_server %}.
-- The user is a member of one of your organizations on {% data variables.product.prodname_ghe_cloud %}.
-- The user has write access to one of your organization's private repositories.
-- The user is a {% data variables.visual_studio.prodname_vs_subscriber %}.
-
-Invitations for these roles will consume a license until the invitation is accepted or expires. For more information about the people in your enterprise who consume a license, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
+A person consumes a license for {% data variables.product.prodname_enterprise %} depending on specific criteria. If a user has not yet accepted an invitation to join your enterprise, or if the user is an unlinked {% data variables.visual_studio.prodname_vs_subscriber %}, the user still consumes a license. For more information about the people in your enterprise who consume a license, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
 
 For each user to consume a single seat regardless of how many deployments they use, you must synchronize license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."
 
 After you synchronize license usage, {% data variables.product.prodname_dotcom %} matches user accounts on {% data variables.product.prodname_ghe_server %} with user accounts on {% data variables.product.prodname_ghe_cloud %} by email address.
 
-First, we first check the primary email address of each user on {% data variables.product.prodname_ghe_server %}. Then, we attempt to match that address with the email address for a user account on {% data variables.product.prodname_ghe_cloud %}. If your enterprise uses SAML SSO, we first check the following SAML attributes for email addresses.
+First, we check the primary email address of each user on {% data variables.product.prodname_ghe_server %}. Then, we attempt to match that address with the email address for a user account on {% data variables.product.prodname_ghe_cloud %}. If your enterprise on {% data variables.product.prodname_dotcom_the_website %} or any of the enterprise's organizations use SAML authentication or SCIM provisioning, we first check the linked SAML or SCIM identities to see if the identity contains one of the attributes below. We attempt to match the values of these attributes to the primary email address of each {% data variables.product.prodname_ghe_server %} user.
 
 - `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name`
 - `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress`
 - `username`
 - `NameID`
 - `emails`
 
-If no email addresses found in these attributes match the primary email address on {% data variables.product.prodname_ghe_server %}, or if your enterprise doesn't use SAML SSO, we then check each of the user's verified email addresses on {% data variables.product.prodname_ghe_cloud %}. For more information about verification of email addresses on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/enterprise-cloud@latest/get-started/signing-up-for-github/verifying-your-email-address){% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
+If there is no match, or if SAML authentication or SCIM provisioning is not in use, we attempt to match the primary email address on {% data variables.product.prodname_ghe_server %} with a verified email address for a user account on {% data variables.product.prodname_dotcom_the_website %}. For more information about verification of email addresses on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/enterprise-cloud@latest/get-started/signing-up-for-github/verifying-your-email-address){% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
 
 ## Fields in the consumed license files
 
@@ -73,8 +66,6 @@ The license usage report for your enterprise is a CSV file that contains the fol
 | visual_studio_subscription_email | The email address associated with the user's VSS |
 | visual_studio_license_status | Whether the Visual Studio license has been matched to a {% data variables.product.company_short %} user |
 
-{% data variables.visual_studio.prodname_vs_subscriber %}s who are not yet members of at least one organization in your enterprise will be included in the report with a pending invitation status, and will be missing values for the "Name" or "Profile link" field.
-
 ### {% data variables.product.prodname_ghe_server %} exported license usage (JSON file)
 
 Your {% data variables.product.prodname_ghe_server %} license usage is a JSON file that is typically used when performing a manual sync of user licenses between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} deployments. The file contains the following information specific to your {% data variables.product.prodname_ghe_server %} environment.

content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md

@@ -106,8 +106,6 @@ When you connect an IdP group to a {% data variables.product.product_name %} tea
 
 ## Disconnecting an IdP group from a team
 
-If you disconnect an IdP group from a {% data variables.product.prodname_dotcom %} team, team members that were assigned to the {% data variables.product.prodname_dotcom %} team through the IdP group will be removed from the team. {% ifversion ghae %} Any users who were members of the parent organization only because of that team connection are also removed from the organization.{% endif %}
-
 {% data reusables.profile.access_org %}
 {% data reusables.user-settings.access_org %}
 {% data reusables.organizations.specific_team %}

data/reusables/billing/authorization-charge.md

@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** {% data variables.product.company_short %} may apply a temporary authorization hold for the value of the metered costs in advance, which will appear as a pending charge in your account's payment method.
+**Note:** {% data variables.product.company_short %} may apply a temporary authorization hold for the value of the usage-based costs in advance, which will appear as a pending charge in your account's payment method.
 
 {% endnote %}