summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-13 13:40:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-13 13:40:41 -0400
commit8b07cc3ede1099f6b18d90c1c51ab12bffaffebf (patch)
tree21c7ac1ae09d4c10fed3a2cca50329ba940d9833 /doc
parent789f5ff282c4e46b1de0fa91a35fc49f67408bc8 (diff)
reorg
Diffstat (limited to 'doc')
-rw-r--r--doc/install.mdwn10
-rw-r--r--doc/install/cabal.mdwn5
-rw-r--r--doc/install/cabal/comment_1_f04df6bcd50d1d01eb34868bb00ac35c._comment (renamed from doc/install/comment_1_f04df6bcd50d1d01eb34868bb00ac35c._comment)0
3 files changed, 6 insertions, 9 deletions
diff --git a/doc/install.mdwn b/doc/install.mdwn
index 6c90d2c99..03f146450 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -19,14 +19,8 @@ Windows | [[sorry, Windows not supported yet|todo/windows_support]
## Using cabal
-As a haskell package, git-annex can be installed using cabal.
-Start by installing the [Haskell Platform](http://hackage.haskell.org/platform/),
-and then:
-
- cabal install git-annex --bindir=$HOME/bin
-
-That installs the latest release. Alternatively, you can [[download]]
-git-annex yourself and [[manually_build_with_cabal|install/cabal]].
+As a haskell package, git-annex can be installed from source pretty easily
+[[using cabal|cabal]].
## Installation from scratch
diff --git a/doc/install/cabal.mdwn b/doc/install/cabal.mdwn
index 942ee60cd..96e623d3b 100644
--- a/doc/install/cabal.mdwn
+++ b/doc/install/cabal.mdwn
@@ -1,4 +1,7 @@
-As a haskell package, git-annex can be installed using cabal. For example:
+As a haskell package, git-annex can be installed using cabal.
+
+Start by installing the [Haskell Platform](http://hackage.haskell.org/platform/),
+and then:
cabal update
PATH=$HOME/bin:$PATH
diff --git a/doc/install/comment_1_f04df6bcd50d1d01eb34868bb00ac35c._comment b/doc/install/cabal/comment_1_f04df6bcd50d1d01eb34868bb00ac35c._comment
index b280d3d3d..b280d3d3d 100644
--- a/doc/install/comment_1_f04df6bcd50d1d01eb34868bb00ac35c._comment
+++ b/doc/install/cabal/comment_1_f04df6bcd50d1d01eb34868bb00ac35c._comment