From 325dda3d3991c26c115d10bee307e87d7bc65035 Mon Sep 17 00:00:00 2001 From: Jeroen Rietveld Date: Wed, 13 Jan 2021 16:15:38 +0900 Subject: [PATCH 1/9] Change Github -> GitHub in MD files --- .../apps/creating-ci-tests-with-the-checks-api.md | 6 +++--- .../apps/migrating-oauth-apps-to-github-apps.md | 4 ++-- .../handling-new-purchases-and-free-trials.md | 2 +- ...figuring-saml-single-sign-on-and-scim-using-okta.md | 10 +++++----- ...-and-scim-for-your-enterprise-account-using-okta.md | 2 +- content/rest/overview/libraries.md | 10 +++++----- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/content/developers/apps/creating-ci-tests-with-the-checks-api.md b/content/developers/apps/creating-ci-tests-with-the-checks-api.md index 03e0870dc7..d201a932dc 100644 --- a/content/developers/apps/creating-ci-tests-with-the-checks-api.md +++ b/content/developers/apps/creating-ci-tests-with-the-checks-api.md @@ -12,7 +12,7 @@ versions: ### Introduction -This guide will introduce you to [Github Apps](/apps/) and the [Checks API](/rest/reference/checks), which you'll use to build a continuous integration (CI) server that runs tests. +This guide will introduce you to [GitHub Apps](/apps/) and the [Checks API](/rest/reference/checks), which you'll use to build a continuous integration (CI) server that runs tests. CI is a software practice that requires frequently committing code to a shared repository. Committing code more often raises errors sooner and reduces the amount of code a developer needs to debug when finding the source of an error. Frequent code updates also make it easier to merge changes from different members of a software development team. This is great for developers, who can spend more time writing code and less time debugging errors or resolving merge conflicts. 🙌 @@ -49,7 +49,7 @@ To get an idea of what your Checks API CI server will do when you've completed t ### Prerequisites -Before you get started, you may want to familiarize yourself with [Github Apps](/apps/), [Webhooks](/webhooks), and the [Checks API](/rest/reference/checks), if you're not already. You'll find more APIs in the [REST API docs](/rest). The Checks API is also available to use in [GraphQL](/graphql), but this quickstart focuses on REST. See the GraphQL [Checks Suite](/graphql/reference/objects#checksuite) and [Check Run](/graphql/reference/objects#checkrun) objects for more details. +Before you get started, you may want to familiarize yourself with [GitHub Apps](/apps/), [Webhooks](/webhooks), and the [Checks API](/rest/reference/checks), if you're not already. You'll find more APIs in the [REST API docs](/rest). The Checks API is also available to use in [GraphQL](/graphql), but this quickstart focuses on REST. See the GraphQL [Checks Suite](/graphql/reference/objects#checksuite) and [Check Run](/graphql/reference/objects#checkrun) objects for more details. You'll use the [Ruby programming language](https://www.ruby-lang.org/en/), the [Smee](https://smee.io/) webhook payload delivery service, the [Octokit.rb Ruby library](http://octokit.github.io/octokit.rb/) for the GitHub REST API, and the [Sinatra web framework](http://sinatrarb.com/) to create your Checks API CI server app. @@ -203,7 +203,7 @@ Great! You've told GitHub to create a check run. You can see the check run statu ### Step 1.4. Updating a check run -When your `create_check_run` method runs, it asks GitHub to create a new check run. When Github finishes creating the check run, you'll receive the `check_run` webhook event with the `created` action. That event is your signal to begin running the check. +When your `create_check_run` method runs, it asks GitHub to create a new check run. When GitHub finishes creating the check run, you'll receive the `check_run` webhook event with the `created` action. That event is your signal to begin running the check. You'll want to update your event handler to look for the `created` action. While you're updating the event handler, you can add a conditional for the `rerequested` action. When someone re-runs a single test on GitHub by clicking the "Re-run" button, GitHub sends the `rerequested` check run event to your app. When a check run is `rerequested`, you'll want to start the process all over and create a new check run. diff --git a/content/developers/apps/migrating-oauth-apps-to-github-apps.md b/content/developers/apps/migrating-oauth-apps-to-github-apps.md index d8fb12db9a..21fbe532f2 100644 --- a/content/developers/apps/migrating-oauth-apps-to-github-apps.md +++ b/content/developers/apps/migrating-oauth-apps-to-github-apps.md @@ -52,7 +52,7 @@ GitHub Apps use [sliding rules for rate limits](/apps/building-github-apps/under #### Register a new GitHub App -Once you've decided to make the switch to Github Apps, you'll need to [create a new GitHub App](/apps/building-github-apps/). +Once you've decided to make the switch to GitHub Apps, you'll need to [create a new GitHub App](/apps/building-github-apps/). #### Determine the permissions your app requires @@ -62,7 +62,7 @@ In your GitHub App's settings, you can specify whether your app needs `No Access #### Subscribe to webhooks -After you've created a new GitHub App and selected its permissions, you can select the webhook events you wish to subscribe it to. See "[Editing a Github App's permissions](/apps/managing-github-apps/editing-a-github-app-s-permissions/)" to learn how to subscribe to webhooks. +After you've created a new GitHub App and selected its permissions, you can select the webhook events you wish to subscribe it to. See "[Editing a GitHub App's permissions](/apps/managing-github-apps/editing-a-github-app-s-permissions/)" to learn how to subscribe to webhooks. #### Understand the different methods of authentication diff --git a/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md b/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md index 0c67eec856..a3022d20aa 100644 --- a/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md +++ b/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md @@ -36,7 +36,7 @@ See "[{% data variables.product.prodname_marketplace %} webhook events](/marketp If your app is a GitHub App, GitHub prompts the customer to select which repositories the app can access when they purchase it. GitHub then installs the app on the account the customer selected and grants access to the selected repositories. -At this point, if you specified a **Setup URL** in your GitHub App settings, Github will redirect the customer to that URL. If you do not specify a setup URL, you will not be able to handle purchases of your GitHub App. +At this point, if you specified a **Setup URL** in your GitHub App settings, GitHub will redirect the customer to that URL. If you do not specify a setup URL, you will not be able to handle purchases of your GitHub App. {% note %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md b/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md index 3e07739d06..92c03b27dc 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md +++ b/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md @@ -31,7 +31,7 @@ After you enable SCIM, the following provisioning features are available for any {% data reusables.saml.okta-dashboard-click-applications %} {% data reusables.saml.add-okta-application %} {% data reusables.saml.search-ghec-okta %} -4. To the right of "Github Enterprise Cloud - Organization", click **Add**. +4. To the right of "GitHub Enterprise Cloud - Organization", click **Add**. ![Clicking "Add" for the {% data variables.product.prodname_ghe_cloud %} application](/assets/images/help/saml/okta-add-ghec-application.png) 5. In the **GitHub Organization** field, type the name of your {% data variables.product.prodname_dotcom %} organization. For example, if your organization's URL is https://github.com/octo-org, the organization name would be `octo-org`. @@ -57,16 +57,16 @@ After you enable SCIM, the following provisioning features are available for any {% data reusables.saml.okta-enable-api-integration %} -6. Click **Authenticate with Github Enterprise Cloud - Organization**. - !["Authenticate with Github Enterprise Cloud - Organization" button for Okta application](/assets/images/help/saml/okta-authenticate-with-ghec-organization.png) +6. Click **Authenticate with GitHub Enterprise Cloud - Organization**. + !["Authenticate with GitHub Enterprise Cloud - Organization" button for Okta application](/assets/images/help/saml/okta-authenticate-with-ghec-organization.png) 7. To the right of your organization's name, click **Grant**. !["Grant" button for authorizing Okta SCIM integration to access organization](/assets/images/help/saml/okta-scim-integration-grant-organization-access.png) {% note %} - + **Note**: If you don't see your organization in the list, go to `https://github.com/orgs/ORGANIZATION-NAME/sso` in your browser and authenticate with your organization via SAML SSO using your administrator account on the IdP. For example, if your organization's name is `octo-org`, the URL would be `https://github.com/orgs/octo-org/sso`. For more information, see "[About authentication with SAML single sign-on](/github/authenticating-to-github/about-authentication-with-saml-single-sign-on)." - + {% endnote %} 1. Click **Authorize OktaOAN**. !["Authorize OktaOAN" button for authorizing Okta SCIM integration to access organization](/assets/images/help/saml/okta-scim-integration-authorize-oktaoan.png) diff --git a/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md b/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md index 86ee087d2a..5efab0557d 100644 --- a/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md +++ b/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md @@ -76,7 +76,7 @@ To configure user provisioning with SCIM in Okta, you must authorize an OAuth ap {% data reusables.saml.okta-provisioning-tab %} {% data reusables.saml.okta-configure-api-integration %} {% data reusables.saml.okta-enable-api-integration %} -1. Click **Authenticate with Github Enterprise Cloud - Enterprise Accounts**. +1. Click **Authenticate with GitHub Enterprise Cloud - Enterprise Accounts**. ![Button to authenticate with {% data variables.product.prodname_dotcom %}](/assets/images/help/business-accounts/authenticate-with-github-button.png) 1. To the right of your enterprise account's name, click **Grant**. 1. Click **Authorize okta-oauth**. diff --git a/content/rest/overview/libraries.md b/content/rest/overview/libraries.md index 6f9b745297..0deac15280 100644 --- a/content/rest/overview/libraries.md +++ b/content/rest/overview/libraries.md @@ -25,7 +25,7 @@ versions: ### Clojure -Library name | Repository +Library name | Repository |---|---| **Tentacles**| [Raynes/tentacles](https://github.com/Raynes/tentacles) @@ -80,7 +80,7 @@ Library name | Repository | Library name | Repository | |---|---| -**Github.jl**|[WestleyArgentum/Github.jl](https://github.com/WestleyArgentum/GitHub.jl) +**GitHub.jl**|[WestleyArgentum/GitHub.jl](https://github.com/WestleyArgentum/GitHub.jl) ### OCaml @@ -93,7 +93,7 @@ Library name | Repository | Library name | Repository | metacpan Website for the Library |---|---|---| **Pithub**|[plu/Pithub](https://github.com/plu/Pithub)|[Pithub CPAN](http://metacpan.org/module/Pithub) -**Net::Github**|[fayland/perl-net-github](https://github.com/fayland/perl-net-github)|[Net:Github CPAN](https://metacpan.org/pod/Net::GitHub) +**Net::GitHub**|[fayland/perl-net-github](https://github.com/fayland/perl-net-github)|[Net:GitHub CPAN](https://metacpan.org/pod/Net::GitHub) ### PHP @@ -105,8 +105,8 @@ Library name | Repository **GitHub Joomla! Package**|[joomla-framework/github-api](https://github.com/joomla-framework/github-api) **GitHub Nette Extension**|[kdyby/github](https://github.com/kdyby/github) **GitHub API Easy Access**|[milo/github-api](https://github.com/milo/github-api) -**GitHub bridge for Laravel**|[GrahamCampbell/Laravel-Github](https://github.com/GrahamCampbell/Laravel-GitHub) -**PHP7 Client & WebHook wrapper**|[FlexyProject/GithubAPI](https://github.com/FlexyProject/GitHubAPI) +**GitHub bridge for Laravel**|[GrahamCampbell/Laravel-GitHub](https://github.com/GrahamCampbell/Laravel-GitHub) +**PHP7 Client & WebHook wrapper**|[FlexyProject/GitHubAPI](https://github.com/FlexyProject/GitHubAPI) ### Python From ef3cf15cd6cfd432cdad9a8451b614555ce279d8 Mon Sep 17 00:00:00 2001 From: Jeroen Rietveld Date: Wed, 13 Jan 2021 16:18:40 +0900 Subject: [PATCH 2/9] Change Github -> GitHub in other texts --- data/variables/action_code_examples.yml | 8 ++++---- lib/rest/static/decorated/api.github.com.json | 12 ++++++------ .../static/dereferenced/api.github.com.deref.json | 8 ++++---- lib/rest/static/dereferenced/ghes-2.18.deref.json | 2 +- lib/rest/static/dereferenced/ghes-2.19.deref.json | 2 +- lib/rest/static/dereferenced/ghes-2.20.deref.json | 2 +- lib/rest/static/dereferenced/ghes-2.21.deref.json | 2 +- lib/rest/static/dereferenced/ghes-2.22.deref.json | 2 +- lib/rest/static/dereferenced/github.ae.deref.json | 2 +- .../static/dotcom/package.published.payload.json | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/data/variables/action_code_examples.yml b/data/variables/action_code_examples.yml index ddce4d8684..66265a5d18 100644 --- a/data/variables/action_code_examples.yml +++ b/data/variables/action_code_examples.yml @@ -19,14 +19,14 @@ - issues - labels - title: Add releases to GitHub - description: Publish Github releases in an action + description: Publish GitHub releases in an action languages: 'Dockerfile, Shell' href: elgohr/Github-Release-Action tags: - releases - publishing - title: Publish a docker image to Dockerhub - description: A Github Action used to build and publish Docker images + description: A GitHub Action used to build and publish Docker images languages: 'Dockerfile, Shell' href: elgohr/Publish-Docker-Github-Action tags: @@ -106,7 +106,7 @@ - wiki - publishing - title: Label your Pull Requests auto-magically (using committed files) - description: Github action to label your pull requests auto-magically (using committed files) + description: GitHub action to label your pull requests auto-magically (using committed files) languages: 'TypeScript, Dockerfile, JavaScript' href: Decathlon/pull-request-labeler-action tags: @@ -114,7 +114,7 @@ - issues - labels - title: Add Label to your Pull Requests based on the author team name - description: Github action to label your pull requests based on the author name + description: GitHub action to label your pull requests based on the author name languages: 'TypeScript, JavaScript' href: JulienKode/team-labeler-action tags: diff --git a/lib/rest/static/decorated/api.github.com.json b/lib/rest/static/decorated/api.github.com.json index ff3129b525..cf616885a3 100644 --- a/lib/rest/static/decorated/api.github.com.json +++ b/lib/rest/static/decorated/api.github.com.json @@ -8078,7 +8078,7 @@ } ], "summary": "Get shared storage billing for an enterprise", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nThe authenticated user must be an enterprise admin.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nThe authenticated user must be an enterprise admin.", "operationId": "billing/get-shared-storage-billing-ghe", "tags": [ "billing" @@ -8101,7 +8101,7 @@ "subcategoryLabel": "Billing", "notes": [], "bodyParameters": [], - "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

