Merge commit 'dkg/master'

[monkeysphere.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 8f0e77a6e10369a8479b4ac3d5a082c87cf91268..d0320171309245b73801a65cb360f73fdf902a78 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 monkeysphere (0.15~pre-1) UNRELEASED; urgency=low
 
-  * porting work: clarifying makefiles, pruning dependencies, etc.
+  * porting work and packaging simplification: clarifying makefiles,
+    pruning dependencies, etc.
   * added tests to monkeysphere-server diagnostics
+  * moved monkeysphere(5) to section 7 of the manual
+  * now shipping TODO in /usr/share/doc/monkeysphere
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 04 Sep 2008 19:08:40 -0400