From a499ec217eb5fcb665a43367d245fa5240ae5842 Mon Sep 17 00:00:00 2001
From: Wayne Lewis <wayne.lewis@ess.eu>
Date: Wed, 29 Sep 2021 08:35:17 -0700
Subject: [PATCH] Update changelog with changes in this branch

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74153188..05e7aaff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * * Tests that elementary patching/building works as expected
 * Added consistency check between e3 environment variables and path to `iocsh.bash`. `iocsh.bash` will abort if these are not consistent.
 * Add e3 version infomation to the shell prompt
+* Add option to allow override of automatic addition of `iocInit` to generated startup script
 
 ### Bugfixes
 * `iocsh.bash --help` (and variants) no longer loads tries to load `env.sh`.
@@ -28,6 +29,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Other changes
 * removed legacy code from setE3Env.bash
 * Removed usage of `env.sh` - now there is a check only for seeing if the environment variable `$IOCNAME` is set
+* Fix typos in `iocsh_functions.bash` comments
+* Rearrange usage to match order of options in code
+* Add information about realtime option to usage
 
 ## [3.4.1]
 
-- 
GitLab