prep release

2 files changed, 17 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 92265fe50..88c25f0fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-git-annex (5.20150931) UNRELEASED; urgency=medium
+git-annex (5.20151019) unstable; urgency=medium
 
-  * Fix a longstanding bug, where dropping a file from a remote
-    could race with other drops of the same file, and result in
-    all copies of its content being lost.
+  * Fix a longstanding, but unlikely to occur bug, where dropping
+    a file from a remote could race with other drops of the same file,
+    and result in all copies of its content being lost.
   * git-annex-shell: Added lockcontent command, to prevent dropping of
     a key's content. This is necessary due to the above bugfix.
-  * In some cases, the above bugfix changes what git-annex allows to be dropped:
+  * In some cases, the above bugfix changes what git-annex allows you to
+    drop:
     - When a file is present in several special remotes,
       but not in any accessible git repositories, dropping it from one of
       the special remotes will now fail. Instead, the file has to be
@@ -13,7 +14,7 @@ git-annex (5.20150931) UNRELEASED; urgency=medium
       then safely be dropped from the git repository.
     - If a git remote has too old a version of git-annex-shell installed,
       git-annex won't trust it to hold onto a copy of a file when dropping
-      that file from some other remote.
+      that file from the local git repository.
   * Changed drop ordering when using git annex sync --content or the
     assistant, to drop from remotes first and from the local repo last.
     This works better with the behavior changes to drop in many cases.
@@ -23,9 +24,15 @@ git-annex (5.20150931) UNRELEASED; urgency=medium
   * To get the old, faster, behavior of not verifying checksums, set
     annex.verify=false, or remote.<name>.annex-verify=false.
   * setkey, rekey: These commands also now verify that the provided file
-    matches the key, unless annex.verify=false.
+    matches the expected checksum of the key, unless annex.verify=false.
   * reinject: Already verified content; this can now be disabled by
     setting annex.verify=false.
+  * sync, merge, assistant: When git merge failed for a reason other
+    than a conflicted merge, such as a crippled filesystem not allowing
+    particular characters in filenames, git-annex would make a merge commit
+    that could omit such files or otherwise be bad. Fixed by aborting the
+    whole merge process when git merge fails for any reason other than a
+    merge conflict.
   * Allow building with S3 disabled again.
   * Ported disk free space checking code to work on Solaris.
   * Windows webapp: Fix support for entering password when setting
@@ -36,20 +43,14 @@ git-annex (5.20150931) UNRELEASED; urgency=medium
   * Avoid unncessary write to the location log when a file is unlocked
     and then added back with unchanged content.
   * S3: Fix support for using https.
-  * sync, merge, assistant: When git merge failed for a reason other
-    than a conflicted merge, such as a crippled filesystem not allowing
-    particular characters in filenames, git-annex would make a merge commit
-    that could omit such files or otherwise be bad. Fixed by aborting the
-    whole merge process when git merge fails for any reason other than a
-    merge conflict.
   * Avoid displaying network transport warning when a ssh remote
     does not yet have an annex.uuid set.
   * Debian: Add torrent library to build-depends as it's packaged now,
     and stop recommending bittornado | bittorrent.
-  * Debian: Remove dependency on transformers library, as it is now
+  * Debian: Remove build dependency on transformers library, as it is now
     included in ghc.
 
- -- Joey Hess <id@joeyh.name>  Thu, 01 Oct 2015 12:42:56 -0400
+ -- Joey Hess <id@joeyh.name>  Mon, 19 Oct 2015 13:59:01 -0400
 
 git-annex (5.20150930) unstable; urgency=medium
 
diff --git a/git-annex.cabal b/git-annex.cabal
index acf7e63e9..d5a522664 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 5.20150930
+Version: 5.20151019
 Cabal-Version: >= 1.8
 License: GPL-3
 Maintainer: Joey Hess <id@joeyh.name>