Update changelog for releases

3 files changed, 7 insertions, 66 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ada16f72c7..f95638907e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Unreleased
+* [**Phil Dibowitz**](https://github.com/jaymzh):
+  Fix multipackage and architectures
+
+* Convert bootstrap template to use sh #2877
 
+## 12.3.0
 * [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
@@ -16,6 +21,7 @@
   Ensure knife ssh doesn't use a non-existant field for hostname #3131
 * [**Tom Hughes**](https://github.com/tomhughes)
   Ensure searches progress in the face of incomplete responses #3135
+
 * [pr#3162](https://github.com/chef/chef/pull/3162): Add
   `--minimal-ohai` flag to client/solo/apply; restricts ohai to only the
   bare minimum of plugins.
@@ -23,12 +29,9 @@
 * gem_package, chef_gem should not shell out to using https://rubygems.org #2867
 * Add dynamic resource resolution similar to dynamic provider resolution
 * Add Chef class fascade to internal structures
-* Convert bootstrap template to use sh #2877
 * Fix nil pointer for windows event logger #3200
 * Use partial search for knife status
 * Ensure chef/knife properly honours proxy config
-* [**Phil Dibowitz**](https://github.com/jaymzh):
-  Fix multipackage and architectures
 
 ## 12.2.1
 * [Issue 3153](https://github.com/chef/chef/issues/3153): Fix bug where unset HOME would cause chef to crash
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index 62de8633cf..6b58871418 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -5,22 +5,3 @@ Example Doc Change:
 ### Headline for the required 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
-set, Chef only runs the bare minimum necessary ohai plugins required for
-internal functionality. This reduces the run time of ohai and might
-improve Chef performance by reducing the amount of data kept in memory.
-Most users should NOT use this mode, however, because cookbooks that
-rely on data collected by other ohai plugins will definitely be broken
-when Chef is run in this mode. It may be possible for advanced users to
-work around that by using the ohai resource to collect the "missing"
-data during the compile phase.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 8a7b537670..b05498e36d 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,45 +1,2 @@
-# 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.
-When set, Chef will only run the bare minimum Ohai plugins necessary to
-support node name detection and resource/provider selection. The primary
-motivation for this feature is to speed up Chef's integration tests
-which run `chef-client` (and solo) many times in various contexts,
-however advanced users may find it useful in certain use cases. Any
-cookbook that relies on other ohai data will absolutely not work in this
-mode unless the user implements workarounds such as running the ohai
-resource during the compile phase.
-
-## Dynamic Resource Resolution and Chef Class Fascade
-
-Resolution of Resources is now dynamic and similar to Providers and handles
-multiple resources having the same provides line on a given platform.  When
-the user types a resource like 'package' into the DSL that is resolved via
-the provides lines, and if multiple classes provide the same resource (like
-Homebrew and MacPorts package resources on Mac) then which one is selected
-is governed by the Chef::Platform::ResourcePriorityMap.
-
-In order to change the priorities in both the ResourcePriorityMap and
-ProviderPriorityMap a helper API has been constructed off of the Chef class:
-
-* `Chef.get_provider_priority_array(resource_name)`
-* `Chef.get_resource_priority_array(resource_name)`
-* `Chef.set_provider_priority_array(resource_name, Array<Class>, *filter)`
-* `Chef.set_resoruce_priority_array(resource_name, Array<Class>, *filter)`
-
-In order to change the `package` resource globally on MacOSX to the MacPorts provider:
-
-`Chef.set_resource_priority_array(:package, [ Chef::Resource::MacportsPackage ], os: 'darwin')`
-
-That line can be placed into a library file in a cookbook so that it is applied before
-any recipes are compiled.
+# Chef Client Release Notes <unreleased>: