From 50bc32dc958c1e2bdc0a1f60c512fe7c37dcbe73 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Sat, 9 Jan 2016 23:23:01 -0800
Subject: [PATCH] integrations: Document server-side setup for twitter
 integration.

---
 templates/zerver/integrations.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/zerver/integrations.html b/templates/zerver/integrations.html
index 7bed83f7a3..195d02b13c 100644
--- a/templates/zerver/integrations.html
+++ b/templates/zerver/integrations.html
@@ -1701,6 +1701,12 @@ access_token_secret =</pre>
       specified stream, with the search term as the topic.</p>
 
       <img class="screenshot" src="/static/images/integrations/twitter/001.png" />
+
+      <p>Note that the twitter search bot integration <b>just sends
+      links to tweets</b>; the pretty inline previews of tweets are
+      generated by the Twitter card rendering integration configured
+      in <code>/etc/zulip/settings.py</code> on the Zulip server.</p>
+
     </div>
 
     <div id="travis" class="integration-instructions">