summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-15 14:16:12 +0100
committerErik Johnston <erik@matrix.org>2015-06-15 14:16:12 +0100
commitcebde85b94692cfe062d74bb2c884dd097dc8bb4 (patch)
tree97599d7f663d6a727c470f240f2971ac9a9e42c9 /CHANGES.rst
parentMerge pull request #183 from intelfx/install-python-schema-deltas (diff)
parentMerge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 (diff)
downloadsynapse-cebde85b94692cfe062d74bb2c884dd097dc8bb4.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-r2
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 778d3c00ec..ac398728f8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,15 +3,15 @@ Changes in synapse v0.9.2 (2015-06-12)
 
 General:
 
-* Use ultrajson for json deserialisation, and for serialisation when a
-  canonical encoding is not required. Ultrajson is significantly faster
-  than simplejson in some circumstances.
+* Use ultrajson for json (de)serialisation when a canonical encoding is not
+  required. Ultrajson is significantly faster than simplejson in certain
+  circumstances.
 * Use connection pools for outgoing HTTP connections.
 * Process thumbnails on separate threads.
 
 Configuration:
 
-* Add option to disable HTTP response compression.
+* Add option, ``gzip_responses``, to disable HTTP response compression.
 
 Federation: