Merge branch 'master' into unusedfull

4 files changed, 4 insertions, 3 deletions

diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 714f23bef..3ba58f25a 100644
--- a/doc/git-annex.mdwn
+++ b/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 ...]
 
diff --git a/doc/install.mdwn b/doc/install.mdwn
index cd51b96d2..6f892e37a 100644
--- a/doc/install.mdwn
+++ b/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
 
diff --git a/doc/install/Fedora.mdwn b/doc/install/Fedora.mdwn
index 068d5c111..7e983597b 100644
--- a/doc/install/Fedora.mdwn
+++ b/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>
diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn
index 680c331ee..f65e0bb4f 100644
--- a/doc/install/OSX.mdwn
+++ b/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]]