Merge branch 'master' into watch

20 files changed, 44 insertions, 309 deletions

diff --git a/doc/news/version_3.20120106/comment_1_fb1a3135e2d9f39f2c372ccc2c50c85a._comment b/doc/news/version_3.20120106/comment_1_fb1a3135e2d9f39f2c372ccc2c50c85a._comment
deleted file mode 100644
index effd9c9a8..000000000
--- a/doc/news/version_3.20120106/comment_1_fb1a3135e2d9f39f2c372ccc2c50c85a._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://peter-simons.myopenid.com/"
- ip="77.186.134.113"
- subject="Not announced on Hackage?"
- date="2012-01-13T17:37:11Z"
- content="""
-We have the [latest version in NixOS](http://hydra.nixos.org/job/nixpkgs/trunk/gitAndTools.gitAnnex), but we cannot advertise that fact on Hackage because it seems the corresponding Cabal file hasn't been uploaded to <http://hackage.haskell.org/package/git-annex>. Is there any particular reason why Hackage doesn't know about this release?
-"""]]
diff --git a/doc/news/version_3.20120106/comment_2_ae292ca7294b6790233e545086c3ac2f._comment b/doc/news/version_3.20120106/comment_2_ae292ca7294b6790233e545086c3ac2f._comment
deleted file mode 100644
index 7e6920eb7..000000000
--- a/doc/news/version_3.20120106/comment_2_ae292ca7294b6790233e545086c3ac2f._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 2"
- date="2012-01-13T17:52:46Z"
- content="""
-Uploading to hackage is a PITA (manual password entry and I am often on a slow link besides) and is not integrated with my regular release process, so I often forget to do it. I will try to upload the next release there again.
-
-You might add a page under [[install]] for your git-annex packages.
-"""]]
diff --git a/doc/news/version_3.20120106/comment_3_29ccda9ac458fd5cc9ec5508c62df6ea._comment b/doc/news/version_3.20120106/comment_3_29ccda9ac458fd5cc9ec5508c62df6ea._comment
deleted file mode 100644
index 1bb0c32cb..000000000
--- a/doc/news/version_3.20120106/comment_3_29ccda9ac458fd5cc9ec5508c62df6ea._comment
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!comment format=mdwn
- username="http://peter-simons.myopenid.com/"
- ip="77.186.134.113"
- subject="comment 3"
- date="2012-01-13T18:48:28Z"
- content="""
-For what it's worth, the package `cabal-install` is pretty good for uploading packages to Hackages, among other things. It allows users to configure their username/password, and then making a release to Hackage is as simple as running:
-
-    cabal upload foo-version.tar.gz
-
-I use that to do releases of my stuff, too, and I'm quite happy. `cabal-install` has other features, too, of course.
-"""]]
diff --git a/doc/news/version_3.20120227/comment_1_f8fc894680f2a2e5b5e757a677414b42._comment b/doc/news/version_3.20120227/comment_1_f8fc894680f2a2e5b5e757a677414b42._comment
deleted file mode 100644
index aa3c5ce6d..000000000
--- a/doc/news/version_3.20120227/comment_1_f8fc894680f2a2e5b5e757a677414b42._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://peter-simons.myopenid.com/"
- ip="77.184.15.65"
- subject="Test-suite won't compile with GHC 7.4.x"
- date="2012-02-28T17:39:59Z"
- content="""
-The recent version requires GHC 7.4.x, but some dependencies for the test suite don't build with that compiler, i.e. the `testpack` library. Do you have any recommendation how to deal with that situation? I would like to update, but I would very much like to run the regression test suite, too.
-"""]]
diff --git a/doc/news/version_3.20120227/comment_2_ea5075cfecc50d5da2364931ef7a02d1._comment b/doc/news/version_3.20120227/comment_2_ea5075cfecc50d5da2364931ef7a02d1._comment
deleted file mode 100644
index d45e66026..000000000
--- a/doc/news/version_3.20120227/comment_2_ea5075cfecc50d5da2364931ef7a02d1._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 2"
- date="2012-02-29T04:27:47Z"
- content="""
-Here's the patch that was used to make testpack build with 7.4 on Debian:
-
-<http://anonscm.debian.org/gitweb/?p=pkg-haskell/haskell-testpack.git;a=blobdiff;f=src/Test/QuickCheck/Instances.hs;h=7e920a102a50de5812af32f9a308b80f61284caf;hp=ada6674c972a6cc518f84041172ed035e36aec98;hb=ef9f6c109bd3c20f40fa25e962c928a51e1277d8;hpb=1240a417b9e970ce71757abcb01437e5eac9ee0e>
-"""]]
diff --git a/doc/news/version_3.20120229/comment_1_18158b9be2313f49509d59295c7d3c90._comment b/doc/news/version_3.20120229/comment_1_18158b9be2313f49509d59295c7d3c90._comment
deleted file mode 100644
index c3d2cab59..000000000
--- a/doc/news/version_3.20120229/comment_1_18158b9be2313f49509d59295c7d3c90._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://peter-simons.myopenid.com/"
- ip="77.186.152.146"
- subject="How do you build the Crypto library with GHC 7.4.1?"
- date="2012-02-29T19:20:20Z"
- content="""
-`Crypto 4.2.4` doesn't seem to compile with GHC 7.4.1. How did you build that package?
-"""]]
diff --git a/doc/news/version_3.20120229/comment_2_03436ddda42decf8cb1b4d5316d88a75._comment b/doc/news/version_3.20120229/comment_2_03436ddda42decf8cb1b4d5316d88a75._comment
deleted file mode 100644
index b08712ee8..000000000
--- a/doc/news/version_3.20120229/comment_2_03436ddda42decf8cb1b4d5316d88a75._comment
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 2"
- date="2012-02-29T22:54:01Z"
- content="""
-Probably this patch will help with Crypto:
-
-<http://anonscm.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-crypto;a=filediff;h=20120213034652-b2814-0019a3f92e453e9be86166d6c1f1bc0dad6e4d12.gz;f=patches/class-constraints.diff>
-
-Or, there's the `ghc7.0` branch of git-annex in git, which can be used to build with the older, stable ghc.
-
-BTW, when asking, for help, a log of the build failure is always a good idea..
-"""]]
diff --git a/doc/news/version_3.20120229/comment_3_8f7f8d4758804f1b695925934219745a._comment b/doc/news/version_3.20120229/comment_3_8f7f8d4758804f1b695925934219745a._comment
deleted file mode 100644
index a31a182cc..000000000
--- a/doc/news/version_3.20120229/comment_3_8f7f8d4758804f1b695925934219745a._comment
+++ /dev/null
@@ -1,42 +0,0 @@
-[[!comment format=mdwn
- username="http://peter-simons.myopenid.com/"
- ip="77.186.165.208"
- subject="comment 3"
- date="2012-03-05T21:10:47Z"
- content="""
-Unfortunately, the patch you mentioned doesn't seem to address the problem. I'm getting the following compile error:
-
-    Data/Digest/SHA2.hs:111:4:
-        Could not deduce (Show a) arising from a use of `showHex'
-        from the context (Integral a)
-          bound by the instance declaration at Data/Digest/SHA2.hs:109:10-39
-        Possible fix:
-          add (Show a) to the context of the instance declaration
-        In the first argument of `(.)', namely `(showHex a)'
-        In the expression:
-          (showHex a)
-          . (' ' :)
-            . (showHex b)
-              . (' ' :)
-                . (showHex c)
-                  . (' ' :)
-                    . (showHex d)
-                      . (' ' :)
-                        . (showHex e)
-                          . (' ' :)
-                            . (showHex f) . (' ' :) . (showHex g) . (' ' :) . (showHex h)
-        In an equation for `showsPrec':
-            showsPrec _ (Hash8 a b c d e f g h)
-              = (showHex a)
-                . (' ' :)
-                  . (showHex b)
-                    . (' ' :)
-                      . (showHex c)
-                        . (' ' :)
-                          . (showHex d)
-                            . (' ' :)
-                              . (showHex e)
-                                . (' ' :)
-                                  . (showHex f) . (' ' :) . (showHex g) . (' ' :) . (showHex h)
-
-"""]]
diff --git a/doc/news/version_3.20120229/comment_4_cd90223f78571e5bdd3dfc07ab1369d7._comment b/doc/news/version_3.20120229/comment_4_cd90223f78571e5bdd3dfc07ab1369d7._comment
deleted file mode 100644
index a931c7874..000000000
--- a/doc/news/version_3.20120229/comment_4_cd90223f78571e5bdd3dfc07ab1369d7._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 4"
- date="2012-03-05T21:32:00Z"
- content="""
-Hmm, I was able to produce exactly the same build error, and then I downloaded the patch I linked to before, and did
-`patch -p1 < debian/patches/class-constraints.diff` and that fixed the build nicely.
-"""]]
diff --git a/doc/news/version_3.20120229/comment_5_7dbf131ff4611abbfc8fbf1ee0f66dbe._comment b/doc/news/version_3.20120229/comment_5_7dbf131ff4611abbfc8fbf1ee0f66dbe._comment
deleted file mode 100644
index afddb3fb0..000000000
--- a/doc/news/version_3.20120229/comment_5_7dbf131ff4611abbfc8fbf1ee0f66dbe._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://peter-simons.myopenid.com/"
- ip="77.186.165.208"
- subject="comment 5"
- date="2012-03-05T23:29:41Z"
- content="""
-I didn't realize that the patch adds a patch file to the source distribution (instead of, well, patching it). That additional level of indirection surprised me. Anyway, now I figured it out and `Crypto` compiles fine. Thanks!
-"""]]
diff --git a/doc/news/version_3.20120230.mdwn b/doc/news/version_3.20120230.mdwn
deleted file mode 100644
index 52ac369e0..000000000
--- a/doc/news/version_3.20120230.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-git-annex 3.20120230 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * "here" can be used to refer to the current repository,
-     which can read better than the old "." (which still works too).
-   * Directory special remotes now support chunking files written to them,
-     avoiding writing files larger than a specified size.
-   * Add progress bar display to the directory special remote.
-   * Add configurable hooks that are run when git-annex starts and stops
-     using a remote: remote.name.annex-start-command and
-     remote.name.annex-stop-command
-   * Fix a bug in symlink calculation code, that triggered in rare
-     cases where an annexed file is in a subdirectory that nearly
-     matched to the .git/annex/object/xx/yy subdirectories."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120230/comment_1_b975cbd3a01ba5c2fa0f24fe739d3433._comment b/doc/news/version_3.20120230/comment_1_b975cbd3a01ba5c2fa0f24fe739d3433._comment
deleted file mode 100644
index eb5c7d257..000000000
--- a/doc/news/version_3.20120230/comment_1_b975cbd3a01ba5c2fa0f24fe739d3433._comment
+++ /dev/null
@@ -1,128 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawk_LOahrm_Cdg7io-_H0CNKkaxsRRQgRFo"
- nickname="Peter"
- subject="Test suite failure"
- date="2012-03-06T11:20:35Z"
- content="""
-I managed to compile this version of git-annex with GHC 7.4.1 on NixOS, but unfortunately the test suite fails during the `addurl` test:
-
-    Testing 0:quickcheck:0:prop_idempotent_deencode_git                           
-    Testing 0:quickcheck:1:prop_idempotent_deencode                               
-    Testing 0:quickcheck:2:prop_idempotent_fileKey                                
-    Testing 0:quickcheck:3:prop_idempotent_key_read_show                          
-    Testing 0:quickcheck:4:prop_idempotent_shellEscape                            
-    Testing 0:quickcheck:5:prop_idempotent_shellEscape_multiword                  
-    Testing 0:quickcheck:6:prop_idempotent_configEscape                           
-    Testing 0:quickcheck:7:prop_parentDir_basics                                  
-    Testing 0:quickcheck:8:prop_relPathDirToFile_basics                           
-    Testing 0:quickcheck:9:prop_relPathDirToFile_regressionTest                   
-    Testing 0:quickcheck:10:prop_cost_sane                                        
-    Testing 0:quickcheck:11:prop_hmacWithCipher_sane                              
-    Testing 0:quickcheck:12:prop_TimeStamp_sane                                   
-    Testing 0:quickcheck:13:prop_addLog_sane                                      
-    Testing 1:blackbox:0:git-annex init                                           
-    Testing 1:blackbox:1:git-annex add:0                                          
-    Testing 1:blackbox:1:git-annex add:1                                          
-    Testing 1:blackbox:1:git-annex add:2                                          
-    Testing 1:blackbox:2:git-annex reinject/fromkey                               
-    Testing 1:blackbox:3:git-annex unannex:0:no content                           
-    Testing 1:blackbox:3:git-annex unannex:1:with content                         
-    Testing 1:blackbox:4:git-annex drop:0:no remotes                              
-    Testing 1:blackbox:4:git-annex drop:1:with remote                             
-    Testing 1:blackbox:4:git-annex drop:2:untrusted remote                        
-    Testing 1:blackbox:5:git-annex get                                            
-    Testing 1:blackbox:6:git-annex move                                           
-    Testing 1:blackbox:7:git-annex copy                                           
-    Testing 1:blackbox:8:git-annex unlock/lock                                    
-    Testing 1:blackbox:9:git-annex edit/commit:0                                  
-    Cases: 55  Tried: 28  Errors: 0  Failures: 0add foo (checksum...) ok
-    ok
-    (Recording state in git...)
-    Testing 1:blackbox:9:git-annex edit/commit:1                                  
-    Testing 1:blackbox:10:git-annex fix                                           
-    Testing 1:blackbox:11:git-annex trust/untrust/semitrust/dead                  
-    Testing 1:blackbox:12:git-annex fsck:0                                        
-    Cases: 55  Tried: 32  Errors: 0  Failures: 0  Only 1 of 2 trustworthy copies exist of foo
-      Back it up with git-annex copy.
-      Only 1 of 2 trustworthy copies exist of sha1foo
-      Back it up with git-annex copy.
-      Bad file size (11 B larger); moved to /tmp/nix-build-jzvhzrdysy619y4vgmafryy9ck8mz7z7-git-annex-3.20120230.drv-0/git-annex/.t/tmprepo/.git/annex/bad/SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
-      Bad file size (11 B larger); moved to /tmp/nix-build-jzvhzrdysy619y4vgmafryy9ck8mz7z7-git-annex-3.20120230.drv-0/git-annex/.t/tmprepo/.git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
-    Testing 1:blackbox:12:git-annex fsck:1                                        
-    Testing 1:blackbox:12:git-annex fsck:2                                        
-    Cases: 55  Tried: 34  Errors: 0  Failures: 0  Only these untrusted locations may have copies of foo
-            17575c68-d5cc-4e18-bc96-fdafe716d488 -- origin (test repo)
-            17aab099-fcde-413a-8ef1-6acc09d7d081 -- here (.t/tmprepo)
-      Back it up to trusted locations with git-annex copy.
-      Only these untrusted locations may have copies of sha1foo
-            17575c68-d5cc-4e18-bc96-fdafe716d488 -- origin (test repo)
-      Back it up to trusted locations with git-annex copy.
-    Testing 1:blackbox:12:git-annex fsck:3                                        
-    Cases: 55  Tried: 35  Errors: 0  Failures: 0  Only 1 of 2 trustworthy copies exist of foo
-      Back it up with git-annex copy.
-      The following untrusted locations may also have copies: 
-            17575c68-d5cc-4e18-bc96-fdafe716d488 -- origin (test repo)
-      Only 1 of 2 trustworthy copies exist of sha1foo
-      Back it up with git-annex copy.
-      The following untrusted locations may also have copies: 
-            17575c68-d5cc-4e18-bc96-fdafe716d488 -- origin (test repo)
-    Testing 1:blackbox:13:git-annex migrate:0                                     
-    Testing 1:blackbox:13:git-annex migrate:1                                     
-    Testing 1:blackbox:14:git-annex unused/dropunused                             
-    Testing 1:blackbox:15:git-annex addurl                                        
-    Cases: 55  Tried: 39  Errors: 0  Failures: 0git-annex: connect: timeout (Connection timed out)
-    ### Failure in: 1:blackbox:15:git-annex addurl
-    addurl failed
-    Testing 1:blackbox:16:git-annex describe                                      
-    Testing 1:blackbox:17:git-annex find                                          
-    Cases: 55  Tried: 41  Errors: 0  Failures: 1foo
-    foo
-    sha1foo
-    sha1foo
-    Testing 1:blackbox:18:git-annex merge                                         
-    Testing 1:blackbox:19:git-annex status                                        
-    Cases: 55  Tried: 43  Errors: 0  Failures: 1{\"command\":\"status\",\"supported backends\":[\"SHA256\",\"SHA1\",\"SHA512\",\"SHA224\",\"SHA384\",\"SHA256E\",\"SHA1E\",\"SHA512E\",\"SHA224E\",\"SHA384E\",\"WORM\",\"URL\"],\"supported remote types\":[\"git\",\"S3\",\"bup\",\"directory\",\"rsync\",\"web\",\"hook\"],\"trusted repositories\":[],\"semitrusted repositories\":[{\"uuid\":\"00000000-0000-0000-0000-000000000001\",\"description\":\"web\",\"here\":false},{\"uuid\":\"17575c68-d5cc-4e18-bc96-fdafe716d488\",\"description\":\"origin (test repo)\",\"here\":false},{\"uuid\":\"5b9fe416-d6ed-4df7-af67-14fc5f2ea631\",\"description\":\".t/tmprepo\",\"here\":true}],\"untrusted repositories\":[],\"dead repositories\":[],\"local annex keys\":0,\"local annex size\":\"0 bytes\",\"known annex keys\":2,\"known annex size\":\"45 bytes\",\"success\":true}
-    Testing 1:blackbox:20:git-annex version                                       
-    Cases: 55  Tried: 44  Errors: 0  Failures: 1git-annex version: 3.20120230
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3
-    upgrade supported from repository versions: 0 1 2
-    Testing 1:blackbox:21:git-annex sync                                          
-    Cases: 55  Tried: 45  Errors: 0  Failures: 1# On branch master
-    nothing to commit (working directory clean)
-    To /tmp/nix-build-jzvhzrdysy619y4vgmafryy9ck8mz7z7-git-annex-3.20120230.drv-0/git-annex/.t/repo
-       34fa270..7242932  git-annex -> git-annex
-     * [new branch]      master -> synced/master
-    Testing 1:blackbox:22:git-annex map                                           
-    Testing 1:blackbox:23:git-annex uninit                                        
-    Cases: 55  Tried: 47  Errors: 0  Failures: 1Switched to branch 'git-annex'
-    Switched to branch 'master'
-    Deleted branch git-annex (was e636789).
-    Testing 1:blackbox:24:git-annex upgrade                                       
-    Testing 1:blackbox:25:git-annex whereis                                       
-    Testing 1:blackbox:26:git-annex hook remote                                   
-    Testing 1:blackbox:27:git-annex directory remote                              
-    Testing 1:blackbox:28:git-annex rsync remote                                  
-    Cases: 55  Tried: 52  Errors: 0  Failures: 1sending incremental file list
-    af4/
-    af4/74c/
-    af4/74c/SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/
-    af4/74c/SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
-              20 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/5)
-
-    sent 300 bytes  received 43 bytes  686.00 bytes/sec
-    total size is 20  speedup is 0.06
-    SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
-              20 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-    sent 160 bytes  received 31 bytes  382.00 bytes/sec
-    total size is 20  speedup is 0.10
-    Testing 1:blackbox:29:git-annex bup remote                                    
-    Testing 1:blackbox:30:git-annex crypto                                        
-    Cases: 55  Tried: 55  Errors: 0  Failures: 1
-    test: failed
-    ** test suite failed!
-
-Apparently, there is a network timeout? I see from the comments in `test.hs` that the test suite tries to avoid depending on network traffic, but is it possible, maybe, that the test tries to resolve a DNS name?
-"""]]
diff --git a/doc/news/version_3.20120230/comment_2_899de1196cd1ba4a393e4ef574d7aa5e._comment b/doc/news/version_3.20120230/comment_2_899de1196cd1ba4a393e4ef574d7aa5e._comment
deleted file mode 100644
index a4cc3073d..000000000
--- a/doc/news/version_3.20120230/comment_2_899de1196cd1ba4a393e4ef574d7aa5e._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 2"
- date="2012-03-06T17:22:54Z"
- content="""
-My mistake, addurl --fast used to avoid the network, so the test suite ran it, but then it was changed to always look up the file size. Removed from test suite.
-"""]]
diff --git a/doc/news/version_3.20120309.mdwn b/doc/news/version_3.20120309.mdwn
deleted file mode 100644
index 869b96cce..000000000
--- a/doc/news/version_3.20120309.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-git-annex 3.20120309 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Fix key directory hash calculation code to behave as it did before
-     version 3.20120227 when a key contains non-ascii characters (only
-     WORM backend is likely to have been affected)."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120315.mdwn b/doc/news/version_3.20120315.mdwn
deleted file mode 100644
index a3ccb4cf4..000000000
--- a/doc/news/version_3.20120315.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-git-annex 3.20120315 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * fsck: Fix up any broken links and misplaced content caused by the
-     directory hash calculation bug fixed in the last release.
-   * sync: Sync to lower cost remotes first.
-   * status: Fixed to run in constant space.
-   * status: More accurate display of sizes of tmp and bad keys.
-   * unused: Now uses a bloom filter, and runs in constant space.
-     Use of a bloom filter does mean it will not notice a small
-     number of unused keys. For repos with up to half a million keys,
-     it will miss one key in 1000.
-   * Added annex.bloomcapacity and annex.bloomaccuracy, which can be
-     adjusted as desired to tune the bloom filter.
-   * status: Display amount of memory used by bloom filter, and
-     detect when it's too small for the number of keys in a repository.
-   * git-annex-shell: Runs hooks/annex-content after content is received
-     or dropped.
-   * Work around a bug in rsync (IMHO) introduced by openSUSE's SIP patch.
-   * git-annex now behaves as git-annex-shell if symlinked to and run by that
-     name. The Makefile sets this up, saving some 8 mb of installed size.
-   * git-union-merge is a demo program, so it is no longer built by default."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120405.mdwn b/doc/news/version_3.20120405.mdwn
deleted file mode 100644
index c5a7ecc22..000000000
--- a/doc/news/version_3.20120405.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-git-annex 3.20120405 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Rewrote free disk space checking code, moving the portability
-     handling into a small C library.
-   * status: Display amount of free disk space."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120418.mdwn b/doc/news/version_3.20120418.mdwn
new file mode 100644
index 000000000..93968a83e
--- /dev/null
+++ b/doc/news/version_3.20120418.mdwn
@@ -0,0 +1,12 @@
+git-annex 3.20120418 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * bugfix: Adding a dotfile also caused all non-dotfiles to be added.
+   * bup: Properly handle key names with spaces or other things that are
+     not legal git refs.
+   * git-annex (but not git-annex-shell) supports the git help.autocorrect
+     configuration setting, doing fuzzy matching using the restricted
+     Damerau-Levenshtein edit distance, just as git does. This adds a build
+     dependency on the haskell edit-distance library.
+   * Renamed diskfree.c to avoid OSX case insensativity bug.
+   * cabal now installs git-annex-shell as a symlink to git-annex.
+   * cabal file now autodetects whether S3 support is available."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120430.mdwn b/doc/news/version_3.20120430.mdwn
new file mode 100644
index 000000000..07e1e85ad
--- /dev/null
+++ b/doc/news/version_3.20120430.mdwn
@@ -0,0 +1,12 @@
+git-annex 3.20120430 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix use of annex.diskreserve config setting.
+   * Directory special remotes now check annex.diskreserve.
+   * Support git's core.sharedRepository configuration.
+   * Add annex.http-headers and annex.http-headers-command config
+     settings, to allow custom headers to be sent with all HTTP requests.
+     (Requested by the Internet Archive)
+   * uninit: Clear annex.uuid from .git/config. Closes: #[670639](http://bugs.debian.org/670639)
+   * Added shared cipher mode to encryptable special remotes. This option
+     avoids gpg key distribution, at the expense of flexability, and with
+     the requirement that all clones of the git repository be equally trusted."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120511.mdwn b/doc/news/version_3.20120511.mdwn
new file mode 100644
index 000000000..19e835522
--- /dev/null
+++ b/doc/news/version_3.20120511.mdwn
@@ -0,0 +1,13 @@
+git-annex 3.20120511 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Rsync special remotes can be configured with shellescape=no
+     to avoid shell quoting that is normally done when using rsync over ssh.
+     This is known to be needed for certian rsync hosting providers
+     (specificially hidrive.strato.com) that use rsync over ssh but do not
+     pass it through the shell.
+   * dropunused: Allow specifying ranges to drop.
+   * addunused: New command, the opposite of dropunused, it relinks unused
+     content into the git repository.
+   * Fix use of several config settings: annex.ssh-options,
+     annex.rsync-options, annex.bup-split-options. (And adjust types to avoid
+     the bugs that broke several config settings.)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120522.mdwn b/doc/news/version_3.20120522.mdwn
new file mode 100644
index 000000000..55c45900c
--- /dev/null
+++ b/doc/news/version_3.20120522.mdwn
@@ -0,0 +1,7 @@
+git-annex 3.20120522 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Pass -a to cp even when it supports --reflink=auto, to preserve
+     permissions.
+   * Clean up handling of git directory and git worktree.
+   * Add support for core.worktree, and fix support for GIT\_WORK\_TREE and
+     GIT\_DIR."""]]
\ No newline at end of file