merge revision(s) 39388:

	* 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_2_0_0@39660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 62a706f907..b02115f607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar  9 22:07:53 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* 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@zacharyscott.net>
 
 	* numeric.c: Examples and formatting for Numeric and Float
diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb
index c5280374ca..9daa86e6c9 100644
--- a/lib/rexml/document.rb
+++ b/lib/rexml/document.rb
@@ -262,7 +262,7 @@ module 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.
     def Document::entity_expansion_text_limit
       return @@entity_expansion_text_limit
     end
diff --git a/version.h b/version.h
index d9fe31c4d6..dfcf4dcefc 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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