From 4225fdc066752eaee3ea696c102a787705d74789 Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Fri, 7 Jan 2022 15:23:35 +0100 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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.