diff --git a/site/download.md b/site/download.md
index c656a8c85..9339bf001 100644
--- a/site/download.md
+++ b/site/download.md
@@ -6,6 +6,7 @@ Do you want to..
## A. download a binary/system package ?
-System packages are quickest to install,
-but they can be [out of date](https://repology.org/metapackage/hledger/badges) or incomplete.
+System packages are quickest to install
+(but they can be [out of date](https://repology.org/metapackage/hledger/badges) or incomplete).
|
|----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-| Windows: | [Latest developer builds](https://ci.appveyor.com/project/simonmichael/hledger/build/artifacts) ([appveyor builds are not up to date](https://github.com/simonmichael/hledger/issues/694), [no hledger-ui](https://github.com/jtdaugherty/vty/pull/1#issuecomment-297143444))
+| Windows: | [Latest available nightly builds](https://ci.appveyor.com/project/simonmichael/hledger/build/artifacts) ([appveyor builds are not up to date](https://github.com/simonmichael/hledger/issues/694), [no hledger-ui](https://github.com/jtdaugherty/vty/pull/1#issuecomment-297143444))
| Mac: | **`brew install hledger`** ([only hledger CLI is packaged](https://github.com/simonmichael/hledger/issues/321#issuecomment-179920520))
| Arch Linux: | **`pacman -S hledger`** ([haskell problems are common on Arch at present](https://github.com/simonmichael/hledger/issues/668))
| Debian, Ubuntu: | **`sudo apt install hledger hledger-ui hledger-web`**
@@ -46,90 +47,90 @@ but they can be [out of date](https://repology.org/metapackage/hledger/badges) o
Good choice! The [release notes](release-notes.html) show what you'll get.
Below are three ways to build hledger, in order of preference.
-But first, a slight warning: the first build of a haskell application can take
-significant time (minutes to 1 hour), memory (eg 1G+), and disk space
-(eg 1G in ~/.stack or ~/.cabal). On the upside, it can be left
-unattended, you can kill and restart it without losing progress, and
-subsequent builds will be quicker.
-
+Note, building all hledger tools for the first time could take as much
+as an hour, 1G of free memory, and 1G of disk space. You can kill and
+restart it without losing progress, and subsequent builds will be much
+faster.
+Also, here are some known build issues and workarounds:\
-Some known build issues and workarounds:\
-[freebsd 12 no cabal file found](https://github.com/simonmichael/hledger/issues/709)\
-[openbsd 6 exec permission denied](https://deftly.net/posts/2017-10-12-using-cabal-on-openbsd.html)\
-[openbsd how to get stack](https://github.com/commercialhaskell/stack/issues/2822#issuecomment-318892816)\
+[freebsd 12: no cabal file found](https://github.com/simonmichael/hledger/issues/709)\
+[openbsd 6: exec permission denied](https://deftly.net/posts/2017-10-12-using-cabal-on-openbsd.html)\
+[openbsd: how to get stack](https://github.com/commercialhaskell/stack/issues/2822#issuecomment-318892816)\
-### 1. hledger-install
+### hledger-install
-On supported POSIX systems - GNU/linux, mac, freeBSD (might work on other BSDs if you install cabal-install first), possibly unixlike environments on windows -
-our [hledger-install.sh](https://github.com/simonmichael/hledger/tree/master/hledger-install)
-is the build method most likely to just work:
+Our [hledger-install script](https://github.com/simonmichael/hledger/tree/master/hledger-install)
+is recommended as the easiest and most-likely-to-just-work build method,
+on GNU/linux, mac and freeBSD
+(and possibly other BSDs if you install cabal-install first, or on unixlike environments on windows):
-- it requires only that you have bash and curl (or wget) installed, and internet access.
-- it uses haskell build tools like stack, cabal and GHC, installing stack/GHC if needed (in ~/.stack).
-- it avoids common pitfalls, such as unreliable build plans and all-or-nothing builds
-- it installs the latest release of hledger and the full suite of addon tools
- (in ~/.local/bin or ~/.cabal/bin).
+- it requires only bash and curl/wget, and internet access
+- it automates the install process using stack or cabal, avoiding common pitfalls
+- it installs stack and GHC in ~/.stack, if needed
+- it installs the latest release of hledger and addon tools in ~/.local/bin or ~/.cabal/bin
Here's the quick, non-secure way to run it:
**`curl https://raw.githubusercontent.com/simonmichael/hledger/master/hledger-install/hledger-install.sh | bash`**
-And here's the safer, more responsible way:
+And here's the more responsible way:
**`curl -O https://raw.githubusercontent.com/simonmichael/hledger/master/hledger-install/hledger-install.sh`**\
**`less hledger-install.sh`** *# do security review*\
- **`bash hledger-install.sh`** *# or bash -x, to log commands*
+ **`bash hledger-install.sh`**
-If you see link errors, you might need to manually install some extra C libraries and try again.
-See "Install required C libraries" below.
+#### Link errors ?
-If you have any other trouble, you can help greatly by capturing a debug log
-and sending it to me via
+If you see link errors (like "/bin/ld.gold: error: cannot find -ltinfo"),
+you might need to install some extra system packages, such as the below, and try again
+(please send any updates for this list):
+
+ |
+ |-----------------|-------------------------------------------------------
+ | Centos: | **`sudo yum install -y libstdc++-devel ncurses-devel zlib-devel`** *# [?](https://github.com/simonmichael/hledger/issues/715)*
+ | Debian, Ubuntu: | **`sudo apt install -y libncurses5`** *# ?*
+ | Fedora, RHEL: | **`sudo dnf install -y ncurses-devel`** *# ?*
+
+#### Set up $PATH
+
+You should
+[extend your \$PATH with `~/.local/bin`](https://docs.haskellstack.org/en/stable/install_and_upgrade/#path) (for stack)
+and/or `~/.cabal/bin` (for cabal).
+Eg, if you use bash:\
+**`echo "export PATH=~/.local/bin:~/.cabal/bin:$PATH" >> ~/.bashrc && source ~/.bashrc`**
+
+#### Need help ?
+
+If you have any other trouble, please capture a debug log and send it to me via
[paste](http://paste.hledger.org) & [IRC](http://irc.hledger.org),
-an [issue](http://bugs.hledger.org),
+the [issue tracker](http://bugs.hledger.org),
or [email](docs.html#helpfeedback):
**`bash -x hledger-install.sh 2>&1 | tee hledger-install.log`**
-### 2. stack
+### stack
-[`stack`](http://haskell-lang.org/get-started) is the newer and easier of the two Haskell build tools.
-Here's how to use it directly to install hledger:
+[`stack`](http://haskell-lang.org/get-started) is the newer and easier of the Haskell build tools.
+If you prefer more control or if hledger-install failed, here's how to use stack yourself:
1. **Install or upgrade to the latest stack**\
- The latest version of stack (1.6.3+) is recommended, as it is the best at avoiding ecosystem breakages and most likely to just work.
+ The latest version of stack (1.6.3+) is recommended, for best avoidance of ecosystem breakages.
If you can get at least stack 1.3 installed, eg from your system packages, you can usually run `stack upgrade` to quickly upgrade it to the latest.
- On Windows, the 64-bit version of stack is [recommended](https://github.com/simonmichael/hledger/issues/275#issuecomment-123834252).
-
- Follow stack's advice to
- [add `~/.local/bin` to your \$PATH](https://docs.haskellstack.org/en/stable/install_and_upgrade/#path) (`%APPDATA%\local\bin` on Windows).
- Eg, if you're a bash user:\
- `echo "export PATH=$PATH:~/.local/bin" >> ~/.bashrc && source ~/.bashrc`
-2. **Install required C libraries**\
- You might need to manually install some extra C libraries, such as the below
- (please send updates for this list).
- If you're not sure about this, proceed with the next step and return here if you get link errors
- (eg: "/bin/ld.gold: error: cannot find -ltinfo").
-
- |
- |-----------------|-------------------------------------------------------
- | Centos: | `sudo yum install -y libstdc++-devel ncurses-devel zlib-devel` *[?](https://github.com/simonmichael/hledger/issues/715)*
- | Debian, Ubuntu: | `sudo apt install -y libncurses5` *?*
- | Fedora, RHEL: | `sudo dnf install -y ncurses-devel` *?*
-
-
-3. **`stack install --resolver=nightly hledger-lib-1.5 hledger-1.5 [hledger-ui-1.5] [hledger-web-1.5] [hledger-api-1.5]`**\
- This installs the specified hledger packages (and required haskell libraries and tools) from [Stackage](https://www.stackage.org) (and if needed, [Hackage](http://hackage.haskell.org)).
- Specifying stackage's nightly resolver (snapshot) requires the most rebuilding, but is the most reliable;
- you can try reducing build time by specifying another resolver that you've installed from previously, or no --resolver option.\
- Add `--dry-run` to see the build plan. You can kill and restart this without losing progress.
+ On Windows, the 64-bit version of stack is [preferred](https://github.com/simonmichael/hledger/issues/275#issuecomment-123834252).
+2. **`stack install --resolver=nightly hledger-lib-1.5 hledger-1.5 [hledger-ui-1.5] [hledger-web-1.5] [hledger-api-1.5]`**\
+ This installs the specified hledger packages (and dependencies) from [Stackage](https://www.stackage.org) and/or [Hackage](http://hackage.haskell.org).
The bracketed packages are optional; if you include them, don't type the brackets, and do always
- include the preceding hledger-lib and hledger packages in the command, otherwise stack may complain.
- ([hledger-ui is not yet available on Windows, alas](https://github.com/jtdaugherty/vty/pull/1#issuecomment-297143444).)
+ include the preceding hledger-lib and hledger packages.\
+ ([windows: hledger-ui is not yet available](https://github.com/jtdaugherty/vty/pull/1#issuecomment-297143444))
+ The command above uses stackage's nightly snapshot.
+ You might be able to reduce build time by specifying an older snapshot that you've used before (eg: `--resolver=lts-10.8`), or by omitting the --resolver option.
+ To estimate the build time, add `--dry-run`.
+ You can kill and restart this without losing progress.
+
+ 3. **Install system packages if needed**
+
+ [If you see link errors, install the required system packages](#link-errors).
+
+ 4. **Set up \$PATH**
+
+ [As above](#set-up-path).
+
Now you should be able to run `hledger --version`
(and `hledger-ui --version`, `hledger-web --version` etc. if installed)
and see the latest version number.
@@ -146,11 +155,12 @@ such as
[hledger-iadd](http://hackage.haskell.org/package/hledger-iadd),
[hledger-interest](http://hackage.haskell.org/package/hledger-interest),
and [hledger-irr](http://hackage.haskell.org/package/hledger-irr)
-can be installed similarly to the above. Eg:\
- `stack install --resolver nightly hledger-lib-1.5 hledger-1.5 hledger-iadd-1.3.1`
+can be installed similarly to the above. Eg:
+
+**`stack install --resolver nightly hledger-lib-1.5 hledger-1.5 hledger-iadd-1.3.1`**
-### 3. cabal
+### cabal
[cabal](https://www.haskell.org/cabal/) is the other Haskell build tool. If you're a cabal expert, feel free to use this instead.
@@ -158,15 +168,14 @@ can be installed similarly to the above. Eg:\
## C. build the development version ?
-Also a good choice. Our master branch is kept stable enough for daily use,
-and includes the very latest improvements ([commits](https://github.com/simonmichael/hledger/commits/master)).
+Also a good choice. Our master branch is stable enough for daily use,
+and includes the latest improvements ([commits](https://github.com/simonmichael/hledger/commits/master)).
-1. **Install [`stack`](#stack) and [git](https://en.wikipedia.org/wiki/Git)**
+1. **Install [git](https://en.wikipedia.org/wiki/Git) and [`stack`](#stack)**
2. **`git clone https://github.com/simonmichael/hledger`**
3. **`cd hledger`**
-4. **`stack install [hledger]`** *# optionally specify just the hledger package to build less*
+4. **`stack install [hledger]`** *# build all, or just the command line UI*
+5. **[Install system packages if needed](#link-errors)**
+6. **[Set up \$PATH](#set-up-path)**
cabal users may find the `cabal-install.sh` or `cabal.project` files useful.
-
-