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 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**. 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 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 %} 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.