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
This commit is contained in:
nagachika 2013-03-09 13:08:27 +00:00
parent 2cec010eec
commit c6a99bc5a0
3 changed files with 7 additions and 2 deletions

View file

@ -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> Sat Mar 9 21:52:19 2013 Zachary Scott <zachary@zacharyscott.net>
* numeric.c: Examples and formatting for Numeric and Float * numeric.c: Examples and formatting for Numeric and Float

View file

@ -262,7 +262,7 @@ module REXML
@@entity_expansion_text_limit = val @@entity_expansion_text_limit = val
end 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 def Document::entity_expansion_text_limit
return @@entity_expansion_text_limit return @@entity_expansion_text_limit
end end

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-03-09" #define RUBY_RELEASE_DATE "2013-03-09"
#define RUBY_PATCHLEVEL 29 #define RUBY_PATCHLEVEL 30
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3