summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-02 16:55:39 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-02 16:55:39 +0000
commit2d90c01a1e8e5076d29e292fa6ed607044389f4d (patch)
tree6bcabef77022286be4442cf7cde329fd89e69c69
parent5ab69337816b10557e5a1658a5fa980c790a4b48 (diff)
merge revision(s) r45495: [Backport #9662]
* README.EXT: fix typo. [ruby-core:61634] [Bug #9662] * README.EXT.ja: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--README.EXT2
-rw-r--r--README.EXT.ja2
-rw-r--r--version.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/README.EXT b/README.EXT
index b1a816c271..6f7340ceda 100644
--- a/README.EXT
+++ b/README.EXT
@@ -650,7 +650,7 @@ Here's the example of an initializing function.
{
/* define DBM class */
cDBM = rb_define_class("DBM", rb_cObject);
- /* DBM includes Enumerate module */
+ /* DBM includes Enumerable module */
rb_include_module(cDBM, rb_mEnumerable);
/* DBM has class method open(): arguments are received as C array */
diff --git a/README.EXT.ja b/README.EXT.ja
index b4b59008e0..5ccc9306d1 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -726,7 +726,7 @@ Rubyは拡張ライブラリをロードする時に「Init_ライブラリ名
{
/* DBMクラスを定義する */
cDBM = rb_define_class("DBM", rb_cObject);
- /* DBMはEnumerateモジュールをインクルードする */
+ /* DBMはEnumerableモジュールをインクルードする */
rb_include_module(cDBM, rb_mEnumerable);
/* DBMクラスのクラスメソッドopen(): 引数はCの配列で受ける */
diff --git a/version.h b/version.h
index f555f9316e..46a11e1f86 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-07-03"
-#define RUBY_PATCHLEVEL 160
+#define RUBY_PATCHLEVEL 161
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 7