nagachika	2013-03-09 22:08:27 +0900 (Sat, 09 Mar 2013)

  New Revision: 39660

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/rexml/document.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39659)
+++ ruby_2_0_0/ChangeLog	(revision 39660)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Mar  9 22:07:53 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
+	  fix a typo in comment in r39384.
+
 Sat Mar  9 21:52:19 2013  Zachary Scott  <zachary@z...>
 
 	* numeric.c: Examples and formatting for Numeric and Float
Index: ruby_2_0_0/lib/rexml/document.rb
===================================================================
--- ruby_2_0_0/lib/rexml/document.rb	(revision 39659)
+++ ruby_2_0_0/lib/rexml/document.rb	(revision 39660)
@@ -262,7 +262,7 @@ module REXML https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rexml/document.rb#L262
       @@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.
     def Document::entity_expansion_text_limit
       return @@entity_expansion_text_limit
     end
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39659)
+++ ruby_2_0_0/version.h	(revision 39660)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 29
+#define RUBY_PATCHLEVEL 30
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

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


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