From 4225fdc066752eaee3ea696c102a787705d74789 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Jan 2022 15:23:35 +0100 Subject: [PATCH 01/10] Display the workflow oauth scope for GHES 3.0 and above, GHAE, and GHEC --- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 8471eadaa4..28164f8035 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -74,7 +74,7 @@ Name | Description **`admin:gpg_key`** | Fully manage GPG keys.  `write:gpg_key`| Create, list, and view details for GPG keys.  `read:gpg_key`| List and view details for GPG keys.{% ifversion fpt or ghec %} -**`codespace`** | Grants the ability to create and manage codespaces. Codespaces can expose a GITHUB_TOKEN which may have a different set of scopes. For more information, see "[Security in Codespaces](/codespaces/codespaces-reference/security-in-codespaces#authentication)." +**`codespace`** | Grants the ability to create and manage codespaces. Codespaces can expose a GITHUB_TOKEN which may have a different set of scopes. For more information, see "[Security in Codespaces](/codespaces/codespaces-reference/security-in-codespaces#authentication)."{% endif %}{% ifversion fpt or ghec or ghae or ghes > 3.0 %} **`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes. For more information, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token)."{% endif %} {% note %} From 334916c82944ced7d52fa5fe3d6b6d9102f7ca15 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Jan 2022 17:20:48 +0100 Subject: [PATCH 02/10] Oh I guess we don't care about GHES < 3 --- .../apps/building-oauth-apps/scopes-for-oauth-apps.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md index 28164f8035..d56371fa67 100644 --- a/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md +++ b/content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md @@ -74,8 +74,8 @@ Name | Description **`admin:gpg_key`** | Fully manage GPG keys.  `write:gpg_key`| Create, list, and view details for GPG keys.  `read:gpg_key`| List and view details for GPG keys.{% ifversion fpt or ghec %} -**`codespace`** | Grants the ability to create and manage codespaces. Codespaces can expose a GITHUB_TOKEN which may have a different set of scopes. For more information, see "[Security in Codespaces](/codespaces/codespaces-reference/security-in-codespaces#authentication)."{% endif %}{% ifversion fpt or ghec or ghae or ghes > 3.0 %} -**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes. For more information, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token)."{% endif %} +**`codespace`** | Grants the ability to create and manage codespaces. Codespaces can expose a GITHUB_TOKEN which may have a different set of scopes. For more information, see "[Security in Codespaces](/codespaces/codespaces-reference/security-in-codespaces#authentication)."{% endif %} +**`workflow`** | Grants the ability to add and update {% data variables.product.prodname_actions %} workflow files. Workflow files can be committed without this scope if the same file (with both the same path and contents) exists on another branch in the same repository. Workflow files can expose `GITHUB_TOKEN` which may have a different set of scopes. For more information, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token)." {% note %} From ab62d49e7d649492d091039bc3b0a5e1bbd8ab4d Mon Sep 17 00:00:00 2001 From: Anil Seervi <61609033+AnilSeervi@users.noreply.github.com> Date: Mon, 10 Jan 2022 14:59:41 +0000 Subject: [PATCH 03/10] Update keyboard shortcuts to new style guidelines --- .../using-github/github-command-palette.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/content/get-started/using-github/github-command-palette.md b/content/get-started/using-github/github-command-palette.md index 37b977176b..1f015ffbeb 100644 --- a/content/get-started/using-github/github-command-palette.md +++ b/content/get-started/using-github/github-command-palette.md @@ -29,8 +29,8 @@ The ability to run commands directly from your keyboard, without navigating thro ## Opening the {% data variables.product.prodname_command_palette %} Open the command palette using one of the following keyboard shortcuts: -- Windows and Linux: Ctrlk or Ctrlaltk -- Mac: ⌘k or ⌘optionk +- Windows and Linux: Ctrl+K or Ctrl+Alt+K +- Mac: Command+K or Command+Option+K When you open the command palette, it shows your location at the top left and uses it as the scope for suggestions (for example, the `mashed-avocado` organization). @@ -39,7 +39,7 @@ When you open the command palette, it shows your location at the top left and us {% note %} **Notes:** -- If you are editing Markdown text, open the command palette with Ctrlaltk (Windows and Linux) or ⌘optionk (Mac). +- If you are editing Markdown text, open the command palette with Ctrl+Alt+K (Windows and Linux) or Command+Option+K (Mac). - If you are working on a project (beta), a project-specific command palette is displayed instead. For more information, see "[Customizing your project (beta) views](/issues/trying-out-the-new-projects-experience/customizing-your-project-views)." {% endnote %} @@ -60,7 +60,7 @@ You can use the command palette to navigate to any page that you have access to 4. Finish entering the path, or use the arrow keys to highlight the path you want from the list of suggestions. -5. Use Enter to jump to your chosen location. Alternatively, use CtrlEnter (Windows and Linux) or ⌘Enter (Mac) to open the location in a new browser tab. +5. Use Enter to jump to your chosen location. Alternatively, use Ctrl+Enter (Windows and Linux) or Command+Enter (Mac) to open the location in a new browser tab. ## Searching with the {% data variables.product.prodname_command_palette %} @@ -87,7 +87,7 @@ You can use the command palette to search for anything on {% data variables.prod {% endtip %} -5. Use the arrow keys to highlight the search result you want and use Enter to jump to your chosen location. Alternatively, use CtrlEnter (Windows and Linux) or ⌘Enter (Mac) to open the location in a new browser tab. +5. Use the arrow keys to highlight the search result you want and use Enter to jump to your chosen location. Alternatively, use Ctrl+Enter (Windows and Linux) or Command+Enter (Mac) to open the location in a new browser tab. ## Running commands from the {% data variables.product.prodname_command_palette %} @@ -98,7 +98,7 @@ You can use the {% data variables.product.prodname_command_palette %} to run com For a full list of supported commands, see "[{% data variables.product.prodname_command_palette %} reference](#github-command-palette-reference)." -1. Use CtrlShiftk (Windows and Linux) or ⌘Shiftk (Mac) to open the command palette in command mode. If you already have the command palette open, press > to switch to command mode. {% data variables.product.prodname_dotcom %} suggests commands based on your location. +1. Use Ctrl+Shift+K (Windows and Linux) or Command+Shift+K (Mac) to open the command palette in command mode. If you already have the command palette open, press > to switch to command mode. {% data variables.product.prodname_dotcom %} suggests commands based on your location. ![Command palette command mode](/assets/images/help/command-palette/command-palette-command-mode.png) @@ -112,8 +112,8 @@ For a full list of supported commands, see "[{% data variables.product.prodname_ When the command palette is active, you can use one of the following keyboard shortcuts to close the command palette: -- Search and navigation mode: esc or Ctrlk (Windows and Linux) ⌘k (Mac) -- Command mode: esc or CtrlShiftk (Windows and Linux) ⌘Shiftk (Mac) +- Search and navigation mode: Esc or Ctrl+K (Windows and Linux) Command+K (Mac) +- Command mode: Esc or Ctrl+Shift+K (Windows and Linux) Command+Shift+K (Mac) ## {% data variables.product.prodname_command_palette %} reference @@ -128,9 +128,9 @@ These keystrokes are available when the command palette is in navigation and sea |@| Search for users, organizations, and repositories. For more information, see "[Searching with the {% data variables.product.prodname_command_palette %}](#searching-with-the-github-command-palette)."| |/| Search for files within a repository scope or repositories within an organization scope. For more information, see "[Searching with the {% data variables.product.prodname_command_palette %}](#searching-with-the-github-command-palette)." | |!| Search just for projects. For more information, see "[Searching with the {% data variables.product.prodname_command_palette %}](#searching-with-the-github-command-palette)."| -|Ctrlc or ⌘c| Copy the search or navigation URL for the highlighted result to the clipboard.| +|Ctrl+C or Command+C| Copy the search or navigation URL for the highlighted result to the clipboard.| |Enter| Jump to the highlighted result or run the highlighted command.| -|CtrlEnter or ⌘Enter| Open the highlighted search or navigation result in a new brower tab.| +|Ctrl+Enter or Command+Enter| Open the highlighted search or navigation result in a new brower tab.| |?| Display help within the command palette.| ### Global commands From 5b87d853581ca9c57cf3655679d7748fa32b3fa3 Mon Sep 17 00:00:00 2001 From: Anil Seervi <61609033+AnilSeervi@users.noreply.github.com> Date: Mon, 10 Jan 2022 20:49:03 +0530 Subject: [PATCH 04/10] Update keyboard shortcut to meet new style guidelines --- .../managing-commits/squashing-commits.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md b/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md index 25aa8bdc8b..d389962f6c 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md @@ -16,7 +16,7 @@ Squashing allows you to combine multiple commits in your branch's history into a {% data reusables.desktop.current-branch-menu %} 2. In the list of branches, select the branch that has the commits that you want to squash. {% data reusables.desktop.history-tab %} -4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using ⌘ or Shift. +4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using Command or Shift. ![squash drag and drop](/assets/images/help/desktop/squash-drag-and-drop.png) 5. Modify the commit message of your new commit. The commit messages of the selected commits you want to squash are pre-filled into the **Summary** and **Description** fields. 6. Click **Squash Commits**. From 2969d6640e2b83085e8ed969dd43d9c6b7b905dc Mon Sep 17 00:00:00 2001 From: Anil Seervi <61609033+AnilSeervi@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:13:52 +0530 Subject: [PATCH 05/10] Update keyboard shortcut to meet new style guidelines --- data/reusables/desktop/delete-branch-win.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/desktop/delete-branch-win.md b/data/reusables/desktop/delete-branch-win.md index 90b7d37719..4053cb7cce 100644 --- a/data/reusables/desktop/delete-branch-win.md +++ b/data/reusables/desktop/delete-branch-win.md @@ -1 +1 @@ -1. In your menu bar, click **Branch**, then click **Delete...**. You can also press CtrlShiftD. +1. In your menu bar, click **Branch**, then click **Delete...**. You can also press Ctrl+Shift+D. From 2e9cf4d9ca269e0bef98853c5ca2eb9811acdd02 Mon Sep 17 00:00:00 2001 From: Anil Seervi <61609033+AnilSeervi@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:17:24 +0530 Subject: [PATCH 06/10] Update keyboard shortcut to meet new style guidelines --- .../about-pull-requests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md index a488f3afd5..1408b3e897 100644 --- a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md +++ b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md @@ -46,7 +46,7 @@ After you're happy with the proposed changes, you can merge the pull request. If {% tip %} **Tips:** -- To toggle between collapsing and expanding all outdated review comments in a pull request, hold down optionAltAlt and click **Show outdated** or **Hide outdated**. For more shortcuts, see "[Keyboard shortcuts](/articles/keyboard-shortcuts)." +- To toggle between collapsing and expanding all outdated review comments in a pull request, hold down OptionAltAlt and click **Show outdated** or **Hide outdated**. For more shortcuts, see "[Keyboard shortcuts](/articles/keyboard-shortcuts)." - You can squash commits when merging a pull request to gain a more streamlined view of changes. For more information, see "[About pull request merges](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)." {% endtip %} From 5c8467752ef3d400c972c705a3e9862fd66a65e0 Mon Sep 17 00:00:00 2001 From: Anil Seervi <61609033+AnilSeervi@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:48:52 +0530 Subject: [PATCH 07/10] Update keyboard tags to meet new style guidelines --- .../managing-accessibility-settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-accessibility-settings.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-accessibility-settings.md index b79c2b3be4..7922e9318d 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-accessibility-settings.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-accessibility-settings.md @@ -11,7 +11,7 @@ versions: {% data variables.product.product_name %} includes a variety of keyboard shortcuts so that you can perform actions across the site without using your mouse to navigate. While shortcuts are useful to save time, they can sometimes make {% data variables.product.prodname_dotcom %} harder to use and less accessible. -All keyboard shortcuts are enabled by default on {% data variables.product.product_name %}, but you can choose to disable character key shortcuts in your accessibility settings. This setting does not affect keyboard shortcuts provided by your web browser or {% data variables.product.prodname_dotcom %} shortcuts that use a modifier key such as `control` or `command`. +All keyboard shortcuts are enabled by default on {% data variables.product.product_name %}, but you can choose to disable character key shortcuts in your accessibility settings. This setting does not affect keyboard shortcuts provided by your web browser or {% data variables.product.prodname_dotcom %} shortcuts that use a modifier key such as Control or Command. ## Managing character key shortcuts From 7ac605741ccb8dbefbf72b49ad876ed11edbcced Mon Sep 17 00:00:00 2001 From: Andre Kolodochka <59625655+andrekolodochka@users.noreply.github.com> Date: Tue, 11 Jan 2022 09:15:24 +1100 Subject: [PATCH 08/10] Change `can` to `must` for SCIM in EMUs SCIM user provisioning in EMUs is not an option --- ...onfiguring-scim-provisioning-for-enterprise-managed-users.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users.md b/content/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users.md index a310edc239..b88044ee86 100644 --- a/content/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users.md +++ b/content/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users.md @@ -14,7 +14,7 @@ topics: ## About provisioning for {% data variables.product.prodname_emus %} -You can configure provisioning for {% data variables.product.prodname_emus %} to create, manage, and deactivate user accounts for your enterprise members. When you configure provisioning for {% data variables.product.prodname_emus %}, users assigned to the {% data variables.product.prodname_emu_idp_application %} application in your identity provider are provisioned as new user accounts on {% data variables.product.prodname_dotcom %} via SCIM, and the users are added to your enterprise. +You must configure provisioning for {% data variables.product.prodname_emus %} to create, manage, and deactivate user accounts for your enterprise members. When you configure provisioning for {% data variables.product.prodname_emus %}, users assigned to the {% data variables.product.prodname_emu_idp_application %} application in your identity provider are provisioned as new user accounts on {% data variables.product.prodname_dotcom %} via SCIM, and the users are added to your enterprise. When you update information associated with a user's identity on your IdP, your IdP will update the user's account on GitHub.com. When you unassign the user from the {% data variables.product.prodname_emu_idp_application %} application or deactivate a user's account on your IdP, your IdP will communicate with {% data variables.product.prodname_dotcom %} to invalidate any SAML sessions and disable the member's account. The disabled account's information is maintained and their username is changed to a hash of their original username with the short code appended. If you reassign a user to the {% data variables.product.prodname_emu_idp_application %} application or reactivate their account on your IdP, the {% data variables.product.prodname_managed_user %} account on {% data variables.product.prodname_dotcom %} will be reactivated and username restored. From 4228486ea49494245249af9f168b688a0648ba7b Mon Sep 17 00:00:00 2001 From: Bas van Schaik <5082246+sj@users.noreply.github.com> Date: Tue, 11 Jan 2022 15:19:16 +0000 Subject: [PATCH 09/10] Clarify that Go is not an interpreted language --- .../troubleshooting-the-codeql-workflow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow.md b/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow.md index 322a5f346e..92f3ba7c48 100644 --- a/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow.md +++ b/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow.md @@ -182,7 +182,7 @@ Analysis time is typically proportional to the amount of code being analyzed. Yo For compiled languages like Java, C, C++, and C#, {% data variables.product.prodname_codeql %} analyzes all of the code which was built during the workflow run. To limit the amount of code being analyzed, build only the code which you wish to analyze by specifying your own build steps in a `run` block. You can combine specifying your own build steps with using the `paths` or `paths-ignore` filters on the `pull_request` and `push` events to ensure that your workflow only runs when specific code is changed. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestpaths)." -For interpreted languages like Go, JavaScript, Python, and TypeScript, that {% data variables.product.prodname_codeql %} analyzes without a specific build, you can specify additional configuration options to limit the amount of code to analyze. For more information, see "[Specifying directories to scan](/code-security/secure-coding/configuring-code-scanning#specifying-directories-to-scan)." +For languages like Go, JavaScript, Python, and TypeScript, that {% data variables.product.prodname_codeql %} analyzes without compiling the source code, you can specify additional configuration options to limit the amount of code to analyze. For more information, see "[Specifying directories to scan](/code-security/secure-coding/configuring-code-scanning#specifying-directories-to-scan)." If you split your analysis into multiple workflows as described above, we still recommend that you have at least one workflow which runs on a `schedule` which analyzes all of the code in your repository. Because {% data variables.product.prodname_codeql %} analyzes data flows between components, some complex security behaviors may only be detected on a complete build. From d2d0805f81c84145340a7a2e688551fb6e995833 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 11 Jan 2022 17:06:21 +0000 Subject: [PATCH 10/10] Add suggestion for nuspec files in troubleshooting (#12316) Co-authored-by: hubwriter --- .../working-with-the-nuget-registry.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.md b/content/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.md index 24357fc223..ac87e01173 100644 --- a/content/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.md +++ b/content/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry.md @@ -231,6 +231,8 @@ Using packages from {% data variables.product.prodname_dotcom %} in your project Your NuGet package may fail to push if the `RepositoryUrl` in *.csproj* is not set to the expected repository . +If you're using a nuspec file, ensure that it has a `repository` element with the required `type` and `url` attributes. + ## Further reading - "{% ifversion fpt or ghes > 3.0 or ghec or ghae %}[Deleting and restoring a package](/packages/learn-github-packages/deleting-and-restoring-a-package){% elsif ghes < 3.1 %}[Deleting a package](/packages/learn-github-packages/deleting-a-package){% endif %}"