archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 40431:

Browse source 
* ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-04-24 15:38:37 +00:00
parent c967493b65
commit 1914720cba
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Apr 25 00:38:06 2013 Zachary Scott <zachary@zacharyscott.net>
* ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]
Tue Apr 23 23:06:43 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_method.c (rb_mod_public_method): fix visibility on anonymous

12
ext/socket/lib/socket.rb
View file

@ -413,7 +413,7 @@ class Socket < BasicSocket
# 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
# #=> #<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
# 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
# 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)

6
version.h
View file

@ -1,10 +1,10 @@
#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"