diff --git a/README2.rst b/DEVELOPMENT.rst
similarity index 91%
rename from README2.rst
rename to DEVELOPMENT.rst
index aa8372649..5419ff048 100644
--- a/README2.rst
+++ b/DEVELOPMENT.rst
@@ -30,13 +30,13 @@ hledger is free software by `Simon Michael`_ & `co.`_, released under GNU GPLv3.
``darcs get http://joyful.com/repos/hledger``,
`browse the repo`_,
`hackage page`_,
- `hledger-lib api docs`_,
- `hledger api docs`_,
- `hledger-lib sourcegraph report`_,
- `hledger sourcegraph report`_,
+ `hledger haddock docs`_,
benchmark_\/profile_\/heap_\/coverage_ reports,
`developer notes`_
+ .. `hledger-lib sourcegraph report`_,
+ .. `hledger sourcegraph report`_,
+
.. raw:: html
@@ -78,8 +78,7 @@ hledger is free software by `Simon Michael`_ & `co.`_, released under GNU GPLv3.
.. _manual: MANUAL.html
.. _news: NEWS.html
.. _screenshots: SCREENSHOTS.html
-.. _hledger-lib api docs: http://joyful.com/repos/hledger/hledger-lib/dist/doc/html/hledger-lib/index.html
-.. _hledger api docs: http://joyful.com/repos/hledger/dist/doc/html/hledger/index.html
+.. _hledger haddock docs: http://hledger.org/api-doc/
.. _hledger-lib sourcegraph report: http://joyful.com/repos/hledger/hledger-lib/SourceGraph/hledger-lib.html
.. _hledger sourcegraph report: http://joyful.com/repos/hledger/SourceGraph/hledger.html
.. _developer notes: http://joyful.com/darcsweb/darcsweb.cgi?r=hledger;a=plainblob;f=/NOTES
@@ -88,7 +87,7 @@ hledger is free software by `Simon Michael`_ & `co.`_, released under GNU GPLv3.
.. _heap: http://hledger.org/profs/latest.ps
.. _coverage: http://hledger.org/profs/coverage/hpc_index_fun.html
.. _browse the repo: http://joyful.com/darcsweb/darcsweb.cgi?r=hledger
-.. _email me: mailto:simon@joyful.com
+.. _email me: mailto:simon@joyful.com?subject=hledger:
.. _Simon Michael: http://joyful.com
.. _co.: http://hledger.org/CONTRIBUTORS.html
.. _hackage page: http://hackage.haskell.org/package/hledger
diff --git a/MANUAL.markdown b/MANUAL.markdown
index 45f658d00..45c25acfa 100644
--- a/MANUAL.markdown
+++ b/MANUAL.markdown
@@ -578,11 +578,11 @@ subsequent dates may be written as month/day. Eg:
Y2009
- 12/15 ...
+ 12/15 ; <- equivalent to 2009/12/15
Y2010
- 1/31 ...
+ 1/31 ; <- equivalent to 2010/1/31
##### Actual/effective dates
@@ -862,6 +862,9 @@ Generally, it's easy to keep a journal file that works with both hledger
and c++ledger if you avoid the more esoteric syntax. Occasionally you'll
need to make small edits to restore compatibility for one or the other.
+hledger does not allow separate dates for individual postings, unlike c++
+ledger.
+
#### Features not supported
c++ ledger features not currently supported include: modifier and periodic
@@ -927,23 +930,28 @@ entries, and the following c++ ledger options and commands:
- hledger recognises description and negative patterns by "desc:"
and "not:" prefixes, unlike ledger 3's free-form parser
+
- hledger doesn't require a space before command-line option
- values, you can write -f-
+ values, eg either `-f-` or `-f -` is fine
+
- hledger's weekly reporting intervals always start on mondays
+
- hledger shows start and end dates of the intervals requested,
not just the span containing data
+
- hledger period expressions don't support "biweekly",
"bimonthly", or "every N days/weeks/..."
+
- hledger always shows timelog balances in hours
+
- hledger splits multi-day timelog sessions at midnight
+
- hledger doesn't track the value of commodities with varying
price; prices are fixed as of the transaction date
+
- hledger print shows amounts for all postings, and shows unit
- prices for amounts which have them
-- hledger assumes a transaction's actual date comes first, and is
- required, while the optional effective date comes second (cf
- [Actual and effective dates](#actual-and-effective-dates))
-- hledger does not support per-posting actual or effective dates
+ prices for amounts which have them. (This currently means that
+ it does not print multi-commodity transactions in valid journal format.)
### More examples and recipes
diff --git a/README.rst b/README.rst
index ebbdb137f..5180045e0 100644
--- a/README.rst
+++ b/README.rst
@@ -8,6 +8,7 @@ hledger is a computer program for easily tracking money, time, or other
commodities, using standard accounting principles. It is quite limited in
features, but reliable. For some, it is a bare-bones, less complex, less
expensive alternative to Quicken or Microsoft Money.
+hledger is available for free under the GNU General Public License.
hledger aims to help both computer experts and every-day users gain clarity in their finances and time management.
I use it every day to:
@@ -17,23 +18,17 @@ I use it every day to:
- get accurate numbers for client billing and tax filing
- track invoices
-Here is a demo_ of the web interface.
+The manual_ and screenshots_ will explain more. There's also a demo_ of hledger's web interface.
+To get started tracking your own numbers, download_ a copy.
-Here are ready-to-run binaries_ for mac, windows and gnu/linux;
-or here's how to `build your own`_.
-
-Here is the manual_.
For support and more technical info, see `development`_ or `email me`_.
+I appreciate feedback on all aspects of hledger. Thanks!
-.. (If you're reading this in plain text, see also README2, MANUAL etc., or http://hledger.org)
-.. _development: README2.html
-.. _manual: MANUAL.html
-.. _demo: http://demo.hledger.org
-.. _binaries: http://hledger.org/binaries/
-.. _hledger for mac: http://hledger.org/binaries/hledger-0.6-mac-i386.gz
-.. _hledger for windows: http://hledger.org/binaries/hledger-0.6-win-i386.zip
-.. _32 bit intel: http://hledger.org/binaries/hledger-0.6.1+9-linux-i386.gz
-.. _64 bit intel: http://hledger.org/binaries/hledger-0.6-linux-x86_64.gz
-.. _email me: mailto:simon@joyful.com
-.. _build your own: http://hledger.org/MANUAL.html#installing
+.. _manual: MANUAL.html
+.. _screenshots: SCREENSHOTS.html
+.. _demo: http://demo.hledger.org
+.. _web interface: MANUAL.html#web
+.. _download: download
+.. _development: DEVELOPMENT.html
+.. _email me: mailto:simon@joyful.com?subject=hledger:
diff --git a/SCREENSHOTS.markdown b/SCREENSHOTS.markdown
index 8f7d412bc..ee7649e93 100644
--- a/SCREENSHOTS.markdown
+++ b/SCREENSHOTS.markdown
@@ -4,7 +4,8 @@ title: hledger screenshots
# hledger screenshots
-Mouse over for captions, click to enlarge.
+
+Click to enlarge, or mouse over for captions..
hledger downloads
-Here are hledger binaries ready to run on your platform. Choose
-GNU/Linux, Mac or Windows and follow the instructions.
-If you have any trouble, please
-report it (-> Support).
-To build your own custom version of hledger, see the
-cabal installation docs instead.
+Here are hledger binaries which "might just work" on your computer.
+Choose GNU/Linux, Mac or Windows and follow the instructions. If you
+have any trouble, please report it to Support.
+To build your own custom version of hledger, see
+installing with cabal instead.