From 00f3ad8d3f49b67b6ddf6b10b1fc51122d01da01 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 1 Sep 2019 08:40:05 -0700
Subject: [PATCH] ;doc: changelogs

[ci skip]
---
 CHANGES.md             | 67 +++++++++++++-----------------------------
 hledger-lib/CHANGES.md |  2 +-
 hledger-ui/CHANGES.md  |  6 +---
 hledger-web/CHANGES.md |  4 +--
 hledger/CHANGES.md     |  2 +-
 5 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8088c112a..3b03e0cd0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,71 +1,44 @@
 General/project-related changes in the hledger project. 
 For package-specific changes, see the package changelogs.
 
-# 63fec5a8
+# e8d5e569
 
-- install: update resolver to lts-13.27 for freebsd12 (zieone)
+- install: bump to lts-14.4, hledger 1.15, drop hledger-api
 
-- site: remove site/, which has moved to its own hledger_site repo
+- bump versions to 1.15
 
-- stop building hledger-api
+- api: drop from Shake scripts
 
-- bump default stack.yaml to lts-14.1 / ghc 8.6.5
 
-- bin: add hledger-swap-dates; update hledger-check, hledger-smooth (#1072)
 
-- Update shell completions (Jakob Schöttl)
+- new hledger.org: the site now has its own git repo, has absorbed the
+  github wiki, and is generated with Sphinx.
 
-- travis: skip hledger-api at least for now to stay under time limit
+- hledger-api's functionality is now included in hledger-web,
+  and the hledger-api package is mothballed.
 
-- Create FUNDING.yml / github sponsor button
+- hledger-install.sh: updated, now also works on FreeBSD 12 (zieone)
 
-- examples: fix incompatible syntax in bcexample.hledger
+- bin/ addon scripts: hledger-swap-dates added; hledger-check,
+  hledger-smooth updated. (#1072)
 
-- make tag: include all hledger-web hs files in tags
+- shell-completion/ scripts: updated (Jakob Schöttl)
 
-- shake: be more verbose when updating changelogs
+- github: FUNDING.yml / sponsor button configured
 
-- shake: show htmlmanuals target in help
+- site: Wine option added to download page
 
-- make site-watch: site-liverender & site-livereload in one command
+- tools: generatejournal updates: vary amount, make reports with fewer
+  zeroes, start from a fixed year to keep tests stable, also generate
+  P records. (#999)
 
-- site: download: wine
-
-- tools: generatejournal: vary amount, make reports with fewer zeroes
-
-- make samplejournals: more; don't remake ones used for tests
-
-- tools: generatejournal: start from a fixed year, not last year
-  So regenerating sample journals doesn't require updating tests.
-
-- tools: generatejournal: also generate P records (#999)
+- tools: make, shake, CI: misc. updates
 
 - doc: add a README for the functional tests, linked from contrib guide
 
-- Rename hledger-makeitso to hledger-flow (Andreas Pauley)
-
-- docker: use "haskell" image as base (Dmitry Astapov)
-
-- appveyor: enable web
-  [skip ci]
-
-- travis: enable web, api
-
-- bump default stack.yaml to nightly-2019-03-09 / ghc 8.6.4
-
-- shake site: also commit & push home page when wiki links change
-
-- tools: move site.sh into shake; stop running just-pushed shakefile
-  Running the just pushed Shake.hs was too insecure.
-
-- make: rename sub-makefiles; start moving site script to make/shake
-
-- tools: commit missing pandoc filters (#981)
-
-- site: download: more cleanup
-
-- site: download: improve nix/docker/sandstorm links/descriptions
+- hledger-makeitso has been renamed to hledger-flow (Andreas Pauley)
 
+- The hledger docker image is now based on the "haskell" image (Dmitry Astapov)
 
 
 # 1.14 2019-03-01
diff --git a/hledger-lib/CHANGES.md b/hledger-lib/CHANGES.md
index d6069f754..1b08f72c5 100644
--- a/hledger-lib/CHANGES.md
+++ b/hledger-lib/CHANGES.md
@@ -1,7 +1,7 @@
 Internal/api/developer-ish changes in the hledger-lib (and hledger) packages.
 For user-visible changes, see the hledger package changelog.
 
-# f55985eb
+# 93f48c45
 
 Removals include:
 
diff --git a/hledger-ui/CHANGES.md b/hledger-ui/CHANGES.md
index 1185a81a8..462f47060 100644
--- a/hledger-ui/CHANGES.md
+++ b/hledger-ui/CHANGES.md
@@ -1,11 +1,7 @@
 User-visible changes in hledger-ui.
 See also the hledger changelog.
 
-# 81c58f34
-
-
-
-
+# 93f48c45
 
 - allow brick >=0.47
 
diff --git a/hledger-web/CHANGES.md b/hledger-web/CHANGES.md
index cb8c519af..15e8ba05a 100644
--- a/hledger-web/CHANGES.md
+++ b/hledger-web/CHANGES.md
@@ -1,9 +1,7 @@
 User-visible changes in hledger-web.
 See also the hledger changelog.
 
-# 81c58f34
-
-
+# 93f48c45
 
 - web: ?sidebar= hides the sidebar, like ?sidebar=0
 
diff --git a/hledger/CHANGES.md b/hledger/CHANGES.md
index 4287cc894..59c2f5e17 100644
--- a/hledger/CHANGES.md
+++ b/hledger/CHANGES.md
@@ -1,7 +1,7 @@
 User-visible changes in the hledger command line tool and library.
 
 
-# 65692b0e
+# 93f48c45
 
 - help: don't require a journal file