diff --git a/docs/Releasing.md b/docs/Releasing.md index 97934c34..23ddcb63 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -212,12 +212,19 @@ a `stable` release, as well as any social media posts you make. string, not the Windows A.B.C.D form.** 1. As you're working in a version-specific branch, `release-4.0.2`, you can safely commit these changes and push to GitHub. - **Do not merge the branch with `releases` until the GitHub release is in - place.** + **Do not merge the branch with `releases` until the GitHub release is in place.** If you're wondering, you needed to get the changelog prepared before building the .exe and .msi because ChangeLog.md is bundled with the install. + +# Adding killswitches + +If anything in this new release addresses a bug that causes, e.g. bad data +to be sent over EDDN, then you should add an appropriate entry to the +killswitches.json file *in the `releases` branch*. That file **must only ever +be commited to the `releases` branch!!!** See [docs/Killswitches.md](docs/Killswitches.md). + # Packaging & Installer Generation You'll want to do the .exe and .msi generation in a `cmd.exe` window, not e.g.