ruby-changes:32901
From: nagachika <ko1@a...>
Date: Sun, 16 Feb 2014 00:45:20 +0900 (JST)
Subject: [ruby-changes:32901] nagachika:r44980 (ruby_2_0_0): merge revision(s) r44585: [Backport #9268]
nagachika 2014-02-16 00:45:14 +0900 (Sun, 16 Feb 2014) New Revision: 44980 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44980 Log: merge revision(s) r44585: [Backport #9268] * lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis Fixes the following bugs: [Bug #9152] [Bug #9268] [Bug #9394] * lib/open-uri.rb: ditto Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/lib/net/smtp.rb branches/ruby_2_0_0/lib/open-uri.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 44979) +++ ruby_2_0_0/ChangeLog (revision 44980) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Sun Feb 16 00:44:51 2014 Zachary Scott <e@z...> + + * lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis + Fixes the following bugs: [Bug #9152] [Bug #9268] [Bug #9394] + * lib/open-uri.rb: ditto + Sun Feb 16 00:27:04 2014 Masaki Matsushita <glass.saga@g...> * hash.c (rb_hash_assoc): revert r42224. table->type->compare is Index: ruby_2_0_0/lib/open-uri.rb =================================================================== --- ruby_2_0_0/lib/open-uri.rb (revision 44979) +++ ruby_2_0_0/lib/open-uri.rb (revision 44980) @@ -73,7 +73,7 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/open-uri.rb#L73 # The environment variables such as http_proxy, https_proxy and ftp_proxy # are in effect by default. Here we disable proxy: # -# open("http://www.ruby-lang.org/en/raa.html", :proxy => nil) {|f| +# open("http://www.ruby-lang.org/en/", :proxy => nil) {|f| # # ... # } # Index: ruby_2_0_0/lib/net/smtp.rb =================================================================== --- ruby_2_0_0/lib/net/smtp.rb (revision 44979) +++ ruby_2_0_0/lib/net/smtp.rb (revision 44980) @@ -76,8 +76,9 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/smtp.rb#L76 # # This library does NOT provide functions to compose internet mails. # You must create them by yourself. If you want better mail support, - # try RubyMail or TMail. You can get both libraries from RAA. - # (http://www.ruby-lang.org/en/raa.html) + # try RubyMail or TMail or search for alternatives in + # {RubyGems.org}[https://rubygems.org/] or {The Ruby + # Toolbox}[https://www.ruby-toolbox.com/]. # # FYI: the official documentation on internet mail is: [RFC2822] (http://www.ietf.org/rfc/rfc2822.txt). # Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 44979) +++ ruby_2_0_0/version.h (revision 44980) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-02-16" -#define RUBY_PATCHLEVEL 414 +#define RUBY_PATCHLEVEL 415 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r44585 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/