Apply suggestions from code review

Co-Authored-By: marcparadise <marcparadise@users.noreply.github.com>
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>

3 files changed, 5 insertions, 12 deletions

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0cb0257525..94caa8bab0 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -97,7 +97,7 @@ Using removed options will cause the command to fail.
 |--kerberos-keytab-file| This option existed but was not implemented.|
 |--winrm-codepage| This was used under knife-windows because bootstrapping was performed over a `cmd` shell. It is now invoked from `powershell`, so this option is no longer used.|
 |--winrm-shell|This option was ignored for bootstrap.|
-|--prerelease|Prerelease Chef hasn't existed for some time.|
+|--prerelease|Chef now releases all development builds to our current channel and does not perform pre-release gem releases.|
 |--install-as-service|Installing Chef client as a service is not supported|
 
 #### Usage Changes
@@ -112,13 +112,6 @@ the target hostname with the protocol in URL format. For example:
   knife bootstrap winrm://example.com
 ```
 
-
-#### Windows Server 2008
-
-The new bootstrap on Windows uses Powershell, and is compatible only in
-versions of Powershell included in Windows Server 2008R2 and later. To bootstrap older/unpatched
-Win2k8 nodes, please continue to use the `knife-bootstrap` plugin.
-
 ### Audit Mode
 
 Chef's Audit mode was introduced in 2015 as a beta that needed to be enabled via client.rb. Its functionality has been superceded by InSpec and has been removed.
diff --git a/docs/dev/design_documents/bootstrap_with_train.md b/docs/dev/design_documents/bootstrap_with_train.md
index db92657fff..b4c3dbcc89 100644
--- a/docs/dev/design_documents/bootstrap_with_train.md
+++ b/docs/dev/design_documents/bootstrap_with_train.md
@@ -52,12 +52,12 @@ remains largely unchanged.
 We will also remove the following obsolete or unsupported behaviors:
 
 * `--prelease` flag - Chef hasn't been pre-released in quite some time.
-* `--install-as-service` - this is an anti-pattern on Windows that we have
+* `--install-as-service` - For many years we have suggested users not run chef-client as a service due to memory leaks in long running Ruby processes.
 * `--kerberos-keytab-file` - this is not implemented in the WinRM gem we use, and so was
 passed through to no effect.
 * remove explicit support for versions of Chef older than 12.8. Versions older than the supported
   Chef client distributions will continue to be use at your own risk.
-* Remove support for Windows 2003 in the Windows bootstrap template.
+* Remove support for Windows 2003 in the Windows bootstrap template as Chef does not support EOL Windows 2003 installs.
 
 ### CLI Flag Changes
 
diff --git a/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb b/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb
index 96aadede74..37fcf15682 100644
--- a/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb
+++ b/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb
@@ -1,6 +1,6 @@
 @rem
 @rem Author:: Seth Chisamore (<schisamo@chef.io>)
-@rem Copyright:: Copyright (c) 2011-2017 Chef Software, Inc.
+@rem Copyright:: Copyright (c) 2011-2019 Chef Software, Inc.
 @rem License:: Apache License, Version 2.0
 @rem
 @rem Licensed under the Apache License, Version 2.0 (the "License");
@@ -87,7 +87,7 @@ goto architecture_select
 @set MACHINE_OS=2016
 goto architecture_select
 
-@rem Currently Windows Server 2016 R2 is treated as equivalent to Windows Server 2016
+@rem Currently Windows Server 2019 is treated as equivalent to Windows Server 2016
 :Version10.1
 goto Version10.0