2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8becc42c60..25bb230fed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 28 07:12:38 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add new magic-comment. (warn-indent) [ruby-core:25442]
+
 Tue Dec 28 04:32:37 2010  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/fiddle/extconf.rb: check for windows.h while building fiddle.
diff --git a/NEWS b/NEWS
index 9d26d45c34..d6b78c37f9 100644
--- a/NEWS
+++ b/NEWS
@@ -118,6 +118,9 @@ with all sufficient information, see the ChangeLog file.
   interpretation of UTS #18.
   http://www.unicode.org/reports/tr18/
 
+* Turning on/off indentation warnings with directives.
+  ("# -*- warn-indent: true -*-" / "# -*- warn-indent: false -*-")
+
 === Compatibility issues (excluding feature bug fixes)
 
 * Kernel#respond_to?