Skip to content
Merged
Show file tree
Hide file tree
Changes from 91 commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
cb2861d
Change initial instances of Codespaces (the product) to GitHub Codesp…
sophietheking May 23, 2022
374fbfd
More fixes
sophietheking May 30, 2022
6189812
renamed 1 files
sophietheking May 31, 2022
53f5a82
set redirect_from on 1 files
sophietheking May 31, 2022
d52c6b8
Fix next-env file
sophietheking May 31, 2022
0d243f9
renamed 1 files
sophietheking May 31, 2022
c379b14
set redirect_from on 1 files
sophietheking May 31, 2022
5ce8aa1
renamed 1 files
sophietheking May 31, 2022
559cca6
set redirect_from on 1 files
sophietheking May 31, 2022
81e77c5
renamed 1 files
sophietheking May 31, 2022
9db7536
set redirect_from on 1 files
sophietheking May 31, 2022
ef380a5
renamed 1 files
sophietheking May 31, 2022
ad292d7
set redirect_from on 1 files
sophietheking May 31, 2022
5f8f105
renamed 1 files
sophietheking May 31, 2022
9aa5c22
set redirect_from on 1 files
sophietheking May 31, 2022
36d9ebb
more changes
sophietheking May 31, 2022
523a869
More replacements
sophietheking Jun 1, 2022
36b13b9
changes more instances of codespaces
sophietheking Jun 3, 2022
d8f92bc
renamed 1 files
sophietheking Jun 3, 2022
379043f
set redirect_from on 1 files
sophietheking Jun 3, 2022
7595d53
renamed 1 files
sophietheking Jun 3, 2022
1f56f58
set redirect_from on 1 files
sophietheking Jun 3, 2022
9c9bbd9
renamed 1 files
sophietheking Jun 3, 2022
cee51a5
set redirect_from on 1 files
sophietheking Jun 3, 2022
c2fd030
renamed 1 files
sophietheking Jun 3, 2022
3f39d73
set redirect_from on 1 files
sophietheking Jun 3, 2022
0b5bfed
renamed 1 files
sophietheking Jun 3, 2022
6a96f29
set redirect_from on 1 files
sophietheking Jun 3, 2022
a152cae
renamed 1 files
sophietheking Jun 3, 2022
6d0290e
set redirect_from on 1 files
sophietheking Jun 3, 2022
92ed75d
renamed 1 files
sophietheking Jun 3, 2022
b12ebff
set redirect_from on 1 files
sophietheking Jun 3, 2022
3a93209
renamed 1 files
sophietheking Jun 3, 2022
c46839c
set redirect_from on 1 files
sophietheking Jun 3, 2022
e9d941c
renamed 1 files
sophietheking Jun 3, 2022
8dcc704
set redirect_from on 1 files
sophietheking Jun 3, 2022
5b4e7f7
renamed 1 files
sophietheking Jun 3, 2022
b50135f
set redirect_from on 1 files
sophietheking Jun 3, 2022
6834ba0
renamed 1 files
sophietheking Jun 3, 2022
29ea848
set redirect_from on 1 files
sophietheking Jun 3, 2022
1b45e51
renamed 1 files
sophietheking Jun 3, 2022
df41b3a
set redirect_from on 1 files
sophietheking Jun 3, 2022
a2fc422
renamed 1 files
sophietheking Jun 3, 2022
b607e1d
set redirect_from on 1 files
sophietheking Jun 3, 2022
82116a6
renamed 1 files
sophietheking Jun 3, 2022
5e90315
set redirect_from on 1 files
sophietheking Jun 3, 2022
fc27531
renamed 1 files
sophietheking Jun 3, 2022
7abc00b
set redirect_from on 1 files
sophietheking Jun 3, 2022
4fe9009
renamed 1 files
sophietheking Jun 3, 2022
a9bd39c
set redirect_from on 1 files
sophietheking Jun 3, 2022
98f4cd4
renamed 1 files
sophietheking Jun 3, 2022
237045d
set redirect_from on 1 files
sophietheking Jun 3, 2022
ea82eb8
Merge branch 'main' into sophie-6496
sophietheking Jun 3, 2022
a965aca
fixes next-env file
sophietheking Jun 3, 2022
563adfe
Merge branch 'sophie-6496' of https://github.com/github/docs-internal…
sophietheking Jun 3, 2022
a64b150
more changes from GitHub Codespaces to Codespaces
sophietheking Jul 1, 2022
a60a451
Merge branch 'main' into sophie-6496
sophietheking Jul 1, 2022
27c583e
more changes
sophietheking Jul 1, 2022
da3358b
more changes
sophietheking Jul 1, 2022
3a9038e
trying to fix test
sophietheking Jul 1, 2022
0a64464
fixing title
sophietheking Jul 1, 2022
dc41fc0
adding link to index
sophietheking Jul 1, 2022
54158e0
deleting old file from index
sophietheking Jul 1, 2022
97693a9
renamed 1 files
sophietheking Jul 1, 2022
8f4da70
set redirect_from on 1 files
sophietheking Jul 1, 2022
94c8ba4
renamed 1 files
sophietheking Jul 1, 2022
6d527fc
set redirect_from on 1 files
sophietheking Jul 1, 2022
5826a6b
renamed 1 files
sophietheking Jul 1, 2022
fb7bc63
set redirect_from on 1 files
sophietheking Jul 1, 2022
bf9333e
renamed 1 files
sophietheking Jul 1, 2022
98a93d2
set redirect_from on 1 files
sophietheking Jul 1, 2022
c3309e2
renamed 1 files
sophietheking Jul 1, 2022
24e422e
set redirect_from on 1 files
sophietheking Jul 1, 2022
3566d60
matching titles with links
sophietheking Jul 1, 2022
1bd1a42
Merge branch 'main' into sophie-6496
sophietheking Jul 12, 2022
d00a598
two more fixes
sophietheking Jul 12, 2022
cd7c0ac
Merge branch 'main' into sophie-6496
hubwriter Jul 13, 2022
c02e7b8
Update the text of links to articles with revised names
hubwriter Jul 13, 2022
6cf312b
Fix bad link
hubwriter Jul 13, 2022
e0edd85
Fix more broken links
hubwriter Jul 13, 2022
898191d
Fix final batch of broken links
hubwriter Jul 13, 2022
3114fcf
fix toc in article
sophietheking Jul 14, 2022
c42aa86
Merge branch 'main' into sophie-6496
sophietheking Jul 14, 2022
0b6fbf4
fix toc
sophietheking Jul 14, 2022
78c8029
Merge branch 'sophie-6496' of https://github.com/github/docs-internal…
sophietheking Jul 14, 2022
4f62445
Merge branch 'main' into sophie-6496
sophietheking Jul 14, 2022
aeacdab
Merge pull request #27914 from github/sophie-6496
sophietheking Jul 14, 2022
5eee9ef
Merge branch 'main' into repo-sync
Octomerger Jul 14, 2022
3a16368
Merge pull request #29030 from github/repo-sync
Octomerger Jul 14, 2022
803c3a5
Merge branch 'main' into repo-sync
Octomerger Jul 14, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ Action | Description
| `codespaces.destroy` | A user [deleted a codespace](/github/developing-online-with-codespaces/deleting-a-codespace).
| `codespaces.allow_permissions` | A codespace using custom permissions from its `devcontainer.json` file was launched.
| `codespaces.attempted_to_create_from_prebuild` | An attempt to create a codespace from a prebuild was made.
| `codespaces.create_an_org_secret` | A user created an organization-level [secret for {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces#about-encrypted-secrets-for-codespaces)
| `codespaces.update_an_org_secret` | A user updated an organization-level [secret for {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces#about-encrypted-secrets-for-codespaces).
| `codespaces.remove_an_org_secret` | A user removed an organization-level [secret for {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces#about-encrypted-secrets-for-codespaces).
| `codespaces.create_an_org_secret` | A user created an organization-level [secret for {% data variables.product.prodname_github_codespaces %}](/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces#about-encrypted-secrets-for-codespaces)
| `codespaces.update_an_org_secret` | A user updated an organization-level [secret for {% data variables.product.prodname_github_codespaces %}](/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces#about-encrypted-secrets-for-codespaces).
| `codespaces.remove_an_org_secret` | A user removed an organization-level [secret for {% data variables.product.prodname_github_codespaces %}](/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces#about-encrypted-secrets-for-codespaces).
| `codespaces.manage_access_and_security` | A user updated [which repositories a codespace can access](/github/developing-online-with-codespaces/managing-access-and-security-for-codespaces).
{%- endif %}

Expand Down Expand Up @@ -630,8 +630,8 @@ Action | Description
| `org.clear_members_can_invite_outside_collaborators` | An organization owner cleared the outside collaborators invitation policy for an organization. For more information, see "[Setting permissions for adding outside collaborators](/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)."
| `org.clear_new_repository_default_branch_setting` | An organization owner cleared the default branch name for new repositories setting for an organization. For more information, see "[Setting the default branch name](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization#setting-the-default-branch-name)."
{%- ifversion fpt or ghec %}
| `org.codespaces_trusted_repo_access_granted` | {% data variables.product.prodname_codespaces %} was granted trusted repository access to all other repositories in an organization. For more information, see "[Managing repository access for your organization's codespaces](/codespaces/managing-codespaces-for-your-organization/managing-repository-access-for-your-organizations-codespaces)."
| `org.codespaces_trusted_repo_access_revoked` | {% data variables.product.prodname_codespaces %} trusted repository access to all other repositories in an organization was revoked. For more information, see "[Managing repository access for your organization's codespaces](/codespaces/managing-codespaces-for-your-organization/managing-repository-access-for-your-organizations-codespaces)."
| `org.codespaces_trusted_repo_access_granted` | {% data variables.product.prodname_github_codespaces %} was granted trusted repository access to all other repositories in an organization. For more information, see "[Managing repository access for your organization's codespaces](/codespaces/managing-codespaces-for-your-organization/managing-repository-access-for-your-organizations-codespaces)."
| `org.codespaces_trusted_repo_access_revoked` | {% data variables.product.prodname_github_codespaces %} trusted repository access to all other repositories in an organization was revoked. For more information, see "[Managing repository access for your organization's codespaces](/codespaces/managing-codespaces-for-your-organization/managing-repository-access-for-your-organizations-codespaces)."
{%- endif %} |
| `org.config.disable_collaborators_only` | The interaction limit for collaborators only for an organization was disabled. {% ifversion fpt or ghec %}For more information, see "[Limiting interactions in your organization](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization#limiting-interactions-in-your-organization)."{% endif %}
| `org.config.disable_contributors_only` | The interaction limit for prior contributors only for an organization was disabled. {% ifversion fpt or ghec %}For more information, see "[Limiting interactions in your organization](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization#limiting-interactions-in-your-organization)."{% endif %}
Expand Down Expand Up @@ -829,10 +829,10 @@ Action | Description

| Action | Description
|--------|-------------
| `prebuild_configuration.create` | A {% data variables.product.prodname_codespaces %} prebuild configuration for a repository was created. For more information, see "[About Codespaces prebuilds](/codespaces/prebuilding-your-codespaces/about-codespaces-prebuilds)."
| `prebuild_configuration.destroy` | A {% data variables.product.prodname_codespaces %} prebuild configuration for a repository was deleted. For more information, see "[About Codespaces prebuilds](/codespaces/prebuilding-your-codespaces/about-codespaces-prebuilds)."
| `prebuild_configuration.run_triggered` | A user initiated a run of a {% data variables.product.prodname_codespaces %} prebuild configuration for a repository branch. For more information, see "[About Codespaces prebuilds](/codespaces/prebuilding-your-codespaces/about-codespaces-prebuilds)."
| `prebuild_configuration.update` | A {% data variables.product.prodname_codespaces %} prebuild configuration for a repository was edited. For more information, see "[About Codespaces prebuilds](/codespaces/prebuilding-your-codespaces/about-codespaces-prebuilds)."
| `prebuild_configuration.create` | A {% data variables.product.prodname_codespaces %} prebuild configuration for a repository was created. For more information, see "[About {% data variables.product.prodname_github_codespaces %} prebuilds](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)."
| `prebuild_configuration.destroy` | A {% data variables.product.prodname_codespaces %} prebuild configuration for a repository was deleted. For more information, see "[About {% data variables.product.prodname_github_codespaces %} prebuilds](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)."
| `prebuild_configuration.run_triggered` | A user initiated a run of a {% data variables.product.prodname_codespaces %} prebuild configuration for a repository branch. For more information, see "[About {% data variables.product.prodname_github_codespaces %} prebuilds](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)."
| `prebuild_configuration.update` | A {% data variables.product.prodname_codespaces %} prebuild configuration for a repository was edited. For more information, see "[About {% data variables.product.prodname_github_codespaces %} prebuilds](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)."
{%- endif %}

{%- ifversion ghes %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The events listed in your security log are triggered by your actions. Actions ar
| Category name | Description
|------------------|-------------------{% ifversion fpt or ghec %}
| [`billing`](#billing-category-actions) | Contains all activities related to your billing information.
| [`codespaces`](#codespaces-category-actions) | Contains all activities related to {% data variables.product.prodname_codespaces %}. For more information, see "[About {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/about-codespaces)."
| [`codespaces`](#codespaces-category-actions) | Contains all activities related to {% data variables.product.prodname_github_codespaces %}. For more information, see "[About {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/about-codespaces)."
| [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement.
| [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %}
| [`oauth_access`](#oauth_access-category-actions) | Contains all activities related to [{% data variables.product.prodname_oauth_apps %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/authorizing-oauth-apps) you've connected with.{% ifversion fpt or ghec %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Repository administrators can enforce required commit signing on a branch to blo
{% ifversion ghes %}If a site administrator has enabled web commit signing, {% data variables.product.product_name %} will automatically use GPG to sign commits you make using the web interface. Commits signed by {% data variables.product.product_name %} will have a verified status. You can verify the signature locally using the public key available at `https://HOSTNAME/web-flow.gpg`. For more information, see "[Configuring web commit signing](/admin/configuration/configuring-your-enterprise/configuring-web-commit-signing)."
{% else %}{% data variables.product.prodname_dotcom %} will automatically use GPG to sign commits you make using the web interface. Commits signed by {% data variables.product.prodname_dotcom %} will have a verified status. You can verify the signature locally using the public key available at https://github.com/web-flow.gpg. The full fingerprint of the key is `5DE3 E050 9C47 EA3C F04A 42D3 4AEE 18F8 3AFD EB23`.

You can optionally choose to have {% data variables.product.prodname_dotcom %} sign commits you make in {% data variables.product.prodname_codespaces %}. For more information about enabling GPG verification for your codespaces, see "[Managing GPG verification for {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/managing-gpg-verification-for-codespaces)."{% endif %}
You can optionally choose to have {% data variables.product.prodname_dotcom %} sign commits you make in {% data variables.product.prodname_github_codespaces %}. For more information about enabling GPG verification for your codespaces, see "[Managing GPG verification for {% data variables.product.prodname_github_codespaces %}](/codespaces/managing-your-codespaces/managing-gpg-verification-for-github-codespaces)."{% endif %}
{% endif %}

## GPG commit signature verification
Expand Down
2 changes: 1 addition & 1 deletion content/billing/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Billing and payments on GitHub
shortTitle: Billing and payments
intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade or downgrade your account''s subscription and manage your billing settings at any time.{% elsif ghec or ghes or ghae %}{% data variables.product.company_short %} bills for your enterprise members'' {% ifversion ghec or ghae %}usage of {% data variables.product.product_name %}{% elsif ghes %} licence seats for {% data variables.product.product_name %}{% ifversion ghes %} and any additional services that you purchase{% endif %}{% endif %}. {% endif %}{% ifversion ghec %} You can view your subscription and manage your billing settings at any time. {% endif %}{% ifversion fpt or ghec %} You can also view usage and manage spending limits for {% data variables.product.product_name %} features such as {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, and {% data variables.product.prodname_codespaces %}.{% endif %}'
intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade or downgrade your account''s subscription and manage your billing settings at any time.{% elsif ghec or ghes or ghae %}{% data variables.product.company_short %} bills for your enterprise members'' {% ifversion ghec or ghae %}usage of {% data variables.product.product_name %}{% elsif ghes %} licence seats for {% data variables.product.product_name %}{% ifversion ghes %} and any additional services that you purchase{% endif %}{% endif %}. {% endif %}{% ifversion ghec %} You can view your subscription and manage your billing settings at any time. {% endif %}{% ifversion fpt or ghec %} You can also view usage and manage spending limits for {% data variables.product.product_name %} features such as {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, and {% data variables.product.prodname_github_codespaces %}.{% endif %}'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github
- /categories/setting-up-and-managing-billing-and-payments-on-github
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: About billing for Codespaces
title: About billing for GitHub Codespaces
shortTitle: About billing
intro: 'View pricing and see how to manage {% data variables.product.prodname_codespaces %} billing for your organization.'
permissions: 'To manage billing for Codespaces for an organization, you must be an organization owner or a billing manager.'
intro: 'View pricing and see how to manage {% data variables.product.prodname_github_codespaces %} billing for your organization.'
permissions: 'To manage billing for {% data variables.product.prodname_github_codespaces %} for an organization, you must be an organization owner or a billing manager.'
versions:
fpt: '*'
ghec: '*'
Expand All @@ -11,11 +11,13 @@ product: '{% data reusables.gated-features.codespaces %}'
topics:
- Codespaces
- Billing
redirect_from:
- /billing/managing-billing-for-github-codespaces/about-billing-for-codespaces
---

## {% data variables.product.prodname_codespaces %} pricing
## {% data variables.product.prodname_github_codespaces %} pricing

{% 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_github_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:

Expand All @@ -32,7 +34,7 @@ topics:

{% data reusables.codespaces.codespaces-billing %}

Your {% data variables.product.prodname_codespaces %} usage shares your account's existing billing date, payment method, and receipt. {% data reusables.dotcom_billing.view-all-subscriptions %}
Your {% data variables.product.prodname_github_codespaces %} usage shares your account's existing billing date, payment method, and receipt. {% data reusables.dotcom_billing.view-all-subscriptions %}

{% ifversion ghec %}
If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_codespaces %} usage. For more information, see "[Connecting an Azure subscription to your enterprise](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ versions:
ghec: '*'
product: '{% data reusables.gated-features.codespaces %}'
children:
- /about-billing-for-codespaces
- /viewing-your-codespaces-usage
- /managing-spending-limits-for-codespaces
- /about-billing-for-github-codespaces
- /viewing-your-github-codespaces-usage
- /managing-spending-limits-for-github-codespaces
---

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Managing spending limits for Codespaces
intro: 'You can set a spending limit for {% data variables.product.prodname_codespaces %} usage.'
title: Managing spending limits for GitHub Codespaces
intro: 'You can set a spending limit for {% data variables.product.prodname_github_codespaces %} usage.'
versions:
fpt: '*'
ghec: '*'
Expand All @@ -14,14 +14,16 @@ topics:
- User account
- Billing
shortTitle: Spending limits
redirect_from:
- /billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces
---
## About spending limits for {% data variables.product.prodname_codespaces %}
## About spending limits for {% data variables.product.prodname_github_codespaces %}

{% data reusables.codespaces.codespaces-spending-limit-requirement %}

Once you've reached your spending limit, your organization or repository will no longer be able to create new codespaces, and won't be able to start existing codespaces. Any existing codespaces that are still running will not be shutdown; if you don't change the spending limit, you will not be charged for the amount that exceeds the limit.

For more information about pricing for {% data variables.product.prodname_codespaces %} usage, see "[About billing for {% data variables.product.prodname_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces)."
For more information about pricing for {% data variables.product.prodname_codespaces %} usage, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."

{% ifversion ghec %}
## Using your Azure Subscription
Expand Down Expand Up @@ -65,4 +67,4 @@ You can disable these notifications anytime by navigating to the bottom of the *
## Further reading

- "[Restricting access to machine types](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)"
- "[Managing billing for Codespaces in your organization](/codespaces/managing-codespaces-for-your-organization/managing-billing-for-codespaces-in-your-organization)"
- "[Managing billing for {% data variables.product.prodname_github_codespaces %} in your organization](/codespaces/managing-codespaces-for-your-organization/managing-billing-for-github-codespaces-in-your-organization)"
Loading