Merge branch 'master' into CHEF-5074

Conflicts:
	CHANGELOG.md
	DOC_CHANGES.md

1 files changed, 15 insertions, 4 deletions

diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index ee65736b14..27706774f6 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -4,9 +4,20 @@ This file is reset every time a new release is done. This file describes changes
 Example Doc Change:
 ### Headline for the required change
 Description of the required change.
+-->
 
-### --run-lock-timeout for `chef-client` and `solo`
-Users can now add a timeout for the maximum time a client run waits on another client run to finish.
+### --run-lock-timeout for chef-client and chef-solo
+You can now add a timeout for the maximum time a client run waits on another client run to finish.
 The default is to wait indefinitely.
-Setting the run lock timeout to 0 causes the second client run to exit immediately.
--->
+Setting the run lock timeout to 0 causes the second client run to exit immediately:
+
+```
+chef-client --run-lock-timeout 0
+```
+
+#### New knife command: knife node environment set
+You can now easily set the environment for an existing node without editing the node object:
+
+```
+knife node environment set NODE ENVIRONMENT
+```