naruse	2014-02-22 14:39:58 +0900 (Sat, 22 Feb 2014)

  New Revision: 45111

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

  Log:
    merge revision(s) 44585: [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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/net/smtp.rb
    branches/ruby_2_1/lib/open-uri.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45110)
+++ ruby_2_1/ChangeLog	(revision 45111)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 14:31:23 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
+
 Sat Feb 22 14:18:35 2014  Tanaka Akira  <akr@f...>
 
 	* lib/resolv.rb: Ignore name servers which cause EAFNOSUPPORT on
Index: ruby_2_1/lib/open-uri.rb
===================================================================
--- ruby_2_1/lib/open-uri.rb	(revision 45110)
+++ ruby_2_1/lib/open-uri.rb	(revision 45111)
@@ -73,7 +73,7 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_1/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_1/lib/net/smtp.rb
===================================================================
--- ruby_2_1/lib/net/smtp.rb	(revision 45110)
+++ ruby_2_1/lib/net/smtp.rb	(revision 45111)
@@ -76,8 +76,9 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_1/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_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45110)
+++ ruby_2_1/version.h	(revision 45111)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 55
+#define RUBY_PATCHLEVEL 56
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44585


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