From e166e29e872d8f31a64ab9da7686c09021b47767 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 2 Sep 2014 16:57:10 +0100
Subject: [PATCH] Bump version and changelog

---
 CHANGES.rst         | 22 ++++++++++++++++++++++
 UPGRADE.rst         | 26 ++++++++++++++++++++++++++
 VERSION             |  2 +-
 synapse/__init__.py |  2 +-
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index caad193b68..292f7eee62 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,25 @@
+Changes in synapse 0.2.0 (2014-09-02)
+=====================================
+This update changes many configuration options, updates the
+database schema and mandates SSL for server-server connections.
+
+Homeserver:
+ * Require SSL for server-server connections.
+ * Add SSL listener for client-server connections.
+ * Add ability to use config files.
+ * Add support for kicking/banning and power levels.
+ * Allow setting of room names and topics on creation.
+ * Change presence to include last seen time of the user.
+ * Change url path prefix to /_matrix/...
+ * Bug fixes to presence.
+
+Webclient:
+ * Reskin the CSS for registration and login.
+ * Various improvements to rooms CSS.
+ * Support changes in client-server API.
+ * Bug fixes to VOIP UI.
+ * Various bug fixes to handling of changes to room member list.
+
 Changes in synapse 0.1.2 (2014-08-29)
 =====================================
 
diff --git a/UPGRADE.rst b/UPGRADE.rst
index 2e75d77bca..81624d5cdb 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -1,3 +1,29 @@
+Upgrading to v0.2.0
+===================
+
+To upgrade the database schema, run::
+
+    ./database-prepare-for-0.2.0.sh "<database>.db"
+
+
+The home server npw requires setting up of SSL config before it can run. To
+automatically generate some default config that can be edited use::
+
+    $ python synapse/app/homeserver.py \
+        --server-name machine.my.domain.name \
+        --bind-port 8448 \
+        --config-path homeserver.config \
+        --generate-config
+
+After editing the config, you can run the home server using::
+
+    $ python synapse/app/homeserver.py --config-path homeserver.config
+
+See the README.rst for more information.
+
+Also note that many config options have been renamed.
+
+
 Upgrading to v0.0.1
 ===================
 
diff --git a/VERSION b/VERSION
index d917d3e26a..0ea3a944b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.2
+0.2.0
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 04200060bf..b45cf47b56 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.1.2"
+__version__ = "0.2.0"