From 082c88a4b22ded83607b40b080a0e862a3e34ed5 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 24 Feb 2015 09:58:20 +0000
Subject: Update CHANGES and UPGRADE

---
 CHANGES.rst |  7 +++++++
 UPGRADE.rst | 14 ++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 0ccf4c004c..9e36f6232d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse vx.x.x (x-x-x)
+=================================
+
+* Add support for registration fallback. This is a page hosted on the server
+  which allows a user to register for an account, regardless of what client
+  they are using (e.g. mobile devices).
+
 Changes in synapse v0.7.1 (2015-02-19)
 ======================================
 
diff --git a/UPGRADE.rst b/UPGRADE.rst
index 6ea348acc3..4045baf4e0 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -1,3 +1,17 @@
+Upgrading to vx.xx
+==================
+
+Servers which use captchas will need to add their public key to::
+
+  static/client/register/register_config.js
+
+    window.matrixRegistrationConfig = {
+        recaptcha_public_key: "YOUR_PUBLIC_KEY"
+    };
+
+This is required in order to support registration fallback (typically used on
+mobile devices).
+
 Upgrading to v0.7.0
 ===================
 
-- 
cgit 1.4.1