Merge branch 'master' into unusedfull

doc/git-annex.mdwn

@@ -64,6 +64,7 @@ subdirectories).
 
   Adds files in the path to the annex. Files that are already checked into
   git, or that git has been configured to ignore will be silently skipped.
+  (Use --force to add ignored files.)
 
 * get [path ...]
 

doc/install.mdwn

@@ -8,7 +8,7 @@
 
 ## Using cabal
 
-As a haskell package, git-annex can be built using cabal. For example:
+As a haskell package, git-annex can be installed using cabal. For example:
 
 	cabal install git-annex --bindir=$HOME/bin
 

doc/install/Fedora.mdwn

@@ -3,5 +3,5 @@ Installation recipe for Fedora 14.
 <pre>
 sudo yum install ghc cabal-install
 sudo cabal update
-sudo cabal install git-annex
+cabal install git-annex --bindir=$HOME/bin
 </pre>

doc/install/OSX.mdwn

@@ -9,7 +9,7 @@ sudo ln -s /opt/local/include/pcre.h  /usr/include/pcre.h # This is hack that al
 export PATH=$PATH:/opt/local/libexec/gnubin
 
 sudo cabal update
-sudo cabal install git-annex
+cabal install git-annex --bindir=$HOME/bin
 </pre>
 
 Originally posted by Jon at <https://gist.github.com/671785> --[[Joey]], modified by [[kristianrumberg]]