diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-04-16 16:35:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-04-16 16:35:47 -0400 |
| commit | 4d221a7a80d9b02b523536b146fe94ce6448cfa5 (patch) | |
| tree | 55d1ea84d01d090a7ea622d03392c0525869d0c9 | |
| parent | 42cbb41ada884b21d7bbd369003b71752260c44e (diff) | |
the no-s3 branch is not needed, and there is a new no-ifelse branch
| -rw-r--r-- | doc/download.mdwn | 4 | ||||
| -rw-r--r-- | doc/install.mdwn | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/download.mdwn b/doc/download.mdwn index 64eee64c8..f0f17e141 100644 --- a/doc/download.mdwn +++ b/doc/download.mdwn @@ -22,8 +22,8 @@ The git repository has some branches: had a major change to filename encoding. * `old-monad-control` is for systems that don't have a newer monad-control library. -* `no-s3` disables the S3 special remote, for systems that lack the - necessary haskell library. (merge it into master if you need it) +* `no-ifelse` avoids using the IFelse library + (merge it into master if you need it) * `no-bloom` avoids using bloom filters. (merge it into master if you need it) * `debian-stable` contains the latest backport of git-annex to Debian stable. diff --git a/doc/install.mdwn b/doc/install.mdwn index a02d9d2c7..2590060e6 100644 --- a/doc/install.mdwn +++ b/doc/install.mdwn @@ -35,7 +35,7 @@ To build and use git-annex, you will need: * [TestPack](http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack) * [QuickCheck 2](http://hackage.haskell.org/package/QuickCheck) * [HTTP](http://hackage.haskell.org/package/HTTP) - * [hS3](http://hackage.haskell.org/package/hS3) + * [hS3](http://hackage.haskell.org/package/hS3) (optional) * [json](http://hackage.haskell.org/package/json) * [IfElse](http://hackage.haskell.org/package/IfElse) * [bloomfilter](http://hackage.haskell.org/package/bloomfilter) |