Skip to content

Commit 07814f0

Browse files
author
Schalk Neethling
committed
chore: ensure consistent use of canceled in prose
Ensure the consistent use of canceled in prose. fix #22624
1 parent e28a1dc commit 07814f0

File tree

38 files changed

+2897
-1542
lines changed

38 files changed

+2897
-1542
lines changed

content/codespaces/troubleshooting/troubleshooting-creation-and-deletion-of-codespaces.md

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: Troubleshooting creation and deletion of codespaces
3-
intro: 'This article provides troubleshooting steps for common issues you may experience when creating or deleting a codespace, including storage and configuration issues.'
3+
intro: "This article provides troubleshooting steps for common issues you may experience when creating or deleting a codespace, including storage and configuration issues."
44
versions:
5-
fpt: '*'
6-
ghec: '*'
5+
fpt: "*"
6+
ghec: "*"
77
type: reference
88
topics:
99
- Codespaces
@@ -13,6 +13,7 @@ shortTitle: Creation and deletion
1313
## Creating codespaces
1414

1515
### No access to create a codespace
16+
1617
{% data variables.product.prodname_github_codespaces %} is not available for all repositories. If the options for creating a codespace are not displayed, {% data variables.product.prodname_github_codespaces %} may not be available for that repository. For more information, see "[Creating a codespace for a repository](/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#access-to-codespaces)."
1718

