merge revision(s) 39388: [Backport #9368]

* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit): fix a typo in comment in r39384. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Jan 29, 2014 · 672deab · 672deab
1 parent 21d29b3
commit 672deab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 29 12:35:37 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
+	  fix a typo in comment in r39384.
+
 Thu Jan  9 14:27:25 2014  Aman Gupta <ruby@tmm1.net>
 
 	* test/net/imap/cacert.pem: generate new CA cert, since the last one

diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb
@@ -224,7 +224,7 @@ def Document::entity_expansion_text_limit=( val )
       REXML.entity_expansion_text_limit = val
     end
 
-    # Get the entity expansion limit. By default the limit is set to 10000.
+    # Get the entity expansion limit. By default the limit is set to 10240.
     #
     # Deprecated. Use REXML.entity_expansion_text_limit instead.
     def Document::entity_expansion_text_limit

diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 489
+#define RUBY_PATCHLEVEL 490
 
-#define RUBY_RELEASE_DATE "2014-01-09"
+#define RUBY_RELEASE_DATE "2014-01-29"
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 29
 
 #include "ruby/version.h"