The authenticated user must be an enterprise admin.

", + "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

The authenticated user must be an enterprise admin.

", "responses": [ { "httpStatusCode": "200", @@ -21931,7 +21931,7 @@ } ], "summary": "Get shared storage billing for an organization", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `repo` or `admin:org` scope.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `repo` or `admin:org` scope.", "operationId": "billing/get-shared-storage-billing-org", "tags": [ "billing" @@ -21952,7 +21952,7 @@ "categoryLabel": "Billing", "notes": [], "bodyParameters": [], - "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

Access tokens must have the repo or admin:org scope.

", + "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

Access tokens must have the repo or admin:org scope.

", "responses": [ { "httpStatusCode": "200", @@ -87343,7 +87343,7 @@ } ], "summary": "Get shared storage billing for a user", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `user` scope.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `user` scope.", "operationId": "billing/get-shared-storage-billing-user", "tags": [ "billing" @@ -87364,7 +87364,7 @@ "categoryLabel": "Billing", "notes": [], "bodyParameters": [], - "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

Access tokens must have the user scope.

", + "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

Access tokens must have the user scope.

", "responses": [ { "httpStatusCode": "200", diff --git a/lib/rest/static/dereferenced/api.github.com.deref.json b/lib/rest/static/dereferenced/api.github.com.deref.json index 88de2f1342..4f2c90f2d6 100644 --- a/lib/rest/static/dereferenced/api.github.com.deref.json +++ b/lib/rest/static/dereferenced/api.github.com.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render Github flavored markdown" + "description": "Render GitHub flavored markdown" }, { "name": "meta", @@ -21499,7 +21499,7 @@ "/enterprises/{enterprise}/settings/billing/shared-storage": { "get": { "summary": "Get shared storage billing for an enterprise", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nThe authenticated user must be an enterprise admin.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nThe authenticated user must be an enterprise admin.", "operationId": "billing/get-shared-storage-billing-ghe", "tags": [ "billing" @@ -79003,7 +79003,7 @@ "/orgs/{org}/settings/billing/shared-storage": { "get": { "summary": "Get shared storage billing for an organization", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `repo` or `admin:org` scope.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `repo` or `admin:org` scope.", "operationId": "billing/get-shared-storage-billing-org", "tags": [ "billing" @@ -340266,7 +340266,7 @@ "/users/{username}/settings/billing/shared-storage": { "get": { "summary": "Get shared storage billing for a user", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `user` scope.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `user` scope.", "operationId": "billing/get-shared-storage-billing-user", "tags": [ "billing" diff --git a/lib/rest/static/dereferenced/ghes-2.18.deref.json b/lib/rest/static/dereferenced/ghes-2.18.deref.json index 33d6ce62ca..0fc8b9f100 100644 --- a/lib/rest/static/dereferenced/ghes-2.18.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.18.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render Github flavored markdown" + "description": "Render GitHub flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/ghes-2.19.deref.json b/lib/rest/static/dereferenced/ghes-2.19.deref.json index d3c4c98fad..461c8006d3 100644 --- a/lib/rest/static/dereferenced/ghes-2.19.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.19.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render Github flavored markdown" + "description": "Render GitHub flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/ghes-2.20.deref.json b/lib/rest/static/dereferenced/ghes-2.20.deref.json index c7f6d499e5..d4572ea657 100644 --- a/lib/rest/static/dereferenced/ghes-2.20.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.20.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render Github flavored markdown" + "description": "Render GitHub flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/ghes-2.21.deref.json b/lib/rest/static/dereferenced/ghes-2.21.deref.json index 8d615b4878..2eab52b3fb 100644 --- a/lib/rest/static/dereferenced/ghes-2.21.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.21.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render Github flavored markdown" + "description": "Render GitHub flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/ghes-2.22.deref.json b/lib/rest/static/dereferenced/ghes-2.22.deref.json index 4078322052..8d8e10b4b4 100644 --- a/lib/rest/static/dereferenced/ghes-2.22.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.22.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render Github flavored markdown" + "description": "Render GitHub flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/github.ae.deref.json b/lib/rest/static/dereferenced/github.ae.deref.json index 6dbfe74147..3b092dfa59 100644 --- a/lib/rest/static/dereferenced/github.ae.deref.json +++ b/lib/rest/static/dereferenced/github.ae.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render Github flavored markdown" + "description": "Render GitHub flavored markdown" }, { "name": "meta", diff --git a/lib/webhooks/static/dotcom/package.published.payload.json b/lib/webhooks/static/dotcom/package.published.payload.json index f310484f15..b10208f8e4 100644 --- a/lib/webhooks/static/dotcom/package.published.payload.json +++ b/lib/webhooks/static/dotcom/package.published.payload.json @@ -31,8 +31,8 @@ "id":24147, "version":"1.0.0", "summary":"A simple npm package to demonstrate GitHub Packages", - "body":"# hello-world-npm\n\nThis is a simple npm package that demonstrates the [Github Packages](https://github.com/features/package).\n\n## Installation \n\n`$ npm install`\n\n## Usage\n\n```\nconst myPackage = require('hello-world-node-package');\nmyPackage.helloWorld();\n```\n\n", - "body_html":"

hello-world-npm

\n

This is a simple npm package that demonstrates the Github Package Registry.

\n

Installation

\n

$ npm install

\n

Usage

\n
const myPackage = require('hello-world-node-package');\nmyPackage.helloWorld();\n
", + "body":"# hello-world-npm\n\nThis is a simple npm package that demonstrates the [GitHub Packages](https://github.com/features/package).\n\n## Installation \n\n`$ npm install`\n\n## Usage\n\n```\nconst myPackage = require('hello-world-node-package');\nmyPackage.helloWorld();\n```\n\n", + "body_html":"

hello-world-npm

\n

This is a simple npm package that demonstrates the GitHub Package Registry.

\n

Installation

\n

$ npm install

\n

Usage

\n
const myPackage = require('hello-world-node-package');\nmyPackage.helloWorld();\n
", "release":{ "url":"https://api.github.com/repos/Codertocat/hello-world-npm/releases/17264286", "html_url":"https://github.com/Codertocat/hello-world-npm/releases/tag/1.0.0", From bbc3d4e1ea0a71bf49396281457d70fda4610514 Mon Sep 17 00:00:00 2001 From: Jeroen Rietveld Date: Wed, 13 Jan 2021 16:22:56 +0900 Subject: [PATCH 3/9] Revert "Change Github -> GitHub in other texts" This reverts commit ef3cf15cd6cfd432cdad9a8451b614555ce279d8. --- data/variables/action_code_examples.yml | 8 ++++---- lib/rest/static/decorated/api.github.com.json | 12 ++++++------ .../static/dereferenced/api.github.com.deref.json | 8 ++++---- lib/rest/static/dereferenced/ghes-2.18.deref.json | 2 +- lib/rest/static/dereferenced/ghes-2.19.deref.json | 2 +- lib/rest/static/dereferenced/ghes-2.20.deref.json | 2 +- lib/rest/static/dereferenced/ghes-2.21.deref.json | 2 +- lib/rest/static/dereferenced/ghes-2.22.deref.json | 2 +- lib/rest/static/dereferenced/github.ae.deref.json | 2 +- .../static/dotcom/package.published.payload.json | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/data/variables/action_code_examples.yml b/data/variables/action_code_examples.yml index 66265a5d18..ddce4d8684 100644 --- a/data/variables/action_code_examples.yml +++ b/data/variables/action_code_examples.yml @@ -19,14 +19,14 @@ - issues - labels - title: Add releases to GitHub - description: Publish GitHub releases in an action + description: Publish Github releases in an action languages: 'Dockerfile, Shell' href: elgohr/Github-Release-Action tags: - releases - publishing - title: Publish a docker image to Dockerhub - description: A GitHub Action used to build and publish Docker images + description: A Github Action used to build and publish Docker images languages: 'Dockerfile, Shell' href: elgohr/Publish-Docker-Github-Action tags: @@ -106,7 +106,7 @@ - wiki - publishing - title: Label your Pull Requests auto-magically (using committed files) - description: GitHub action to label your pull requests auto-magically (using committed files) + description: Github action to label your pull requests auto-magically (using committed files) languages: 'TypeScript, Dockerfile, JavaScript' href: Decathlon/pull-request-labeler-action tags: @@ -114,7 +114,7 @@ - issues - labels - title: Add Label to your Pull Requests based on the author team name - description: GitHub action to label your pull requests based on the author name + description: Github action to label your pull requests based on the author name languages: 'TypeScript, JavaScript' href: JulienKode/team-labeler-action tags: diff --git a/lib/rest/static/decorated/api.github.com.json b/lib/rest/static/decorated/api.github.com.json index cf616885a3..ff3129b525 100644 --- a/lib/rest/static/decorated/api.github.com.json +++ b/lib/rest/static/decorated/api.github.com.json @@ -8078,7 +8078,7 @@ } ], "summary": "Get shared storage billing for an enterprise", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nThe authenticated user must be an enterprise admin.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nThe authenticated user must be an enterprise admin.", "operationId": "billing/get-shared-storage-billing-ghe", "tags": [ "billing" @@ -8101,7 +8101,7 @@ "subcategoryLabel": "Billing", "notes": [], "bodyParameters": [], - "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

The authenticated user must be an enterprise admin.

", + "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

The authenticated user must be an enterprise admin.

", "responses": [ { "httpStatusCode": "200", @@ -21931,7 +21931,7 @@ } ], "summary": "Get shared storage billing for an organization", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `repo` or `admin:org` scope.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `repo` or `admin:org` scope.", "operationId": "billing/get-shared-storage-billing-org", "tags": [ "billing" @@ -21952,7 +21952,7 @@ "categoryLabel": "Billing", "notes": [], "bodyParameters": [], - "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

Access tokens must have the repo or admin:org scope.

", + "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

Access tokens must have the repo or admin:org scope.

", "responses": [ { "httpStatusCode": "200", @@ -87343,7 +87343,7 @@ } ], "summary": "Get shared storage billing for a user", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `user` scope.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `user` scope.", "operationId": "billing/get-shared-storage-billing-user", "tags": [ "billing" @@ -87364,7 +87364,7 @@ "categoryLabel": "Billing", "notes": [], "bodyParameters": [], - "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

Access tokens must have the user scope.

", + "descriptionHTML": "

Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.

\n

Paid minutes only apply to packages stored for private repositories. For more information, see \"Managing billing for GitHub Packages.\"

\n

Access tokens must have the user scope.

", "responses": [ { "httpStatusCode": "200", diff --git a/lib/rest/static/dereferenced/api.github.com.deref.json b/lib/rest/static/dereferenced/api.github.com.deref.json index 4f2c90f2d6..88de2f1342 100644 --- a/lib/rest/static/dereferenced/api.github.com.deref.json +++ b/lib/rest/static/dereferenced/api.github.com.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render GitHub flavored markdown" + "description": "Render Github flavored markdown" }, { "name": "meta", @@ -21499,7 +21499,7 @@ "/enterprises/{enterprise}/settings/billing/shared-storage": { "get": { "summary": "Get shared storage billing for an enterprise", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nThe authenticated user must be an enterprise admin.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nThe authenticated user must be an enterprise admin.", "operationId": "billing/get-shared-storage-billing-ghe", "tags": [ "billing" @@ -79003,7 +79003,7 @@ "/orgs/{org}/settings/billing/shared-storage": { "get": { "summary": "Get shared storage billing for an organization", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `repo` or `admin:org` scope.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `repo` or `admin:org` scope.", "operationId": "billing/get-shared-storage-billing-org", "tags": [ "billing" @@ -340266,7 +340266,7 @@ "/users/{username}/settings/billing/shared-storage": { "get": { "summary": "Get shared storage billing for a user", - "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and GitHub Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `user` scope.", + "description": "Gets the estimated paid and estimated total storage used for GitHub Actions and Github Packages.\n\nPaid minutes only apply to packages stored for private repositories. For more information, see \"[Managing billing for GitHub Packages](https://help.github.com/github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages).\"\n\nAccess tokens must have the `user` scope.", "operationId": "billing/get-shared-storage-billing-user", "tags": [ "billing" diff --git a/lib/rest/static/dereferenced/ghes-2.18.deref.json b/lib/rest/static/dereferenced/ghes-2.18.deref.json index 0fc8b9f100..33d6ce62ca 100644 --- a/lib/rest/static/dereferenced/ghes-2.18.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.18.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render GitHub flavored markdown" + "description": "Render Github flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/ghes-2.19.deref.json b/lib/rest/static/dereferenced/ghes-2.19.deref.json index 461c8006d3..d3c4c98fad 100644 --- a/lib/rest/static/dereferenced/ghes-2.19.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.19.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render GitHub flavored markdown" + "description": "Render Github flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/ghes-2.20.deref.json b/lib/rest/static/dereferenced/ghes-2.20.deref.json index d4572ea657..c7f6d499e5 100644 --- a/lib/rest/static/dereferenced/ghes-2.20.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.20.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render GitHub flavored markdown" + "description": "Render Github flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/ghes-2.21.deref.json b/lib/rest/static/dereferenced/ghes-2.21.deref.json index 2eab52b3fb..8d615b4878 100644 --- a/lib/rest/static/dereferenced/ghes-2.21.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.21.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render GitHub flavored markdown" + "description": "Render Github flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/ghes-2.22.deref.json b/lib/rest/static/dereferenced/ghes-2.22.deref.json index 8d8e10b4b4..4078322052 100644 --- a/lib/rest/static/dereferenced/ghes-2.22.deref.json +++ b/lib/rest/static/dereferenced/ghes-2.22.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render GitHub flavored markdown" + "description": "Render Github flavored markdown" }, { "name": "meta", diff --git a/lib/rest/static/dereferenced/github.ae.deref.json b/lib/rest/static/dereferenced/github.ae.deref.json index 3b092dfa59..6dbfe74147 100644 --- a/lib/rest/static/dereferenced/github.ae.deref.json +++ b/lib/rest/static/dereferenced/github.ae.deref.json @@ -73,7 +73,7 @@ }, { "name": "markdown", - "description": "Render GitHub flavored markdown" + "description": "Render Github flavored markdown" }, { "name": "meta", diff --git a/lib/webhooks/static/dotcom/package.published.payload.json b/lib/webhooks/static/dotcom/package.published.payload.json index b10208f8e4..f310484f15 100644 --- a/lib/webhooks/static/dotcom/package.published.payload.json +++ b/lib/webhooks/static/dotcom/package.published.payload.json @@ -31,8 +31,8 @@ "id":24147, "version":"1.0.0", "summary":"A simple npm package to demonstrate GitHub Packages", - "body":"# hello-world-npm\n\nThis is a simple npm package that demonstrates the [GitHub Packages](https://github.com/features/package).\n\n## Installation \n\n`$ npm install`\n\n## Usage\n\n```\nconst myPackage = require('hello-world-node-package');\nmyPackage.helloWorld();\n```\n\n", - "body_html":"

hello-world-npm

\n

This is a simple npm package that demonstrates the GitHub Package Registry.

\n

Installation

\n

$ npm install

\n

Usage

\n
const myPackage = require('hello-world-node-package');\nmyPackage.helloWorld();\n
", + "body":"# hello-world-npm\n\nThis is a simple npm package that demonstrates the [Github Packages](https://github.com/features/package).\n\n## Installation \n\n`$ npm install`\n\n## Usage\n\n```\nconst myPackage = require('hello-world-node-package');\nmyPackage.helloWorld();\n```\n\n", + "body_html":"

hello-world-npm

\n

This is a simple npm package that demonstrates the Github Package Registry.

\n

Installation

\n

$ npm install

\n

Usage

\n
const myPackage = require('hello-world-node-package');\nmyPackage.helloWorld();\n
", "release":{ "url":"https://api.github.com/repos/Codertocat/hello-world-npm/releases/17264286", "html_url":"https://github.com/Codertocat/hello-world-npm/releases/tag/1.0.0", From eb621f71f5d14da76ca1ae8e2ed8128a81337d9d Mon Sep 17 00:00:00 2001 From: Jeroen Rietveld Date: Wed, 13 Jan 2021 16:25:04 +0900 Subject: [PATCH 4/9] Change Github -> GitHub in yml file --- data/variables/action_code_examples.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/variables/action_code_examples.yml b/data/variables/action_code_examples.yml index ddce4d8684..66265a5d18 100644 --- a/data/variables/action_code_examples.yml +++ b/data/variables/action_code_examples.yml @@ -19,14 +19,14 @@ - issues - labels - title: Add releases to GitHub - description: Publish Github releases in an action + description: Publish GitHub releases in an action languages: 'Dockerfile, Shell' href: elgohr/Github-Release-Action tags: - releases - publishing - title: Publish a docker image to Dockerhub - description: A Github Action used to build and publish Docker images + description: A GitHub Action used to build and publish Docker images languages: 'Dockerfile, Shell' href: elgohr/Publish-Docker-Github-Action tags: @@ -106,7 +106,7 @@ - wiki - publishing - title: Label your Pull Requests auto-magically (using committed files) - description: Github action to label your pull requests auto-magically (using committed files) + description: GitHub action to label your pull requests auto-magically (using committed files) languages: 'TypeScript, Dockerfile, JavaScript' href: Decathlon/pull-request-labeler-action tags: @@ -114,7 +114,7 @@ - issues - labels - title: Add Label to your Pull Requests based on the author team name - description: Github action to label your pull requests based on the author name + description: GitHub action to label your pull requests based on the author name languages: 'TypeScript, JavaScript' href: JulienKode/team-labeler-action tags: From 63ef4d6ad41e51c76343a6ef1babcc38e5ee41ac Mon Sep 17 00:00:00 2001 From: Matt Pollard Date: Mon, 8 Feb 2021 15:26:35 +0100 Subject: [PATCH 5/9] Revert changes for UI labels --- .../configuring-saml-single-sign-on-and-scim-using-okta.md | 6 +++--- ...gn-on-and-scim-for-your-enterprise-account-using-okta.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md b/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md index 92c03b27dc..2f34342827 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md +++ b/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md @@ -31,7 +31,7 @@ After you enable SCIM, the following provisioning features are available for any {% data reusables.saml.okta-dashboard-click-applications %} {% data reusables.saml.add-okta-application %} {% data reusables.saml.search-ghec-okta %} -4. To the right of "GitHub Enterprise Cloud - Organization", click **Add**. +4. To the right of "Github Enterprise Cloud - Organization", click **Add**. ![Clicking "Add" for the {% data variables.product.prodname_ghe_cloud %} application](/assets/images/help/saml/okta-add-ghec-application.png) 5. In the **GitHub Organization** field, type the name of your {% data variables.product.prodname_dotcom %} organization. For example, if your organization's URL is https://github.com/octo-org, the organization name would be `octo-org`. @@ -57,8 +57,8 @@ After you enable SCIM, the following provisioning features are available for any {% data reusables.saml.okta-enable-api-integration %} -6. Click **Authenticate with GitHub Enterprise Cloud - Organization**. - !["Authenticate with GitHub Enterprise Cloud - Organization" button for Okta application](/assets/images/help/saml/okta-authenticate-with-ghec-organization.png) +6. Click **Authenticate with Github Enterprise Cloud - Organization**. + !["Authenticate with Github Enterprise Cloud - Organization" button for Okta application](/assets/images/help/saml/okta-authenticate-with-ghec-organization.png) 7. To the right of your organization's name, click **Grant**. !["Grant" button for authorizing Okta SCIM integration to access organization](/assets/images/help/saml/okta-scim-integration-grant-organization-access.png) diff --git a/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md b/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md index d08495a61a..b1fd95b884 100644 --- a/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md +++ b/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md @@ -76,7 +76,7 @@ To configure user provisioning with SCIM in Okta, you must authorize an OAuth ap {% data reusables.saml.okta-provisioning-tab %} {% data reusables.saml.okta-configure-api-integration %} {% data reusables.saml.okta-enable-api-integration %} -1. Click **Authenticate with GitHub Enterprise Cloud - Enterprise Accounts**. +1. Click **Authenticate with Github Enterprise Cloud - Enterprise Accounts**. ![Button to authenticate with {% data variables.product.prodname_dotcom %}](/assets/images/help/business-accounts/authenticate-with-github-button.png) 1. To the right of your enterprise account's name, click **Grant**. 1. Click **Authorize okta-oauth**. From c2a05fe653ab0a067bd210cf8a3aa6212ba91be7 Mon Sep 17 00:00:00 2001 From: Matt Pollard Date: Mon, 8 Feb 2021 15:48:08 +0100 Subject: [PATCH 6/9] Use variables --- .../handling-new-purchases-and-free-trials.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md b/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md index a3022d20aa..94b29c63ff 100644 --- a/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md +++ b/content/developers/github-marketplace/handling-new-purchases-and-free-trials.md @@ -14,7 +14,7 @@ versions: {% warning %} -If you offer a GitHub App in {% data variables.product.prodname_marketplace %}, your app must identify users following the OAuth authorization flow. You don't need to set up a separate OAuth App to support this flow. See "[Identifying and authorizing users for GitHub Apps](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)" for more information. +If you offer a {% data variables.product.prodname_github_app %} in {% data variables.product.prodname_marketplace %}, your app must identify users following the OAuth authorization flow. You don't need to set up a separate {% data variables.product.prodname_oauth_app %} to support this flow. See "[Identifying and authorizing users for {% data variables.product.prodname_github_apps %}](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)" for more information. {% endwarning %} @@ -24,7 +24,7 @@ Before a customer purchases your {% data variables.product.prodname_marketplace The customer completes the purchase by clicking **Complete order and begin installation**. -GitHub then sends the [`marketplace_purchase`](/webhooks/event-payloads/#marketplace_purchase) webhook with the `purchased` action to your app. +{% data variables.product.product_name %} then sends the [`marketplace_purchase`](/webhooks/event-payloads/#marketplace_purchase) webhook with the `purchased` action to your app. Read the `effective_date` and `marketplace_purchase` object from the `marketplace_purchase` webhook to determine which plan the customer purchased, when the billing cycle starts, and when the next billing cycle begins. @@ -34,27 +34,27 @@ See "[{% data variables.product.prodname_marketplace %} webhook events](/marketp ### Step 2. Installation -If your app is a GitHub App, GitHub prompts the customer to select which repositories the app can access when they purchase it. GitHub then installs the app on the account the customer selected and grants access to the selected repositories. +If your app is a {% data variables.product.prodname_github_app %}, {% data variables.product.product_name %} prompts the customer to select which repositories the app can access when they purchase it. {% data variables.product.product_name %} then installs the app on the account the customer selected and grants access to the selected repositories. -At this point, if you specified a **Setup URL** in your GitHub App settings, GitHub will redirect the customer to that URL. If you do not specify a setup URL, you will not be able to handle purchases of your GitHub App. +At this point, if you specified a **Setup URL** in your {% data variables.product.prodname_github_app %} settings, {% data variables.product.product_name %} will redirect the customer to that URL. If you do not specify a setup URL, you will not be able to handle purchases of your {% data variables.product.prodname_github_app %}. {% note %} -**Note:** The **Setup URL** is described as optional in GitHub App settings, but it is a required field if you want to offer your app in {% data variables.product.prodname_marketplace %}. +**Note:** The **Setup URL** is described as optional in {% data variables.product.prodname_github_app %} settings, but it is a required field if you want to offer your app in {% data variables.product.prodname_marketplace %}. {% endnote %} -If your app is an OAuth App, GitHub does not install it anywhere. Instead, GitHub redirects the customer to the **Installation URL** you specified in your [{% data variables.product.prodname_marketplace %} listing](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/#listing-urls). +If your app is an {% data variables.product.prodname_oauth_app %}, {% data variables.product.product_name %} does not install it anywhere. Instead, {% data variables.product.product_name %} redirects the customer to the **Installation URL** you specified in your [{% data variables.product.prodname_marketplace %} listing](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/#listing-urls). -When a customer purchases an OAuth App, GitHub redirects the customer to the URL you choose (either Setup URL or Installation URL) and the URL includes the customer's selected pricing plan as a query parameter: `marketplace_listing_plan_id`. +When a customer purchases an {% data variables.product.prodname_oauth_app %}, {% data variables.product.product_name %} redirects the customer to the URL you choose (either Setup URL or Installation URL) and the URL includes the customer's selected pricing plan as a query parameter: `marketplace_listing_plan_id`. ### Step 3. Authorization When a customer purchases your app, you must send the customer through the OAuth authorization flow: -* If your app is a GitHub App, begin the authorization flow as soon as GitHub redirects the customer to the **Setup URL**. Follow the steps in "[Identifying and authorizing users for GitHub Apps](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)." +* If your app is a {% data variables.product.prodname_github_app %}, begin the authorization flow as soon as {% data variables.product.product_name %} redirects the customer to the **Setup URL**. Follow the steps in "[Identifying and authorizing users for {% data variables.product.prodname_github_apps %}](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)." -* If your app is an OAuth App, begin the authorization flow as soon as GitHub redirects the customer to the **Installation URL**. Follow the steps in "[Authorizing OAuth Apps](/apps/building-oauth-apps/authorizing-oauth-apps/)." +* If your app is an {% data variables.product.prodname_oauth_app %}, begin the authorization flow as soon as {% data variables.product.product_name %} redirects the customer to the **Installation URL**. Follow the steps in "[Authorizing {% data variables.product.prodname_oauth_apps %}](/apps/building-oauth-apps/authorizing-oauth-apps/)." For either type of app, the first step is to redirect the customer to https://github.com/login/oauth/authorize. From 5c93cb4a1f909c003748845095f9e1035fdc54d9 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Mon, 8 Feb 2021 19:51:31 -0800 Subject: [PATCH 7/9] Updates to AWS ECS deploy guide (#3002) --- .../deploying-to-amazon-elastic-container-service.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/actions/guides/deploying-to-amazon-elastic-container-service.md b/content/actions/guides/deploying-to-amazon-elastic-container-service.md index 2e981496c6..628d47a4db 100644 --- a/content/actions/guides/deploying-to-amazon-elastic-container-service.md +++ b/content/actions/guides/deploying-to-amazon-elastic-container-service.md @@ -107,7 +107,7 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: $AWS_REGION + aws-region: ${{ env.AWS_REGION }} - name: Login to Amazon ECR id: login-ecr @@ -124,22 +124,22 @@ jobs: # be deployed to ECS. docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG - echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_ENV + echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" - name: Fill in the new image ID in the Amazon ECS task definition id: task-def uses: aws-actions/amazon-ecs-render-task-definition@v1 with: - task-definition: $ECS_TASK_DEFINITION - container-name: $CONTAINER_NAME + task-definition: ${{ env.ECS_TASK_DEFINITION }} + container-name: ${{ env.CONTAINER_NAME }} image: ${{ steps.build-image.outputs.image }} - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: task-definition: ${{ steps.task-def.outputs.task-definition }} - service: $ECS_SERVICE - cluster: $ECS_CLUSTER + service: ${{ env.ECS_SERVICE }} + cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true ``` {% endraw %} From ca5549b43c92657f0dfe59337567179065ee9433 Mon Sep 17 00:00:00 2001 From: Gideon Goldberg Date: Tue, 9 Feb 2021 04:29:26 +0000 Subject: [PATCH 8/9] use node action V2 (#3149) Co-authored-by: Lucas Costi --- content/actions/guides/publishing-nodejs-packages.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/actions/guides/publishing-nodejs-packages.md b/content/actions/guides/publishing-nodejs-packages.md index 711f52f3a8..d1a3800318 100644 --- a/content/actions/guides/publishing-nodejs-packages.md +++ b/content/actions/guides/publishing-nodejs-packages.md @@ -70,7 +70,7 @@ jobs: steps: - uses: actions/checkout@v2 # Setup .npmrc file to publish to npm - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 with: node-version: '12.x' registry-url: 'https://registry.npmjs.org' @@ -130,7 +130,7 @@ jobs: steps: - uses: actions/checkout@v2 # Setup .npmrc file to publish to GitHub Packages - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 with: node-version: '12.x' registry-url: 'https://npm.pkg.github.com' @@ -167,7 +167,7 @@ jobs: steps: - uses: actions/checkout@v2 # Setup .npmrc file to publish to npm - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 with: node-version: '12.x' registry-url: 'https://registry.npmjs.org' From e5d45c8e34dff5281a41282cdd4fe950b12cd771 Mon Sep 17 00:00:00 2001 From: Stefan Jaud <59165496+pjanck@users.noreply.github.com> Date: Tue, 9 Feb 2021 05:44:27 +0100 Subject: [PATCH 9/9] Correcting a typo in code (#3492) --- content/actions/reference/events-that-trigger-workflows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/reference/events-that-trigger-workflows.md b/content/actions/reference/events-that-trigger-workflows.md index c18b63ec60..16837d9146 100644 --- a/content/actions/reference/events-that-trigger-workflows.md +++ b/content/actions/reference/events-that-trigger-workflows.md @@ -343,7 +343,7 @@ jobs: - run: | echo "Comment on PR #${{ github.event.issue.number }}" - issue-commented: + issue_commented: # This job only runs for issue comments name: Issue comment if: ${{ !github.event.issue.pull_request }}