Changelogs should now be written immediately

...and together with the accompanying patch.

CHANGELOG.rst

@@ -9,6 +9,19 @@ Package maintainers and users who have to manually update their installation
 may want to subscribe to `GitHub's tag feed
 <https://github.com/untitaker/vdirsyncer/tags.atom>`_.
 
+Version 0.4.0
+=============
+
+*yet to be released*
+
+- Collection discovery has been rewritten. Old configuration files should be
+  compatible with it, but vdirsyncer now caches the results of the collection
+  discovery. You have to run ``vdirsyncer discover`` if collections were added
+  or removed on one side.
+- Pair and storage names are now restricted to certain characters. Vdirsyncer
+  will issue a clear error message if your configuration file is invalid in
+  that regard.
+
 Version 0.3.4
 =============
 

CONTRIBUTING.rst

@@ -28,9 +28,7 @@ Submitting patches, pull requests
 
 * But not because you wrote too few tests.
 
-* Add yourself to ``AUTHORS.rst``. Don't add anything to ``CHANGELOG.rst``, I
+* Add yourself to ``AUTHORS.rst``, and add a note to ``CHANGELOG.rst`` too.
-  do that myself shortly before the release. You can help by writing meaningful
-  commit messages.
 
 Running tests, how to set up your development environment
 =========================================================