usa	2014-01-29 12:35:43 +0900 (Wed, 29 Jan 2014)

  New Revision: 44735

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44735

  Log:
    merge revision(s) 39388: [Backport #9368]
    
    * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
      fix a typo in comment in r39384.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/rexml/document.rb
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 44734)
+++ ruby_1_9_3/ChangeLog	(revision 44735)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Wed Jan 29 12:35:37 2014  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* 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@t...>
 
 	* test/net/imap/cacert.pem: generate new CA cert, since the last one
Index: ruby_1_9_3/lib/rexml/document.rb
===================================================================
--- ruby_1_9_3/lib/rexml/document.rb	(revision 44734)
+++ ruby_1_9_3/lib/rexml/document.rb	(revision 44735)
@@ -224,7 +224,7 @@ module REXML https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/rexml/document.rb#L224
       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
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 44734)
+++ ruby_1_9_3/version.h	(revision 44735)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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"
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39388


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/