aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-06 10:01:40 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-06 10:01:40 +0000
commit8d7e9e53437e696e9e121431e96d2755c2106f75 (patch)
treea1f654a30ffc3547e611630872c391496dd8ccfa
parent68b18291acc84bc4068e531d3085bfda8a5419de (diff)
downloadruby-8d7e9e53437e696e9e121431e96d2755c2106f75.tar.gz
fix typos
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--NEWS4
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 928751b92d..056567ff86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,7 +143,7 @@ Thu Dec 2 21:28:07 2010 NARUSE, Yui <naruse@ruby-lang.org>
Thu Dec 2 21:22:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (enc_alias_internal): free the copied key and
- return NULL when given key is already regisitered.
+ return NULL when given key is already registered.
* encoding.c (enc_alias): call set_encoding_const only when the
alias is not registered yet.
diff --git a/NEWS b/NEWS
index c37ec08463..3ce2151f44 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ with all sufficient information, see the ChangeLog file.
* rb_scan_args() is enhanced with support for option hash argument
extraction.
-* ruby_vm_at_exit() added. This enables extension libs to hool a VM
+* ruby_vm_at_exit() added. This enables extension libs to hook a VM
termination.
=== Library updates (outstanding ones only)
@@ -79,7 +79,7 @@ with all sufficient information, see the ChangeLog file.
* rexml
* [incompatible] support Ruby native encoding mechanism
- and iconv dependency is droped. This means encoding
+ and iconv dependency is dropped. This means encoding
methods (Document#encoding, XMLDecl#encoding,
Output#encoding and Source#encoding) return an Encoding
object instead of an encoding name.