From 565e068a008b1a1d40275c5180fea7878e2497b9 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 1 Dec 2023 22:02:30 -1000
Subject: [PATCH] ;doc: RELEASING tweaks

---
 doc/RELEASING.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/RELEASING.md b/doc/RELEASING.md
index 642729ac2..f6b441d7f 100644
--- a/doc/RELEASING.md
+++ b/doc/RELEASING.md
@@ -171,6 +171,7 @@ See [CHANGELOGS](CHANGELOGS.md).
 #### Release branch and version number
 Create release branch if needed, update all package versions, help, manuals, changelogs (preferred):
 - `./bake prep NEW`
+  - First ensure `hpack --version` matches the one in `stack --version`
   - NEW is `MA.JOR[.MINOR|.99.PREVIEWNUM]` (eg 1.24.99.1 for 1.25 preview 1)
   - for troubleshooting: bash -x PAUSE=1 ECHO=1 bake ...
   <!-- - "avoid possible bug with being in master instead" (?) -->
@@ -261,6 +262,10 @@ Sanity checks:
 - ensure no new commits have been made since push to `github/binaries`
 - in the release branch (?): `make tag`
 
+#### Hackage packages
+in main repo, release branch:
+- `make hackageupload` (major/bugfix/fixup release)
+
 #### Github release
 - in main repo, release branch:
   - `git push github MA.JOR-branch` or magit `P p`
@@ -269,7 +274,7 @@ Sanity checks:
 - choose release tag
 - title: VERSION
 - description:
-  - copy doc/github-release-doc.tmpl.md to emacs
+  - copy doc/github-release.md to emacs
   - insert latest release notes (minus topmost heading) from site/src/release-notes.md
   - replace all OLD version strings with NEW
   - copy to github release
@@ -278,10 +283,6 @@ Sanity checks:
 - Save draft
 - (and after successful hackage upload: Publish release)
 
-#### Hackage packages
-in main repo, release branch:
-- `make hackageupload` (major/bugfix/fixup release)
-
 #### Release manuals
 (major release)
 
@@ -324,7 +325,7 @@ In site repo:
     hledgerorg emacs, open /opt/hledger/site/hledger.org.caddy:
     - @oldmanpath: add `path` for NEW
     - @unversionedmanpath: update to NEW
-  - `systemctl reload caddy`
+  - `make caddy-restart`
 - check site in browser
   - install page versions, badge colours
   - manuals' versions list in browser. If not updating, try