From eb472411ceb2a4f63ba89ab1bc7448237c9926c0 Mon Sep 17 00:00:00 2001
From: Cynthia Lin <cynthialin1004@gmail.com>
Date: Fri, 12 May 2017 20:22:28 -0700
Subject: [PATCH] user docs: Document status messages in Message formatting
 docs.

Removes *Send a status message*. Fixes #4522.
---
 .../help/format-your-message-using-markdown.md | 11 +++++++++++
 templates/zerver/help/index.md                 |  2 +-
 templates/zerver/help/send-a-status-message.md | 18 ------------------
 templates/zerver/markdown_help.html            |  5 +++++
 4 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 templates/zerver/help/send-a-status-message.md

diff --git a/templates/zerver/help/format-your-message-using-markdown.md b/templates/zerver/help/format-your-message-using-markdown.md
index 53ea00b298..39b79b1f02 100644
--- a/templates/zerver/help/format-your-message-using-markdown.md
+++ b/templates/zerver/help/format-your-message-using-markdown.md
@@ -106,6 +106,17 @@ confirmation message will appear.
 
 For more information on mentions, visit [here](/help/at-mention-a-team-member).
 
+## Status Messages
+
+You can send messages that display your name and profile before a string by
+beginning a message with `/me`. You can utilize this feature to send status
+messages or other messages written in a similar third-person voice.
+
+For example, if your username is **Cordelia Lear** and you send the message
+`/me is now away`, your message will be displayed as:
+
+![Status message](/static/images/help/status-message.png).
+
 ## Code
 
 You can surround a portion of code with `` `back-ticks` `` to display it as
diff --git a/templates/zerver/help/index.md b/templates/zerver/help/index.md
index e342a868ae..84dcf4b615 100644
--- a/templates/zerver/help/index.md
+++ b/templates/zerver/help/index.md
@@ -47,7 +47,7 @@ as an **organization**.
 * [Enable or disable Press Enter to send](/help/enable-or-disable-pressing-enter-to-send)
 * [Verify that your message has been successfully sent](/help/verify-that-your-message-has-been-successfully-sent)
 <!-- What to do if the server returns an error -->
-* [Send a status message](/help/send-a-status-message)
+* [Send a status message](/help/format-your-message-using-markdown#status-messages)
 * [@-mention a team member](/help/at-mention-a-team-member)
 * [Make an announcement](/help/make-an-announcement)
 * [Send a message in a different language](/help/send-a-message-in-a-different-language)
diff --git a/templates/zerver/help/send-a-status-message.md b/templates/zerver/help/send-a-status-message.md
deleted file mode 100644
index f006581653..0000000000
--- a/templates/zerver/help/send-a-status-message.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Send a status message
-
-Sometimes you want to talk about yourself in third person.  Zulip
-provides a nice way to do this by sending a message starting with
-`/me`, e.g.:
-
-```
-/me is going skiing this weekend ⛷
-```
-
-Zulip will display your message with the `/me` token replaced by your
-name, like this:
-
-![Status message](/static/images/help/status-message.png)
-
-!!! tip ""
-    Status messages are frequently written in third person, in order to make
-    them look grammatically coherent.
diff --git a/templates/zerver/markdown_help.html b/templates/zerver/markdown_help.html
index 0a0dc28f8e..405ffe79d6 100644
--- a/templates/zerver/markdown_help.html
+++ b/templates/zerver/markdown_help.html
@@ -64,6 +64,11 @@
                         <td>#**streamName**</td>
                         <td><a>#streamName</a> (links to a stream)</td>
                     </tr>
+                    <tr>
+                        <td>/me is busy working<br/>
+                          (send a status message as user Iago)</td>
+                        <td><span class="sender_name-in-status">Iago</span> is busy working</td>
+                    </tr>
                     <tr>
                         <td>Some inline `code`</td>
                         <td>Some inline <code>code</code></td>