From d11dd83c94a2b11e6b3db3ee2d2c8f0c469d5340 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Fri, 22 Jul 2016 17:25:23 +0000
Subject: [PATCH] [docs] faq entry about server timeouts

---
 docs/faq.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index fc4e2b8200..18021e7c4d 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -43,3 +43,14 @@ framework, in the meantime, we've tagged a few pull requests as
 visualizations.
 
 https://github.com/airbnb/caravel/issues?q=label%3Aexample+is%3Aclosed
+
+
+Why are my queries timing out?
+------------------------------
+
+If you are seeing timeouts (504 Gateway Time-out) when running queries,
+it's because the web server is timing out web requests. If you want to
+increase the default (50), you can specify the timeout when starting the
+web server with the ``-t`` flag, which is expressed in seconds.
+
+``caravel runserver -t 300``