Update docs files for socketless local mode and no listen

3 files changed, 17 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e37dadd3bc..1fd60c92da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Unreleased
 
+* [pr#3160](https://github.com/chef/chef/pull/3160): Use Chef Zero in
+  socketless mode for local mode, add `--no-listen` flag to disable port
+  binding
 * [**Nolan Davidson**](https://github.com/nsdavidson):
   Removed after_created and added test to recipe_spec
 * [**Tim Sogard**](https://github.com/drags):
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index a3fae662df..62de8633cf 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -6,6 +6,13 @@ Example Doc Change:
 Description of the required change.
 -->
 
+### Chef Client and Knife `--no-listen` Flag and `listen` Config Option
+
+Chef Client and Knife have a `--no-listen` CLI option. It is only
+relevant when using local mode (`-z`). When this flag is given, Chef
+Zero does not bind to a port on localhost. The same behavior can be
+activated by setting `listen false` in the relevant config file.
+
 ### Chef Client, Solo, and Apply `--minimal-ohai` Flag
 
 Chef Client, Solo, and Apply all implement a `--minimal-ohai` flag. When
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 859ca7c840..510e457b33 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,12 @@
 # Chef Client Release Notes 12.3.0:
 
+## Socketless Chef Zero Local Mode
+All requests to the Chef Zero server in local mode use Chef Zero's new
+socketless request mechanism. By default, Chef Zero will still bind to a
+port and accept HTTP requests on localhost; this can be disabled with
+the `--no-listen` CLI flag or by adding `listen false` to the relevant
+configuration file.
+
 ## Minimal Ohai Flag
 
 Chef Client, Solo, and Apply all now support a `--minimal-ohai` flag.