nagachika	2013-04-25 00:38:37 +0900 (Thu, 25 Apr 2013)

  New Revision: 40444

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40444

  Log:
    merge revision(s) 40431:
    
    * ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/socket/lib/socket.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40443)
+++ ruby_2_0_0/ChangeLog	(revision 40444)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Apr 25 00:38:06 2013  Zachary Scott  <zachary@z...>
+
+	* ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]
+
 Tue Apr 23 23:06:43 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_method.c (rb_mod_public_method): fix visibility on anonymous
Index: ruby_2_0_0/ext/socket/lib/socket.rb
===================================================================
--- ruby_2_0_0/ext/socket/lib/socket.rb	(revision 40443)
+++ ruby_2_0_0/ext/socket/lib/socket.rb	(revision 40444)
@@ -413,7 +413,7 @@ class Socket < BasicSocket https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/lib/socket.rb#L413
   # The value of the block is returned.
   # The socket is closed when this method returns.
   #
-  # If _port_ is 0, actual port number is choosen dynamically.
+  # If _port_ is 0, actual port number is chosen dynamically.
   # However all sockets in the result has same port number.
   #
   #   # tcp_server_sockets returns two sockets.
@@ -425,7 +425,7 @@ class Socket < BasicSocket https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/lib/socket.rb#L425
   #   #=> #<Addrinfo: [::]:1296 TCP>
   #   #   #<Addrinfo: 0.0.0.0:1296 TCP>
   #
-  #   # IPv6 and IPv4 socket has same port number, 53114, even if it is choosen dynamically.
+  #   # IPv6 and IPv4 socket has same port number, 53114, even if it is chosen dynamically.
   #   sockets = Socket.tcp_server_sockets(0)
   #   sockets.each {|s| p s.local_address }
   #   #=> #<Addrinfo: [::]:53114 TCP>
@@ -555,8 +555,8 @@ class Socket < BasicSocket https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/lib/socket.rb#L555
   # The value of the block is returned.
   # The sockets are closed when this method returns.
   #
-  # If _port_ is zero, some port is choosen.
-  # But the choosen port is used for the all sockets.
+  # If _port_ is zero, some port is chosen.
+  # But the chosen port is used for the all sockets.
   #
   #   # UDP/IP echo server
   #   Socket.udp_server_sockets(0) {|sockets|
@@ -718,9 +718,9 @@ class Socket < BasicSocket https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/lib/socket.rb#L718
 
   # UDP/IP address information used by Socket.udp_server_loop.
   class UDPSource
-    # +remote_adress+ is an Addrinfo object.
+    # +remote_address+ is an Addrinfo object.
     #
-    # +local_adress+ is an Addrinfo object.
+    # +local_address+ is an Addrinfo object.
     #
     # +reply_proc+ is a Proc used to send reply back to the source.
     def initialize(remote_address, local_address, &reply_proc)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40443)
+++ ruby_2_0_0/version.h	(revision 40444)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-04-23"
-#define RUBY_PATCHLEVEL 163
+#define RUBY_RELEASE_DATE "2013-04-25"
+#define RUBY_PATCHLEVEL 164
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40431


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/