Fix wording, add updates for interval sleep first, signal processing

2 files changed, 23 insertions, 13 deletions

diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index 357e9438c4..1c16377ccd 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -182,17 +182,23 @@ $ knife search node "platform:ubuntu" --filter-result "c_version:languages.c.gcc
 $
 ```
 
-## Unforked interval chef-client runs are disabled
-It is now explicitly prohibited to run the chef-client and chef-solo applications at intervals without forking.
-These commands will fail immediately
-```bash
-chef-client --daemonize --no-fork
-chef-solo --interval 1800 --no-fork
-chef-client --daemonize --interval 0 --no-fork
-```
-You can provide the `--interval` and `--daemonize` flags in conjunction with `--no-fork` if the `--once` flag
-is also given. However `--once` overrides all `--interval` and `--splay` settings to run `chef-client` once
-then exits.
+## Client and solo application changes
+
+### Unforked interval chef-client runs are disabled
+Unforked interval and daemonized chef-client runs are now explicitly prohibited. Runs configured with CLI options
+`--interval SEC` or `--daemonize` paired with `--no-fork`, or the equivalent config options paired with
+`client_fork false` will fail immediately with error.
+
+### Sleep happens before converge
+When configured to splay sleep or run at intervals, `chef-client` and `chef-solo` perform both splay and interval
+sleeps before converging. In previous releases, chef would splay sleep then converge then interval sleep.
+
+### Signal handling
+When sent `SIGTERM` the thread or process will:
+1. if chef is not converging, exit immediately with exitstatus 3 or
+1. allow chef to finish converging then exit immediately with the converge's exitstatus.
+
+To terminate immediately, send `SIGINT`.
 
 # `knife ssl check` will verify X509 properties of your trusted certificates
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e9ce2d93a1..4909414b95 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -274,5 +274,9 @@ or `-f` option and a comma-separated string representation of the filter hash.
 
 ## Unforked chef-client interval runs are disabled.
 We no longer allow unforked interval runs of `chef-client`. CLI arguments with flag combinations `--interval SEC --no-fork` or
-`--daemonize --no-fork` will fail immediately. You can supply the `--once` flag so that chef-client will execute once
-in the current process and exit.
+`--daemonize --no-fork` will fail immediately. Configuration options `interval` and `daemonize` will also fail with
+error when `client_fork false` is set.
+
+## Interval sleep occurs before converge
+When running chef-client or chef-solo at intervals, the application will perform splay and interval sleep
+before converging chef. (In previous releases, splay sleep occurred first, then convergance, then interval sleep).