From 2c16dded6e84cf83f40dfa0c6a09566143800a31 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 23 Jul 2015 07:05:28 -0700
Subject: [PATCH] docs: simplify download page

---
 doc/site/download.md | 120 ++++++++++++++++++++++++-------------------
 1 file changed, 66 insertions(+), 54 deletions(-)

diff --git a/doc/site/download.md b/doc/site/download.md
index ca7c36441..f9b740e14 100644
--- a/doc/site/download.md
+++ b/doc/site/download.md
@@ -8,23 +8,67 @@
 ## I want to download and run
 <!-- <sub>(If the download is out of date or doesn't run on my system, I might troubleshoot or donate to fund improvements)</sub> -->
 
-<table width="100%">
-<tr valign="top">
-<td width="33%">
-**I'm on Debian or Ubuntu**\
+<style>
+tr { vertical-align:top; }
+td { padding-bottom:1em; padding-right:1em; }
+</style>
+
+<table>
+
+<tr><td>
+**on Windows**
+</td><td>
+<!-- [windows install guide](windows-install.html)\ -->
+Download, unzip, and run
+[hledger-0.26-win64.zip](http://hledger.org/downloads/hledger-0.26-win64.zip)
+<!-- (or the [32-bit build](http://hledger.org/downloads/hledger-0.26-win32.zip)) -->
+and
+[hledger-web-0.26-win64.zip](http://hledger.org/downloads/hledger-web-0.26-win64.zip)
+</td></tr>
+
+<tr><td>
+**on Mac**
+</td><td>
+<!-- [mac install guide](mac-install.html)\ -->
+<!-- [hledger.mac.zip]()\ -->
+<!-- [hledger-web.mac.zip]()\ -->
+Use stack or cabal (see below)
+</td></tr>
+
+<tr><td>
+**on Debian or Ubuntu**
+</td><td>
 `apt-get install hledger hledger-web`
+</td></tr>
 
-**I'm on Gentoo**\
+<tr><td>
+**on Gentoo**
+</td><td>
 `emerge hledger hledger-web`
+</td></tr>
 
-**I'm on Red Hat/Fedora/CentOS**\
+<tr><td>
+**on Red Hat, Fedora or CentOS**
+</td><td>
 `yum install hledger hledger-web`
+</td></tr>
 
-**I'm on NixOS**\
+<tr><td>
+**on NixOS**
+</td><td style="white-space:nowrap;">
 `nix-env -iA nixpkgs.haskellPackages.hledger nixpkgs.haskellPackages.hledgerWeb`
+</td></tr>
+
+<tr><td>
+**in a Virtualbox VM**
+</td><td>
+Try <https://github.com/sciurus/hledger-vagrant>
+</td></tr>
+
+</table>
 
 <!--
-**I'm on another GNU/Linux\<small>(or can run Linux binaries)</small>**
+**on another GNU/Linux\<small>(or can run Linux binaries)</small>**
 [hledger.linux-32.zip]()
 [hledger-web.linux-32.zip]()
 [hledger.linux-64.zip]()
@@ -32,54 +76,24 @@
 Use cabal
 -->
 
-</td>
-<td width="33%">
- <!-- <table border=0 cellspacing=0 cellpadding=0> -->
- <!-- <tr valign=top> -->
- <!-- <td width="50%"> -->
- **I'm on Windows**\
- <!-- [windows install guide](windows-install.html)\ -->
- Download, unzip, and run:\
- [hledger-0.26-win64.zip](http://hledger.org/downloads/hledger-0.26-win64.zip)
-  (or the [32-bit build](http://hledger.org/downloads/hledger-0.26-win32.zip))\
- [hledger-web-0.26-win64.zip](http://hledger.org/downloads/hledger-web-0.26-win64.zip)
-
- </td>
- <td width="33%">
- **I'm on Mac**\
- <!-- [mac install guide](mac-install.html)\ -->
- <!-- [hledger.mac.zip]()\ -->
- <!-- [hledger-web.mac.zip]()\ -->
- Use stack or cabal (see below)
-
- </td>
- </tr>
- <!-- <tr> -->
- <!-- <td colspan="2" style="padding-left:1em;padding-right:2em;"> -->
-
 <!--
- Building and supporting Windows and Mac binaries is costly, so
- it's demand-driven - you can indicate demand by making a project
- donation of any size. Binaries funded in this way will be linked here.
- This is a quick way to help the project and your fellow users!
+Building and supporting Windows and Mac binaries is costly, so
+it's demand-driven - you can indicate demand by making a project
+donation of any size. Binaries funded in this way will be linked here.
+This is a quick way to help the project and your fellow users!
 -->
 
- <!-- </td> -->
- <!-- </tr> -->
- </table>
-</td>
-</tr>
-</table>
+## I want to build the latest release
 
-## I want to build the [latest release](http://hackage.haskell.org/package/hledger)
+**[Release notes](release-notes.html)**
 
 Recommended:
 
-1. Download and install [stack](https://github.com/commercialhaskell/stack/wiki/Downloads) (on windows, choose the 64-bit version if you will be processing [large data](https://github.com/simonmichael/hledger/issues/275))
+1. Download and install [stack](https://github.com/commercialhaskell/stack/wiki/Downloads) (on windows, choose the 64-bit version if you will be processing [>50k transactions](https://github.com/simonmichael/hledger/issues/275))
 
 2. `stack --resolver nightly-2015-07-13 setup`
 
-    (if you need GHC, eg on windows. If you're not sure, run the next command and it will tell you)
+    (do this if you need GHC, eg on windows. If you're not sure, run the next command and it will tell you)
 
 3. `stack --resolver nightly-2015-07-13 install hledger`
 
@@ -93,15 +107,13 @@ Or:
 4. `cabal sandbox init`
 5. `cabal install hledger[-web]`
 
-The old [Installation Guide](installing.html) has more notes on this process.
-[Release Notes](release-notes.html) shows what's new in the hledger packages.
+## I want to build the [latest master branch](https://github.com/simonmichael/hledger/commits/master)
 
-## I want to build the [latest development version](https://github.com/simonmichael/hledger/commits/master)
-
-1. `git clone https://github.com/simonmichael/hledger.git`
+1. `git clone https://github.com/simonmichael/hledger.git` (shortcut: `git clone code.hledger.org hledger`)
 2. `cd hledger`
-3. `stack install` (or cabal install as shown above)
+3. `stack install` (or `cabal sandbox init; cabal install ./hledger{-lib,,-web}`)
 
-## I want to run the Ubuntu hledger packages in a virtual machine
+\
+\
+See also the old [Installation Guide](installing.html).
 
-Try <https://github.com/sciurus/hledger-vagrant>.