From e88fa7db31e761ae469d132d99a50a8503e578cc Mon Sep 17 00:00:00 2001
From: Joe Nelson <cred+github@begriffs.com>
Date: Sat, 5 Dec 2015 19:59:30 -0800
Subject: [PATCH] Docs and changelog

---
 CHANGELOG.md           | 1 +
 docs/install/server.md | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d851ccb0..0aa4b5d6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 - Allow order by computed columns - @diogob
+- Set max rows in response with --max-rows - @begriffs
 
 ## [0.3.0.1] - 2015-11-27
 
diff --git a/docs/install/server.md b/docs/install/server.md
index a7822d895..4977c6f89 100644
--- a/docs/install/server.md
+++ b/docs/install/server.md
@@ -92,6 +92,10 @@ The possible flags are:
 <dd>Max connections to use in db pool. Defaults to to 10, but you
     should find an optimal value for your db by running the SQL
     command <code>show max_connections;</code></dd>
+
+<dt>-m, --max-rows</dt>
+<dd>Max number of rows to return in a read request. The default is
+    no limit.</dd>
 </dl>
 
 <div class="admonition note">