diff --git a/ChangeLog b/ChangeLog
index 03dfdf62ef..a4cfc98d4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 20 12:30:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib: fixed typo.  a patch by Sho Hashimoto in [ruby-dev:40716].
+
 Fri Mar 19 17:12:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.h (RSTRING_*, RARRAY_*, RREGEXP_*, RSTRUCT_*, RBIGNUM_*):
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 8598cff6c6..deb3caaaf3 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1690,7 +1690,7 @@ class CGI
     #   image_button("url", "name", "string")
     #     # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string">
     # 
-    #   image_button("SRC" => "url", "ATL" => "strng")
+    #   image_button("SRC" => "url", "ATL" => "string")
     #     # <INPUT TYPE="image" SRC="url" ALT="string">
     def image_button(src = "", name = nil, alt = nil)
       attributes = if src.kind_of?(String)
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index fe963e406c..0f5fc0654b 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -434,7 +434,7 @@ class IPAddr
   # automatically from a specified string, you can specify one
   # explicitly by the optional second argument.
   # 
-  # Otherwise an IP addess is generated from a packed in_addr value
+  # Otherwise an IP address is generated from a packed in_addr value
   # and an address family.
   #
   # The IPAddr class defines many methods and operators, and some of
@@ -462,7 +462,7 @@ class IPAddr
     #Socket.getaddrinfo(left, nil, Socket::AF_INET6, Socket::SOCK_STREAM, nil,
     #		       Socket::AI_NUMERICHOST)
     begin
-      IPSocket.getaddress(prefix)		# test if address is vaild
+      IPSocket.getaddress(prefix)		# test if address is valid
     rescue
       raise ArgumentError, "invalid address"
     end
diff --git a/lib/irb/notifier.rb b/lib/irb/notifier.rb
index 0f79bc5a8d..dc472bc2ab 100644
--- a/lib/irb/notifier.rb
+++ b/lib/irb/notifier.rb
@@ -26,7 +26,7 @@ module IRB
     end
     module_function :def_notifier
   
-    class AbstructNotifier
+    class AbstractNotifier
       def initialize(prefix, base_notifier)
 	@prefix = prefix
 	@base_notifier = base_notifier
@@ -73,7 +73,7 @@ module IRB
       end
     end
 
-    class CompositeNotifier<AbstructNotifier
+    class CompositeNotifier<AbstractNotifier
       def initialize(prefix, base_notifier)
 	super
 
@@ -94,7 +94,7 @@ module IRB
 
       def level_notifier=(value)
 	case value
-	when AbstructNotifier
+	when AbstractNotifier
 	  @level_notifier = value
 	when Integer
 	  l = @notifiers[value]
@@ -108,7 +108,7 @@ module IRB
       alias level= level_notifier=
     end
 
-    class LeveledNotifier<AbstructNotifier
+    class LeveledNotifier<AbstractNotifier
       include Comparable
 
       def initialize(base, level, prefix)
@@ -141,5 +141,14 @@ module IRB
     end
 
     D_NOMSG = NoMsgNotifier.new
+
+    def self.const_missing(name)
+      if name == :AbstructNotifier
+        warn "#{caller[0]}: fix typo: use AbstractNotifier instead of AbstructNotifier"
+        AbstractNotifier
+      else
+        super
+      end
+    end
   end
 end
diff --git a/lib/irb/output-method.rb b/lib/irb/output-method.rb
index b9a3a8851e..ae712697cb 100644
--- a/lib/irb/output-method.rb
+++ b/lib/irb/output-method.rb
@@ -1,5 +1,5 @@
 #
-#   output-method.rb - optput methods used by irb 
+#   output-method.rb - output methods used by irb 
 #   	$Release Version: 0.9.5$
 #   	$Revision$
 #   	$Date$
diff --git a/lib/net/https.rb b/lib/net/https.rb
index 7847c3ffea..df72469e2f 100644
--- a/lib/net/https.rb
+++ b/lib/net/https.rb
@@ -81,7 +81,7 @@ It can be replaced by the following code:
 
 : verify_mode, verify_mode=((|mode|))
     Sets the flags for server the certification verification at
