* encoding.c: document fix, change default script encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
technorama · May 19, 2013 · 66795c4 · 66795c4
1 parent 11c7566
commit 66795c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 19 23:12:07 2013  Ayumu AIZAWA  <[email protected]>
+
+	* encoding.c: document fix, change default script encoding.
+	  patched by @windwiny [Fixes GH-310]
+
 Sun May 19 17:29:07 2013  Akinori MUSHA  <[email protected]>
 
 	* lib/set.rb (Set#delete_if, Set#keep_if): Add comments.

diff --git a/encoding.c b/encoding.c
@@ -1700,7 +1700,7 @@ rb_enc_aliases(VALUE klass)
  * All Ruby script code has an associated Encoding which any String literal
  * created in the source code will be associated to.
  *
- * The default script encoding is <code>Encoding::US-ASCII</code>, but it can
+ * The default script encoding is <code>Encoding::UTF-8</code> after v2.0, but it can
  * be changed by a magic comment on the first line of the source code file (or
  * second line, if there is a shebang line on the first). The comment must
  * contain the word <code>coding</code> or <code>encoding</code>, followed