From 373c7c8f9565ca780a296296052e6b11259c99cb Mon Sep 17 00:00:00 2001 From: Naren Surampudi Date: Sat, 11 Feb 2017 22:47:53 +0530 Subject: [PATCH] help: Document MacOS specific version of various hotkeys. Fixes #3577. --- templates/zerver/help/keyboard-shortcuts.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/templates/zerver/help/keyboard-shortcuts.md b/templates/zerver/help/keyboard-shortcuts.md index 44037b68ca..599750ba60 100644 --- a/templates/zerver/help/keyboard-shortcuts.md +++ b/templates/zerver/help/keyboard-shortcuts.md @@ -9,6 +9,9 @@ Zulip keyboard shortcuts are divided into four categories: * [Narrowing](#narrowing) * [Menus](#menus) +!!! warn "" + Note: Keyboard shortcuts for Mac OS X have been enclosed in parenthesis. + ## Navigation * **Initiate a search** `/` - This shortcut moves the user's cursor to @@ -25,27 +28,27 @@ Zulip keyboard shortcuts are divided into four categories: to scroll up to the previous message in their view. * **Next message** `j` `Down arrow` - This shortcut allows the user to scroll down to the next message in their view. -* **Scroll up** `K` `PgUp` - This shortcut allows the user to scroll +* **Scroll up** `K` `PgUp` (`K`,`Fn`+`Up arrow`) - This shortcut allows the user to scroll up through the messages in their view. -* **Scroll down** `J` `PgDn` `Spacebar` - This shortcut allows the +* **Scroll down** `J` `PgDn` `Spacebar` (`J`,`Fn`+`Down arrow`,`Spacebar`) - This shortcut allows the user to scroll down through the messages in their view. -* **Last message** `End` - This shortcut allows the user to scroll to +* **Last message** `End` (`Fn`+`Right arrow`) - This shortcut allows the user to scroll to the most recent message in their view. ## Composing messages -* **Reply to message** `Enter` `r` - This shortcut allows the user to +* **Reply to message** `Enter` `r` (`Return` `r`) - This shortcut allows the user to begin replying to the selected message (outlined in blue). * **Reply to author** `R` - This shortcut allows the user to begin writing a private message to the author of the selected message (outlined in blue). -* **Reply to message mentioning the author** `Enter` `@` - This +* **Reply to message mentioning the author** `Enter` `@` (`Return` `@`) - This shortcut allows the user to begin replying to the selected message (outlined in blue), @-mentioning the author of the selected message. * **New stream message** `c` - This shortcut allows the user to begin composing a new stream message. * **New private message** `C` - This shortcut allows the user to begin composing a new private message. -* **Send message** `Tab key` then `Enter` - This shortcut allows the +* **Send message** `Tab key` then `Enter` (`Tab key` then `Return`) - This shortcut allows the user to send the message that they've written. * **Cancel compose** `Esc` - This shortcut allows the user to cancel and discard their unsent message. @@ -72,7 +75,7 @@ Zulip keyboard shortcuts are divided into four categories: * **Open message actions menu** `i` - This shortcut shows the available message actions of the selected message (outlined in blue). -* **Edit a message you sent** `i` then `Enter` - This shortcut allows +* **Edit a message you sent** `i` then `Enter` (`i` then `Return`) - This shortcut allows the user to edit the selected message (outlined in blue) if the user authored the selected message. If the selected message was written by another user, this shortcut will enable the user to view the