1819
Provided you have remaining monthly included usage of {% data variables.product.prodname_github_codespaces %} on your personal account, or you have set up a payment method and a spending limit, you will be able to create codespaces for public repositories. However, you can only create a codespace for a private repository if you can push changes to the repository, or you can fork the repository.
@@ -31,7 +32,7 @@ If you still cannot create a codespace for a repository where {% data variables.
3132

3233
### Codespace creation fails
3334

34-
If the creation of a codespace fails, it's likely to be due to a temporary infrastructure issue in the cloud - for example, a problem provisioning a virtual machine for the codespace. A less common reason for failure is if it takes longer than an hour to build the container. In this case, the build is cancelled and codespace creation will fail.
35+
If the creation of a codespace fails, it's likely to be due to a temporary infrastructure issue in the cloud - for example, a problem provisioning a virtual machine for the codespace. A less common reason for failure is if it takes longer than an hour to build the container. In this case, the build is canceled and codespace creation will fail.
3536

3637
{% note %}
3738

@@ -50,23 +51,26 @@ If you create a codespace and the creation fails:
5051
{% note %}
5152

5253
**Note**: To view the logs during a build:
53-
* In the browser, click **View logs.**
54+
55+
- In the browser, click **View logs.**
5456

5557
![Screenshot of the Codespaces web UI with the View logs link emphasized](/assets/images/help/codespaces/web-ui-view-logs.png)
5658

57-
* In the VS Code desktop application, click **Building codespace** in the "Setting up remote connection" that's displayed.
59+
- In the VS Code desktop application, click **Building codespace** in the "Setting up remote connection" that's displayed.
5860

5961
![Screenshot of VS Code with the Building codespace link emphasized](/assets/images/help/codespaces/vs-code-building-codespace.png)
6062

61-
{% endnote %}
62-
2. If you have a container that takes a long time to build, consider using prebuilds to speed up codespace creations. For more information, see "[Configuring prebuilds](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
63+
{% endnote %}
64+
65+
1. If you have a container that takes a long time to build, consider using prebuilds to speed up codespace creations. For more information, see "[Configuring prebuilds](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
6366

6467
## Deleting codespaces
6568

6669
A codespace can only be deleted by:
67-
* The person who created the codespace.
68-
* An organization owner for an organization-owned codespace.
69-
* Automatic deletion at the end of a retention period.
70+
71+
- The person who created the codespace.
72+
- An organization owner for an organization-owned codespace.
73+
- Automatic deletion at the end of a retention period.
7074

7175
For more information, see "[Deleting a codespace](/codespaces/developing-in-codespaces/deleting-a-codespace)" and "[Configuring automatic deletion of your codespaces](/codespaces/customizing-your-codespace/configuring-automatic-deletion-of-your-codespaces)."
7276

@@ -91,6 +95,7 @@ Some more destructive options:
9195
```
9296
This codespace is currently running in recovery mode due to a container error.
9397
```
98+
9499
Review the creation logs and update the dev container configuration as needed. For more information, see "[{% data variables.product.prodname_github_codespaces %} logs](/codespaces/troubleshooting/github-codespaces-logs)."
95100

96101
You can then try restarting the codespace, or rebuilding the container. For more information on rebuilding the container, see "[Introduction to dev containers](/codespaces/setting-up-your-project-for-codespaces/introduction-to-dev-containers#applying-configuration-changes-to-a-codespace)."

content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ redirect_from:
55
- /articles/blocking-a-user-from-your-organization
66
- /github/building-a-strong-community/blocking-a-user-from-your-organization
77
versions:
8-
fpt: '*'
9-
ghec: '*'
8+
fpt: "*"
9+
ghec: "*"
1010
topics:
1111
- Community
1212
shortTitle: Block from your org
@@ -23,18 +23,21 @@ You can block non-members from within your organization's settings or from a spe
2323
{% endtip %}
2424

2525
At the time that you block a user from your organization:
26+
2627
- The user stops watching your organization's repositories
2728
- The user's stars and issue assignments are removed from your repositories
2829
- The user's votes on discussions or comments in your organization's repositories are deleted
2930
- The user is removed as a collaborator on your organization's repositories
3031
- The user's contributions to your organization's repositories are no longer counted as contributions for them
31-
- Any pending repository or organization invitations to the blocked user are cancelled
32+
- Any pending repository or organization invitations to the blocked user are canceled
3233

3334
After you've blocked a user from your organization, they cannot:
35+
3436
- Cross-reference your organization's repositories in comments
3537
- Fork, watch, pin, or star your organization's repositories
3638

3739
In your organization's repositories, blocked users also cannot:
40+
3841
- Open issues
3942
- Send, close, or merge pull requests
4043
- Comment on issues, pull requests, or commits
@@ -44,28 +47,25 @@ In your organization's repositories, blocked users also cannot:
4447

4548
1. Navigate to the comment whose author you would like to block.
4649
2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Block user**.
47-
![The horizontal kebab icon and comment moderation menu showing the block user option](/assets/images/help/repository/comment-menu-block-user.png)
50+
![The horizontal kebab icon and comment moderation menu showing the block user option](/assets/images/help/repository/comment-menu-block-user.png)
4851
3. If you'd like to set a time limit for the block, use the Block user drop-down menu, and select the amount of time you'd like to block the user.
49-
![Block time limit in the block user drop-down menu](/assets/images/help/organizations/org-block-options-menu-from-comment.png)
52+
![Block time limit in the block user drop-down menu](/assets/images/help/organizations/org-block-options-menu-from-comment.png)
5053
4. If you'd like to hide all of the comments the user has made in the organization, select **Hide this user's comments** and choose a reason.
51-
![Send a notification in the block user drop-down menu](/assets/images/help/organizations/org-block-options-menu-hide-user-comments.png)
54+
![Send a notification in the block user drop-down menu](/assets/images/help/organizations/org-block-options-menu-hide-user-comments.png)
5255
5. If you'd like to notify the user why they're being blocked, select **Send a notification to this user**.
53-
![Send a notification in the block user drop-down menu](/assets/images/help/organizations/org-block-options-menu-send-notification.png)
56+
![Send a notification in the block user drop-down menu](/assets/images/help/organizations/org-block-options-menu-send-notification.png)
5457
6. To block the user, click **Block user from organization** or **Block user from organization and send message**.
55-
![Block user button](/assets/images/help/organizations/org-block-user-button-in-comment.png)
58+
![Block user button](/assets/images/help/organizations/org-block-user-button-in-comment.png)
5659

5760
## Blocking a user in the organization settings
5861

5962
1. To block an organization member, first [remove the user](/articles/removing-a-member-from-your-organization) from the organization.
6063

6164
{% data reusables.profile.access_org %}
6265
{% data reusables.profile.org_settings %}
63-
{% data reusables.organizations.block_users %}
64-
6. Under "Block a user", type the username of the user you'd like to block.
65-
![Username field](/assets/images/help/organizations/org-block-username-field.png)
66-
7. If you'd like to set a time limit for the block, use the Block options drop-down menu, and select the amount of time you'd like to block the user.
67-
![Block options drop-down menu](/assets/images/help/organizations/org-block-options-menu.png)
68-
8. Click **Block user**.
66+
{% data reusables.organizations.block_users %} 6. Under "Block a user", type the username of the user you'd like to block.
67+
![Username field](/assets/images/help/organizations/org-block-username-field.png) 7. If you'd like to set a time limit for the block, use the Block options drop-down menu, and select the amount of time you'd like to block the user.
68+
![Block options drop-down menu](/assets/images/help/organizations/org-block-options-menu.png) 8. Click **Block user**.
6969
![Block button](/assets/images/help/organizations/org-block-user-button.png)
7070

7171
## Further reading

content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-personal-account.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: Blocking a user from your personal account
3-
intro: 'You can block a user to deny them access to your activity and repositories, and to prevent them from sending you notifications.'
3+
intro: "You can block a user to deny them access to your activity and repositories, and to prevent them from sending you notifications."
44
redirect_from:
55
- /articles/blocking-a-user-from-your-personal-account
66
- /github/building-a-strong-community/blocking-a-user-from-your-personal-account
77
versions:
8-
fpt: '*'
9-
ghec: '*'
8+
fpt: "*"
9+
ghec: "*"
1010
topics:
1111
- Community
1212
shortTitle: Block from your account
@@ -23,6 +23,7 @@ You can block a user in your account settings or from the user's profile. {% dat
2323
{% endtip %}
2424

2525
When you block a user:
26+
2627
- The user stops following you
2728
- The user stops watching and unpins your repositories
2829
- The user is not able to join any organizations you are an owner of
@@ -32,12 +33,13 @@ When you block a user:
3233
- The user's contributions to your repositories are no longer counted as contributions for them
3334
- Your contributions to the blocked user's repositories are no longer counted as contributions for you
3435
- You are removed as a collaborator on their repositories
35-
- Their sponsorship of you is cancelled
36-
- Any pending repository or account successor invitations to or from the blocked user are cancelled
36+
- Their sponsorship of you is canceled
37+
- Any pending repository or account successor invitations to or from the blocked user are canceled
3738
- The user is removed as a collaborator from all the projects and {% data variables.projects.projects_v1_boards %} owned by you
3839
- You are removed as a collaborator from all the projects and {% data variables.projects.projects_v1_boards %} owned by the user
3940

4041
After you've blocked a user, they cannot:
42+
4143
- Send you any notifications, including by [@mentioning](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) your username
4244
- Comment on or edit issues or pull requests that you've created
4345
- React to your comments on issues, pull requests, and commits
@@ -52,6 +54,7 @@ After you've blocked a user, they cannot:
5254
- Make changes to your public projects and {% data variables.projects.projects_v1_boards %}
5355

5456
In repositories you own, blocked users also cannot:
57+
5558
- Open issues
5659
- Send, close, or merge pull requests
5760
- Comment on issues, pull requests, or commits
@@ -60,18 +63,15 @@ In repositories you own, blocked users also cannot:
6063
## Blocking a user in your account settings
6164

6265
{% data reusables.user-settings.access_settings %}
63-
{% data reusables.user-settings.blocked_users %}
64-
3. Under "Block a user", type the username of the user you'd like to block, then click **Block user**.
65-
![Username field and block button](/assets/images/help/settings/user-settings-block-user.png)
66-
4. Optionally, to display a warning when you visit a repository where a blocked user is a contributor, select **Warn me when a blocked user is a prior contributor to a repository**.
67-
![Warn about blocked users option](/assets/images/help/settings/warn-block-user.png)
66+
{% data reusables.user-settings.blocked_users %} 3. Under "Block a user", type the username of the user you'd like to block, then click **Block user**.
67+
![Username field and block button](/assets/images/help/settings/user-settings-block-user.png) 4. Optionally, to display a warning when you visit a repository where a blocked user is a contributor, select **Warn me when a blocked user is a prior contributor to a repository**.
68+
![Warn about blocked users option](/assets/images/help/settings/warn-block-user.png)
6869

6970
## Blocking a user from their profile page
7071

7172
{% data reusables.profile.user_profile_page_navigation %}
72-
{% data reusables.profile.user_profile_page_block_or_report %}
73-
3. Click **Block user**.
74-
![Modal box with options to block user or report abuse](/assets/images/help/profile/profile-blockuser.png)
73+
{% data reusables.profile.user_profile_page_block_or_report %} 3. Click **Block user**.
74+
![Modal box with options to block user or report abuse](/assets/images/help/profile/profile-blockuser.png)
7575

7676
{% note %}
7777

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
---
22
title: Viewing metrics for your listing
3-
intro: 'The {% data variables.product.prodname_marketplace %} Insights page displays metrics for your {% data variables.product.prodname_github_app %}. You can use the metrics to track your {% data variables.product.prodname_github_app %}''s performance and make more informed decisions about pricing, plans, free trials, and how to visualize the effects of marketing campaigns.'
3+
intro: "The {% data variables.product.prodname_marketplace %} Insights page displays metrics for your {% data variables.product.prodname_github_app %}. You can use the metrics to track your {% data variables.product.prodname_github_app %}'s performance and make more informed decisions about pricing, plans, free trials, and how to visualize the effects of marketing campaigns."
44
redirect_from:
55
- /apps/marketplace/managing-github-marketplace-listings/viewing-performance-metrics-for-a-github-marketplace-listing
66
- /apps/marketplace/viewing-performance-metrics-for-a-github-marketplace-listing
77
- /apps/marketplace/github-marketplace-insights
88
- /marketplace/github-marketplace-insights
99
- /developers/github-marketplace/viewing-metrics-for-your-listing
1010
versions:
11-
fpt: '*'
12-
ghec: '*'
11+
fpt: "*"
12+
ghec: "*"
1313
topics:
1414
- Marketplace
1515
shortTitle: View listing metrics
1616
---
17+
1718
You can view metrics for the past day (24 hours), week, month, or for the entire duration of time that your {% data variables.product.prodname_github_app %} has been listed.
1819

1920
{% note %}
@@ -26,31 +27,28 @@ You can view metrics for the past day (24 hours), week, month, or for the entire
2627

2728
The Insights page displays these performance metrics, for the selected time period:
2829

29-
* **Subscription value:** Total possible revenue (in US dollars) for subscriptions. This value represents the possible revenue if no plans or free trials are cancelled and all credit transactions are successful. The subscription value includes the full value for plans that begin with a free trial in the selected time period, even when there are no financial transactions in that time period. The subscription value also includes the full value of upgraded plans in the selected time period but does not include the prorated amount. To see and download individual transactions, see "[GitHub Marketplace transactions](/marketplace/github-marketplace-transactions/)."
30-
* **Visitors:** Number of people that have viewed a page in your GitHub Apps listing. This number includes both logged in and logged out visitors.
31-
* **Pageviews:** Number of views the pages in your GitHub App's listing received. A single visitor can generate more than one page view.
30+
- **Subscription value:** Total possible revenue (in US dollars) for subscriptions. This value represents the possible revenue if no plans or free trials are canceled and all credit transactions are successful. The subscription value includes the full value for plans that begin with a free trial in the selected time period, even when there are no financial transactions in that time period. The subscription value also includes the full value of upgraded plans in the selected time period but does not include the prorated amount. To see and download individual transactions, see "[GitHub Marketplace transactions](/marketplace/github-marketplace-transactions/)."
31+
- **Visitors:** Number of people that have viewed a page in your GitHub Apps listing. This number includes both logged in and logged out visitors.
32+
- **Pageviews:** Number of views the pages in your GitHub App's listing received. A single visitor can generate more than one page view.
3233

3334
{% note %}
3435

35-
**Note:** Your estimated subscription value could be much higher than the transactions processed for this period.
36+
**Note:** Your estimated subscription value could be much higher than the transactions processed for this period.
3637

3738
{% endnote %}
3839

3940
### Conversion performance
4041

41-
* **Unique visitors to landing page:** Number of people who viewed your GitHub App's landing page.
42-
* **Unique visitors to checkout page:** Number of people who viewed one of your GitHub App's checkout pages.
43-
* **Checkout page to new subscriptions:** Total number of paid subscriptions, free trials, and free subscriptions. See the "Breakdown of total subscriptions" for the specific number of each type of subscription.
42+
- **Unique visitors to landing page:** Number of people who viewed your GitHub App's landing page.
43+
- **Unique visitors to checkout page:** Number of people who viewed one of your GitHub App's checkout pages.
44+
- **Checkout page to new subscriptions:** Total number of paid subscriptions, free trials, and free subscriptions. See the "Breakdown of total subscriptions" for the specific number of each type of subscription.
4445

4546
![Marketplace insights](/assets/images/marketplace/marketplace_insights.png)
4647

4748
To access {% data variables.product.prodname_marketplace %} Insights:
4849

4950
{% data reusables.user-settings.access_settings %}
5051
{% data reusables.user-settings.developer_settings %}
51-
{% data reusables.user-settings.marketplace_apps %}
52-
4. Select the {% data variables.product.prodname_github_app %} that you'd like to view Insights for.
53-
{% data reusables.user-settings.edit_marketplace_listing %}
54-
6. Click the **Insights** tab.
55-
7. Optionally, select a different time period by clicking the Period dropdown in the upper-right corner of the Insights page.
52+
{% data reusables.user-settings.marketplace_apps %} 4. Select the {% data variables.product.prodname_github_app %} that you'd like to view Insights for.
53+
{% data reusables.user-settings.edit_marketplace_listing %} 6. Click the **Insights** tab. 7. Optionally, select a different time period by clicking the Period dropdown in the upper-right corner of the Insights page.
5654
![Marketplace time period](/assets/images/marketplace/marketplace_insights_time_period.png)

0 commit comments

Comments
 (0)