From 2454eff51df335922e3c1585f158d5e803e646e6 Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Wed, 13 Feb 2019 11:26:32 -0800 Subject: [PATCH] help: Rename and update at-mention-a-team-member. --- templates/zerver/app/home.html | 2 +- ...ion-a-team-member.md => at-mention-a-user.md} | 16 ++++++++++++---- .../help/format-your-message-using-markdown.md | 2 +- templates/zerver/help/include/sidebar_index.md | 2 +- templates/zerver/help/mute-a-stream.md | 2 +- templates/zerver/help/mute-a-topic.md | 2 +- templates/zerver/help/search-for-messages.md | 2 +- 7 files changed, 18 insertions(+), 10 deletions(-) rename templates/zerver/help/{at-mention-a-team-member.md => at-mention-a-user.md} (78%) diff --git a/templates/zerver/app/home.html b/templates/zerver/app/home.html index 43d0bfd609..7539e05368 100644 --- a/templates/zerver/app/home.html +++ b/templates/zerver/app/home.html @@ -136,7 +136,7 @@

{% trans %} - Learn more about mentions + Learn more about mentions here. {% endtrans %}

diff --git a/templates/zerver/help/at-mention-a-team-member.md b/templates/zerver/help/at-mention-a-user.md similarity index 78% rename from templates/zerver/help/at-mention-a-team-member.md rename to templates/zerver/help/at-mention-a-user.md index f98cd6f101..c06e0f75a3 100644 --- a/templates/zerver/help/at-mention-a-team-member.md +++ b/templates/zerver/help/at-mention-a-user.md @@ -5,10 +5,12 @@ message. @-mentions follow the same [notification settings](/help/pm-mention-alert-notifications) as private messages and alert words. -Note that an @-mention inside quoted text will not mention the user. So feel -free to quote and reply without worrying about spurious mentions. +!!! warn "" + **Note**: An @-mention inside quoted text will not mention the user. -## From the compose box +### From the compose box + +{start_tabs} {!start-composing.md!} @@ -16,7 +18,11 @@ free to quote and reply without worrying about spurious mentions. 3. Pick the appropriate user from the autocomplete. -## From the user list +{end_tabs} + +### From the user list + +{start_tabs} 1. Hover over a user in the right sidebar. @@ -24,6 +30,8 @@ free to quote and reply without worrying about spurious mentions. 1. Select **Reply mentioning user**. +{end_tabs} + Alternatively, click on the avatar of any user in the main message feed. ## Related articles diff --git a/templates/zerver/help/format-your-message-using-markdown.md b/templates/zerver/help/format-your-message-using-markdown.md index 7169d43b35..9617454384 100644 --- a/templates/zerver/help/format-your-message-using-markdown.md +++ b/templates/zerver/help/format-your-message-using-markdown.md @@ -150,7 +150,7 @@ You can also [add custom emoji](/help/add-custom-emoji). ## Mentions -Learn more about at-mentions [here](/help/at-mention-a-team-member). +Learn more about at-mentions [here](/help/at-mention-a-user). The numbers will be added automatically by the typeahead if needed for disambiguation ``` diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md index 06abb8d732..5b6a056e05 100644 --- a/templates/zerver/help/include/sidebar_index.md +++ b/templates/zerver/help/include/sidebar_index.md @@ -32,7 +32,7 @@ * [Share and upload files](/help/share-and-upload-files) * [Enable Enter to send](/help/enable-enter-to-send) * [Verify a message was sent](/help/verify-your-message-was-successfully-sent) -* [@-mention a user](/help/at-mention-a-team-member) +* [@-mention a user](/help/at-mention-a-user) * [Edit or delete a message](/help/edit-or-delete-a-message) * [Message a stream by email](/help/message-a-stream-by-email) * [Notify everyone on a stream](/help/notify-everyone-on-a-stream) diff --git a/templates/zerver/help/mute-a-stream.md b/templates/zerver/help/mute-a-stream.md index 1f5c7a91f6..751098375a 100644 --- a/templates/zerver/help/mute-a-stream.md +++ b/templates/zerver/help/mute-a-stream.md @@ -2,7 +2,7 @@ Messages from muted streams do not show up in **All messages** or generate notifications, unless you are -[@-mentioned](/help/at-mention-a-team-member). Messages from muted streams +[@-mentioned](/help/at-mention-a-user). Messages from muted streams do not generate [alert word](/help/add-an-alert-word) notifications. Muted streams still appear in the left sidebar, though they are grayed out. diff --git a/templates/zerver/help/mute-a-topic.md b/templates/zerver/help/mute-a-topic.md index dcad719ff8..5ae7f52d38 100644 --- a/templates/zerver/help/mute-a-topic.md +++ b/templates/zerver/help/mute-a-topic.md @@ -3,7 +3,7 @@ Messages from muted topics do not show up in **All messages** or generate notifications (including [alert word](/help/add-an-alert-word) notifications), unless you are -[@-mentioned](/help/at-mention-a-team-member). They also do not contribute to +[@-mentioned](/help/at-mention-a-user). They also do not contribute to stream unread counts. Muted topics still appear in the left sidebar, though they are grayed out. diff --git a/templates/zerver/help/search-for-messages.md b/templates/zerver/help/search-for-messages.md index 9e6ad56edb..2509ad9e10 100644 --- a/templates/zerver/help/search-for-messages.md +++ b/templates/zerver/help/search-for-messages.md @@ -35,7 +35,7 @@ Here is the **full list of search operators**. * `id:12345`: Show only message `12345`. * `is:alerted`: See [alert words](/help/add-an-alert-word). -* `is:mentioned`: See [@-mentions](/help/at-mention-a-team-member). +* `is:mentioned`: See [@-mentions](/help/at-mention-a-user). * `is:starred`: See [starred messages](/help/star-a-message). * `is:unread` * `has:link`