-    begining of SSL/TLS session.
+    beginning of SSL/TLS session.
     OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable.
 
 : verify_callback, verify_callback=((|proc|))
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index b58e73029b..e6a4a8699d 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -118,7 +118,7 @@ module Net
   #     Net::SMTP.start('your.smtp.server', 25) do |smtp|
   #       smtp.send_message msgstr,
   #                         'your@mail.address',
-  #                         'his_addess@example.com'
+  #                         'his_address@example.com'
   #     end
   # 
   # === Closing the Session
diff --git a/lib/optparse.rb b/lib/optparse.rb
index d19e940067..bece659ec5 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1565,7 +1565,7 @@ class OptionParser
   yesno = CompletingHash.new
   %w[- no false].each {|el| yesno[el] = false}
   %w[+ yes true].each {|el| yesno[el] = true}
-  yesno['nil'] = false          # shoud be nil?
+  yesno['nil'] = false          # should be nil?
   accept(TrueClass, yesno) {|arg, val| val == nil or val}
   #
   # Similar to TrueClass, but defaults to false.
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb
index 7e9b4e5e1a..919df02b10 100644
--- a/lib/rexml/entity.rb
+++ b/lib/rexml/entity.rb
@@ -25,7 +25,7 @@ module REXML
 		# Create a new entity.  Simple entities can be constructed by passing a
 		# name, value to the constructor; this creates a generic, plain entity
 		# reference. For anything more complicated, you have to pass a Source to
-		# the constructor with the entity definiton, or use the accessor methods.
+		# the constructor with the entity definition, or use the accessor methods.
 		# +WARNING+: There is no validation of entity state except when the entity
 		# is read from a stream.  If you start poking around with the accessors,
 		# you can easily create a non-conformant Entity.  The best thing to do is
diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
index b0e4fb70db..87575bcb18 100644
--- a/lib/shell/command-processor.rb
+++ b/lib/shell/command-processor.rb
@@ -31,7 +31,7 @@ class Shell
 
       install_builtin_commands
 
-      # define CommandProccessor#methods to Shell#methods and Filter#methods
+      # define CommandProcessor#methods to Shell#methods and Filter#methods
       for m in CommandProcessor.instance_methods(false) - NoDelegateMethods
 	add_delegate_command_to_shell(m)
       end
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
index 8929805506..04a1b5b302 100644
--- a/lib/shell/process-controller.rb
+++ b/lib/shell/process-controller.rb
@@ -234,10 +234,10 @@ class Shell
 	  Thread.critical = false
 	  _pid = Process.waitpid(pid, nil)
 	rescue Errno::ECHILD
-	  command.notify "warn: job(%id) was done already waitipd."
+	  command.notify "warn: job(%id) was done already waitpid."
 	  _pid = true
 	ensure
-	  # when the process ends, wait until the command termintes
+	  # when the process ends, wait until the command terminates
 	  if _pid
 	  else
 	    command.notify("notice: Process finishing...",
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 95d294a85d..35565a8afe 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -3,7 +3,7 @@
 #   	$Release Version: 0.9 $
 #   	$Revision: 1.3 $
 #   	$Date: 1998/06/26 03:19:34 $
-#   	by Keiju ISHITSUKA(Nihpon Rational Software Co.,Ltd.)
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd.)
 #
 # --
 #  feature:
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
index 0ee88c8c8f..9234aeec15 100644
--- a/lib/xmlrpc/server.rb
+++ b/lib/xmlrpc/server.rb
@@ -132,8 +132,8 @@ the same class.
        server.set_service_hook {|obj, *args|
          begin
            ret = obj.call(*args)  # call the original service-method
-           # could convert the return value 
-         resuce
+           # could convert the return value
+         rescue
            # rescue exceptions
          end
        }
diff --git a/version.h b/version.h
index 68fead4911..61025c6cb3 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-03-19"
+#define RUBY_RELEASE_DATE "2010-03-20"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100319
+#define RUBY_RELEASE_CODE 20100320
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 20
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];