From 28cbeaf6bea696879f8a4e5bcc5ed173181e088c Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Mon, 18 Jan 2016 14:10:14 -0800
Subject: [PATCH] add reply formatting info to new user tips

---
 config/locales/server.en.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 109c146805a..add5f8fb881 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1584,7 +1584,15 @@ en:
 
         - To reply with **a new topic**, use <img src="%{base_url}/images/welcome/reply-as-linked-topic-2x.png" width="20" height="25"> to the right of the post. Both old and new topics will be automatically linked together.
 
-        To insert a quote, select the text you wish to quote, then press any Reply button. Repeat for multiple quotes!
+        Your reply can be formatted using simple HTML, BBCode, or [Markdown](http://commonmark.org/help/):
+
+            This is **bold**.
+            This is <b>bold</b>.
+            This is [b]bold[/b].
+
+        Want to learn Markdown? [Take our fun 10 minute interactive tutorial!](http://commonmark.org/help/tutorial/)
+
+        To insert a quote, select the text you wish to quote, then press any Reply button. Repeat for multiple quotes.
 
         <img src="%{base_url}/images/welcome/quote-reply-2x.png" width="326" height="128">