Update CHANGELOG and RELEASE_NOTES with `verify` attribute addition

3 files changed, 22 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f87b682a6e..2a632d8c21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@
 * dsc_script should now correctly honor timeout. See [Issue 2831](https://github.com/chef/chef/issues/2831)
 * Added an `imports` attribute to dsc_script. This attribute allows you to specify DSC resources that need to be imported for your script.
 * Fixed error where guard resources (using :guard_interpreter) were not ran in `why_run` mode [Issue 2694](https://github.com/chef/chef/issues/2694)
+* Add `verify` method to File resource per RFC027
 
 ## 12.0.3
 * [**Phil Dibowitz**](https://github.com/jaymzh):
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index e85e546ee9..488adb0daf 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -6,6 +6,15 @@ Example Doc Change:
 Description of the required change.
 -->
 
+
+### File-like resources now accept a `verify` attribute
+
+The file, template, cookbook_file, and remote_file resources now all
+accept a `verify` attribute.  This file accepts a string or a block,
+similar to `only_if`.  A full specification can be found in RFC 027:
+
+https://github.com/opscode/chef-rfc/blob/master/rfc027-file-content-verification.md
+
 ### Chef now handles URI Schemes in a case insensitive manner
 
 Previously, when a URI scheme contained all uppercase letters, Chef would reject the URI as invalid. In compliance with RFC3986, Chef now treats URI schemes in a case insensitive manner. This applies to all resources which accept URIs such as remote_file etc.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0bc20ad845..58a2b81aad 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -62,7 +62,16 @@ The package resource on OpenBSD is wired up to use the new OpenBSD package provi
 
 ## Case Insensitive URI Handling
 
-Previously, when a URI scheme contained all uppercase letters, Chef would reject the URI as invalid. In compliance with RFC3986, Chef now treats URI schemes in a case insensitive manner.
+Previously, when a URI scheme contained all uppercase letters, Chef
+would reject the URI as invalid. In compliance with RFC3986, Chef now
+treats URI schemes in a case insensitive manner.
+
+## File Content Verification (RFC 027)
+
+Per RFC 027, the file and file-like resources now accept a `verify`
+attribute.  This attribute accepts a string(shell command) or a ruby
+block (similar to `only_if`) which can be used to verify the contents
+of a rendered template before deploying it to disk.
 
 ## Drop SSL Warnings
 Now that the default for SSL checking is on, no more warning is emitted when SSL
@@ -493,7 +502,7 @@ powershell_script 'make_safe_backup' do
   code 'cp ~/data/nodes.json $env:systemroot/system32/data/nodes.bak'
 
   # cmd.exe (batch) guard below behaves differently in 32-bit vs. 64-bit processes
-  not_if 'if NOT EXIST %SYSTEMROOT%\\system32\\data\\nodes.bak exit /b 1' 
+  not_if 'if NOT EXIST %SYSTEMROOT%\\system32\\data\\nodes.bak exit /b 1'
 end
 ```
 
@@ -560,7 +569,7 @@ Information about these events can be found in `Chef::EventDispatch::Base`.
 
 ## Resource and Provider Resolution changes
 
-Resource resolution and provider resolution has been made more dynamic in Chef-12.  The `provides` syntax on the 
+Resource resolution and provider resolution has been made more dynamic in Chef-12.  The `provides` syntax on the
 Chef::Resource DSL (which has existed for 4 years) has been expanded to use platform_family and os and has been applied
 to most resources.  This does early switching at compile time between different resources based on the node data returned
 from ohai.  The effect is that previously the package resource on a CentOS machine invoked via `package "foo"` would be
@@ -577,4 +586,3 @@ inflexible since it cannot handle the case where an admin installs or removes a
 handle the case where there may be multiple providers that handle different kinds of services (e.g. Upstart, SysV,
 etc).  This fixes the Ubuntu 14.04 service resource problems, and can handle arbitrarily complicated future distro
 and administrative preferences dynamically.
-