reword changelog

1 files changed, 6 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index fb24feabe..1f2a04d2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,20 +11,16 @@ git-annex (4.20130828) UNRELEASED; urgency=low
     from feeds.
   * Honor core.sharedrepository when receiving and adding files in direct
     mode.
+  * initremote: Syntax change when setting up encrypted special remote.
+    Now use: encryption=hybrid keyid=$KEYID
+    (Thanks, guilhem for the patch.)
   * enableremote: gpg keys can be removed from those a remote encrypts
     to by passing "keyid-=$KEYID". keyid+= is also provided, although
     "encryption=$KEYID" can also be used as always.
     (Thanks, guilhem for the patch.)
-  * initremote: A new encryption scheme can be selected with
-    "encryption=pubkey keyid=$KEYID"
-    This causes files placed on special remotes to be directly
-    encrypted to the specified key(s). It is not possible to add
-    other keys later and have them immedately be able to access those
-    encrypted files, like can be done with the default encryption scheme.
-    However, pubkey encryption may be considered more secure due to being
-    and more standard use of gpg that avoids symmetric encryption algorythms,
-    or just simpler if you're the only person you ever intend to use a
-    particular encrypted special remote.
+  * Added encryption=pubkey scheme, which encrypts to public keys directly
+    rather than the hybrid approach. See documentation for advantages
+    and disadvantages, but encryption=hybrid is the recommended scheme still.
     (Thanks, guilhem for the patch.)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Aug 2013 11:03:00 -0400