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

repo sync

Author: Octomerger

assets/images/help/billing/actions-packages-report-download-enterprise.png

@@ -30,7 +30,9 @@ shortTitle: Merge multiple user accounts
 
 {% warning %}
 
-**Warning:** Organization and repository access permissions aren't transferable between accounts. If the account you want to delete has an existing access permission, an organization owner or repository administrator will need to invite the account that you want to keep.
+**Warning:** 
+- Organization and repository access permissions aren't transferable between accounts. If the account you want to delete has an existing access permission, an organization owner or repository administrator will need to invite the account that you want to keep.
+- Any commits authored with a GitHub-provided `noreply` email address cannot be transferred from one account to another. If the account you want to delete used the **Keep my email address private** option, it won't be possible to transfer the commits authored by the account you are deleting to the account you want to keep.
 
 {% endwarning %}
 

assets/images/help/billing/actions-packages-report-download-org.png

@@ -34,7 +34,7 @@ Organization owners and billing managers can view {% data variables.product.prod
 {% 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 %}
+{% data reusables.dotcom_billing.actions-packages-report-download-org-account %}
 
 ## Viewing {% data variables.product.prodname_actions %} usage for your enterprise account
 

content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md

@@ -15,7 +15,7 @@ topics:
 
 ## {% data variables.product.prodname_codespaces %} pricing
 
-{% data variables.product.prodname_codespaces %} usage is billed for all accounts on the Team and Enterprise plans, and does not include any entitlements. Individual accounts are not currently billed for {% data variables.product.prodname_codespaces %} usage. 
+{% data variables.product.prodname_codespaces %} usage is billed for all organization and enterprise accounts on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %}, which do not include any free minutes or storage. Personal accounts are not currently billed for {% data variables.product.prodname_codespaces %} usage. 
 
 {% data variables.product.prodname_codespaces %} usage is billed according to the units of measure in the following table:
 

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

@@ -19,7 +19,7 @@ Organization owners and billing managers can view {% data variables.product.prod
 
 {% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.codespaces-minutes %}
-{% data reusables.dotcom_billing.codespaces-report-download %}
+{% data reusables.dotcom_billing.actions-packages-report-download-org-account %}
 
 ## Viewing {% data variables.product.prodname_codespaces %} usage for your enterprise account
 
@@ -29,3 +29,5 @@ Enterprise owners and billing managers can view {% data variables.product.prodna
 {% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.billing-tab %}
 1. Under "{% data variables.product.prodname_codespaces %}", view the usage details of each organization in your enterprise account.
+{% data reusables.enterprise-accounts.actions-packages-report-download-enterprise-accounts %}
+

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

@@ -33,7 +33,7 @@ Organization owners and billing managers can view {% data variables.product.prod
 {% 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 %}
+{% data reusables.dotcom_billing.actions-packages-report-download-org-account %}
 
 ## Viewing {% data variables.product.prodname_registry %} usage for your enterprise account
 

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

@@ -313,7 +313,7 @@ It may still be possible to render the data by converting the `.geojson` file to
 
 ### Further reading
 
-* [Leaflet.js geojson documentation](http://leafletjs.com/examples/geojson.html)
+* [Leaflet.js documentation](https://leafletjs.com/)
 * [MapBox marker-styling documentation](http://www.mapbox.com/developers/simplestyle/)
 * [TopoJSON Wiki](https://github.com/mbostock/topojson/wiki)
 

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

@@ -0,0 +1,2 @@
+1. Optionally, next to "Billing & plans", click **Get usage report** to email a CSV report of storage use for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, and {% data variables.product.prodname_codespaces %} to the account's primary email address.
+  ![Download CSV report](/assets/images/help/billing/actions-packages-report-download-org.png)