diff --git a/templates/zerver/help/enable-enter-to-send.md b/templates/zerver/help/enable-enter-to-send.md new file mode 100644 index 0000000000..6bac8090f0 --- /dev/null +++ b/templates/zerver/help/enable-enter-to-send.md @@ -0,0 +1,20 @@ +# Enable Enter to send + +By default, the `Enter` (or `Return`) key adds a new line to a message, +and `Ctrl+Enter` sends the message. + +This is convenient for typing multi-line messages, which are more common in +Zulip than in most other chat products. However, you can also configure +Zulip so that `Enter` sends the message. + +{!start-composing.md!} + +1. Click **Press Enter to send** at the bottom of the compose box. + +Note that `Shift+Enter` always adds a new line, regardless of whether +**Enter to send** is enabled. The full table is below. + +| Enter to send | `Enter` | `Ctrl+Enter` | `Shift+Enter` | +|---|---|---|---| +| Enabled | Sends message | Adds line | Adds line | +| Disabled | Adds line | Sends message | Adds line | diff --git a/templates/zerver/help/enable-or-disable-pressing-enter-to-send.md b/templates/zerver/help/enable-or-disable-pressing-enter-to-send.md deleted file mode 100644 index 8671b8b7ce..0000000000 --- a/templates/zerver/help/enable-or-disable-pressing-enter-to-send.md +++ /dev/null @@ -1,18 +0,0 @@ -# Enable or disable Press Enter to send - -Zulip supports configuring whether the **Enter** key on your keyboard -sends a message that you are composing. - -By default, the `Enter` (or `Return`) key simply adds a blank line to -the message when the **Press Enter to send** checkbox is -disabled. This is great if you want to write multi-line messages that -include blank lines, which is much more common in Zulip than in other -chat products. In this default configuration, you can send a message -from the keyboard with `Ctrl+Enter`. - -However, if you check the **Press Enter to send** checkbox in the -compose box, Zulip sends your message when you press `Enter` (or -`Return`) on your keyboard, and `Ctrl+Enter` will produce a newline. - -Whether or not the **Press Enter to send** option is enabled, pressing -`Shift` + `Enter` inserts a new line in your message. diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md index cfd9b7e30b..78b09a5892 100644 --- a/templates/zerver/help/include/sidebar_index.md +++ b/templates/zerver/help/include/sidebar_index.md @@ -30,7 +30,7 @@ * [Video calls](/help/start-a-call) * [Share and upload files](/help/share-and-upload-files) -* [Enable pressing Enter to send](/help/enable-or-disable-pressing-enter-to-send) +* [Enable Enter to send](/help/enable-enter-to-send) * [Verify a message was sent](/help/verify-that-your-message-has-been-successfully-sent) * [Status messages](/help/format-your-message-using-markdown#status-messages)