site: updates from IRC

doc/site/download.md

@@ -1,27 +1,22 @@
 # Download
 
-hledger is shipped as two executables: `hledger` (the command-line tool) and `hledger-web` (the web interface).
-Generally (except on Windows), installing `hledger-web` automatically installs `hledger` as well.
-
-[Release Notes](release-notes.html)
-
 ## 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>
 <tr valign="top">
-<td width="33%">
+<td width="50%">
 **I'm on Debian or Ubuntu**\
-`apt-get install hledger[-web]`
+`apt-get install hledger hledger-web`
 
 **I'm on Gentoo**\
-`emerge hledger[-web]`
+`emerge hledger hledger-web`
 
 **I'm on Red Hat/Fedora/CentOS**\
-`yum install hledger`
+`yum install hledger hledger-web`
 
 **I'm on NixOS**\
-`nix-env -iA nixpkgs.haskellPackages.hledger`
+`nix-env -iA nixpkgs.haskellPackages.hledger nixpkgs.haskellPackages.hledgerWeb`
 
 <!--
 **I'm on another GNU/Linux\<small>(or can run Linux binaries)</small>**
@@ -31,43 +26,56 @@ Generally (except on Windows), installing `hledger-web` automatically installs `
 [hledger-web.linux-64.zip]()
 Use cabal
 -->
+[Release Notes](release-notes.html)
 
 </td>
-<td width="33%">
+<td width="50%">
+ <table border=0 cellspacing=0 cellpadding=0>
+ <tr valign=top>
+ <td width="50%">
 
-**I'm on Windows**\
+ **I'm on Windows**\
-<!-- [windows install guide](windows-install.html)\ -->
+ <!-- [windows install guide](windows-install.html)\ -->
-Download, unzip, and run:\
+ Download, unzip, and run:\
-[hledger-0.23.3.win32.zip](http://hledger.org/downloads/hledger-0.23.3-windows-intel32.exe.zip)\
+ [hledger-0.23.3.win32.zip](http://hledger.org/downloads/hledger-0.23.3-windows-intel32.exe.zip)\
-[hledger-web-0.23.3.win32.zip](http://hledger.org/downloads/hledger-web-0.23.3-windows-intel32.exe.zip)
+ [hledger-web-0.23.3.win32.zip](http://hledger.org/downloads/hledger-web-0.23.3-windows-intel32.exe.zip)
 
-</td>
+ </td>
-<td width="33%">
+ <td width="25%">
 
-**I'm on Mac**\
+ **I'm on Mac**\
-<!-- [mac install guide](mac-install.html)\ -->
+ <!-- [mac install guide](mac-install.html)\ -->
-<!-- [hledger.mac.zip]()\ -->
+ <!-- [hledger.mac.zip]()\ -->
-<!-- [hledger-web.mac.zip]()\ -->
+ <!-- [hledger-web.mac.zip]()\ -->
-Use cabal
+ Use cabal (see below)
 
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" style="padding-left:1em;padding-right:2em;">
+
+ <div style="margin-left:1em; float:right;">
+ **[Gittip](https://www.gittip.com/simonmichael/)**,
+ <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5J33NLXYXCYAY"><img border=0 src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" alt="paypal"></a>
+ </div>
+ 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>
 
-<div style="margin-left:1em; float:right;">
-**[Gittip](https://www.gittip.com/simonmichael/)**,
-<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5J33NLXYXCYAY"><img border=0 src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" alt="paypal"></a>
-</div>
-Building, testing 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!
-
 ## I want to build the [latest release](http://hackage.haskell.org/package/hledger-web) with [GHC](http://haskell.org/ghc) and [cabal](http://haskell.org/cabal/download.html)
 
-`cabal sandbox init; cabal update; cabal install hledger[-web]`\
+`cabal sandbox init; cabal update; cabal install hledger-web`\
 <!-- [cabal install guide](cabal-install.html) -->
 
+Or just cabal install `hledger` if you don't need the web interface.
 The [Installation Guide](installing.html) describes how to install using cabal in more detail.
 
 ## I want to build the [latest development code](http://hledger.org/code)

doc/site/index.md

@@ -47,10 +47,10 @@ transactions, but does not change existing ones.)
 ### ...with a web UI
 
 hledger comes with a built-in web server providing an alternate
-[browser-based interface](manual.html#web), for assisted data entry
+[browser-based interface](manual.html#web)
-and point and click reporting. The web and command-line clients can be
+([demo](http://demo.hledger.org)), for assisted data entry and point
-used simultaneously.
+and click reporting. The web and command-line clients can be used
-</div>
+simultaneously.  </div>
 
 <div style="margin:0 5em 0 10em;">
 ### a Haskell application and library

doc/site/installing.md

@@ -116,7 +116,7 @@ $ source ~/.bashrc
 ```
 Test your PATH-variable with:
 ```
-$ $PATH
+$ echo $PATH
 ```
 ### hledger --version shows wrong version ?
 Perhaps you have multiple versions of hledger in your PATH. Eg you installed with the system package manager