Merge branch 'master' of ssh://git-annex.branchable.com

doc/NixOS.mdwn

@@ -0,0 +1,5 @@
+Users of the [Nix package manager](http://nixos.org/) can install it by running:
+
+    nix-env -i git-annex
+
+The build status of the package within Nix can be seen on the [Hydra Build Farm](http://hydra.nixos.org/job/nixpkgs/trunk/gitAndTools.gitAnnex).

doc/install.mdwn

@@ -7,6 +7,7 @@
 * [[FreeBSD]]
 * [[openSUSE]]
 * [[ArchLinux]]
+* [[NixOS]]
 * Windows: [[sorry, not possible yet|todo/windows_support]]
 
 ## Using cabal

doc/news/version_3.20120106/comment_3_29ccda9ac458fd5cc9ec5508c62df6ea._comment

@@ -0,0 +1,12 @@
+[[!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.
+"""]]