From 606e64b4d5dc71df1471384f52d26eaa6ffb3c93 Mon Sep 17 00:00:00 2001
From: Jessica McKellar <jesstess@humbughq.com>
Date: Tue, 28 May 2013 15:53:23 -0400
Subject: [PATCH] features: document message editing and missed message
 e-mails.

(imported from commit 991a2489092820f2fd76438abfdc24d957791de5)
---
 templates/zephyr/features.html | 12 ++++++++++++
 zephyr/static/styles/fonts.css |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/templates/zephyr/features.html b/templates/zephyr/features.html
index 903d5a3e8e..67fc740073 100644
--- a/templates/zephyr/features.html
+++ b/templates/zephyr/features.html
@@ -65,6 +65,13 @@
         <p>Use <code>@all</code> or <code>@everyone</code> to get the
         attention of everyone in a stream.</p>
       </div>
+      <div>
+        <i class="icon-vector-envelope icon-vector-2x pull-left"></i>
+        <h4>Emails for important missed messages</h4>
+        <p>If you're missing important conversations when you're away from
+        Humbug, we'll send you an email summary so you're always in the
+        loop.</p>
+      </div>
       <div>
         <i class="icon-vector-info-sign icon-vector-2x pull-left"></i>
         <h4>Desktop notifications</h4>
@@ -101,6 +108,11 @@
         <p>Get bulleted lists, clickable links, and nicely-formatted
         e-mail pastes automatically.</p>
       </div>
+      <div>
+        <i class="icon-vector-eraser icon-vector-2x pull-left"></i>
+        <h4>Message editing</h4>
+        <p>Don't worry, you can always fix that typo.</p>
+      </div>
       <div>
         <i class="icon-vector-lock icon-vector-2x pull-left"></i>
         <h4>Invite-only streams</h4>
diff --git a/zephyr/static/styles/fonts.css b/zephyr/static/styles/fonts.css
index b5d4b15c56..3edf0109eb 100644
--- a/zephyr/static/styles/fonts.css
+++ b/zephyr/static/styles/fonts.css
@@ -445,3 +445,5 @@ ul.icons li [class*=" icon-vector-"] {
 .icon-vector-minus-sign:before           { content: "\f056"; }
 .icon-vector-plus-sign:before            { content: "\f055"; }
 .icon-vector-pencil:before               { content: "\f040"; }
+.icon-vector-eraser:before               { content: "\f12d"; }
+.icon-vector-envelope:before             { content: "\f003"; }