[ruby-dev:43027] fixes #4280

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 3 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ecf840897..e4abc668d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Wed Mar  9 11:53:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* enc/shift_jis.c: Change SJIS as an alias of Windows-31J.
+	  [ruby-dev:43027] fixes #4280
 
 	* enc/shift_jis.c: Add PCK as an alias of Windows-31J.
 
diff --git a/NEWS b/NEWS
index 266b660c46..b6a49d3ea9 100644
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,8 @@ with all sufficient information, see the ChangeLog file.
       * CP951
       * UTF-16
       * UTF-32
+    * change alias:
+      * SJIS is Windows-31J
 
   * File
     * new constant: