Merge branch 'main' into dependabot/npm_and_yarn/minimist-1.2.6

Author: heiskr

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

@@ -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 %}
 

content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.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/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/comparing-commits.md

@@ -53,7 +53,7 @@ You can compare your base repository and any forked repository. This is the view
 
 To compare branches on different repositories, preface the branch names with user names. For example, by specifying `octocat:main` for `base` and `octo-org:main` for `compare`, you can compare the `main` branch of the repositories respectively owned by `octocat` and `octo-org`.
 
-Here's an example of a [comparison between two repositories](https://github.com/octocat/linguist/compare/master...octo-org:master).
+Here's an example of a [comparison between two repositories](https://github.com/github/linguist/compare/master...octocat:master).
 
 ## Comparisons across commits
 

content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md

@@ -16,7 +16,7 @@ versions:
 
 {% endnote %}
 
-When you add a tag protection rule, all tags that match the pattern provided will be protected. Only users with admin or maintain permissions in the repository will be able to create protected tags, and only users with admin permissions in the repository will be able to delete protected tags. For more information, see "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization#permissions-for-each-role)."
+When you add a tag protection rule, all tags that match the pattern provided will be protected. Only users with admin or maintain permissions in the repository will be able to create protected tags, and only users with admin permissions in the repository will be able to delete protected tags. For more information, see "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization#permissions-for-each-role)." {% data variables.product.prodname_github_apps %} require the `Repository administration: write` permission to modify a protected tag.
 
 Additionally, you can create custom repository roles to allow other groups of users to create or delete tags that match tag protection rules. For more information, see "[Managing custom repository roles for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)."
 

content/repositories/working-with-files/using-files/working-with-non-code-files.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)
 

data/reusables/dependabot/beta-security-and-version-updates.md

@@ -1,11 +1,21 @@
-{% ifversion ghes > 3.2 %}
+{% ifversion ghes > 3.2 and ghes < 3.5 %}
 
 {% note %}
-{% if dependabot-updates-github-connect %}
+{% ifversion ghes = 3.4 %}
 **Note:** {% data variables.product.prodname_dependabot %} security and version updates are currently in public beta and subject to change.
 {% else %}
 **Note:** {% data variables.product.prodname_dependabot %} security and version updates are currently in private beta and subject to change. Please [contact your account management team](https://enterprise.github.com/contact) for instructions on enabling Dependabot updates.
 {% endif %}
+
 {% endnote %}
 
 {% endif %}
+
+{% ifversion ghae-issue-5867 %}
+
+{% note %}
+
+**Note:** {% data variables.product.prodname_dependabot %} security and version updates are currently in public beta and subject to change.
+
+{% endnote %}
+{% endif %}

data/reusables/secret-scanning/partner-secret-list-public-repo.md

@@ -91,6 +91,7 @@ Stripe | Stripe Live API Secret Key
 Stripe | Stripe Test API Secret Key
 Stripe | Stripe Live API Restricted Key
 Stripe | Stripe Test API Restricted Key
+Supabase | Supabase Service Key
 Tencent Cloud | Tencent Cloud Secret ID
 Twilio | Twilio Account String Identifier
 Twilio | Twilio API Key