summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-13 13:40:59 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-13 13:40:59 +0000
commit5a34781bd3ebfa5360d8a1ae8882d80a7f76478a (patch)
tree352151b8a85643ab973f066d4bb7102c4d501f56
parent00a1a0e4a56d995563220043f8ace74318748680 (diff)
merge revision(s) 40274:
* array.c: rdoc tweak for include? git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--array.c2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/array.c b/array.c
index 3c1a0b8fa6..cef9603bd4 100644
--- a/array.c
+++ b/array.c
@@ -3656,7 +3656,7 @@ rb_ary_hash(VALUE ary)
* ary.include?(object) -> true or false
*
* Returns +true+ if the given +object+ is present in +self+ (that is, if any
- * object <code>==</code> +object+), otherwise returns +false+.
+ * element <code>==</code> +object+), otherwise returns +false+.
*
* a = [ "a", "b", "c" ]
* a.include?("b") #=> true
diff --git a/version.h b/version.h
index 13d03f0d8b..e2536c6826 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-04-13"
-#define RUBY_PATCHLEVEL 120
+#define RUBY_PATCHLEVEL 121
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4