From 6496205461c58b21d8ee33733b234c31ef1b36f2 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Fri, 22 Jul 2016 10:54:03 -0400
Subject: Updated custom emoji help text (#3653)

---
 webapp/components/emoji/components/emoji_list.jsx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'webapp/components')

diff --git a/webapp/components/emoji/components/emoji_list.jsx b/webapp/components/emoji/components/emoji_list.jsx
index 257cc567f..273fc8a25 100644
--- a/webapp/components/emoji/components/emoji_list.jsx
+++ b/webapp/components/emoji/components/emoji_list.jsx
@@ -141,10 +141,18 @@ export default class EmojiList extends React.Component {
                     </div>
                 </div>
                 <span className='backstage-list__help'>
-                    <FormattedMessage
-                        id='emoji_list.help'
-                        defaultMessage='Custom emoji are available to everyone on your server and will appear in the emoji autocomplete menu. Other users may need to refresh the page before new emojis appear.'
-                    />
+                    <p>
+                        <FormattedMessage
+                            id='emoji_list.help'
+                            defaultMessage="Custom emoji are available to everyone on your server. Type ':' in a message box to bring up the emoji selection menu. Other users may need to refresh the page before new emojis appear."
+                        />
+                    </p>
+                    <p>
+                        <FormattedMessage
+                            id='emoji_list.help2'
+                            defaultMessage="Tip: If you add #, ##, or ### as the first character on a new line containing emoji, you can use larger sized emoji. To try it out, send a message such as: '# :smile:'."
+                        />
+                    </p>
                 </span>
                 <div className='backstage-list'>
                     <table className='emoji-list__table'>
-- 
cgit v1.2.3-1-g7c22