merge revision(s) 44585: [Backport ruby#9268]

	* lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis
	  Fixes the following bugs: [Bug ruby#9152] [Bug ruby#9268] [Bug ruby#9394]

	* lib/open-uri.rb: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Author: nurse

ChangeLog

@@ -1,3 +1,9 @@
+Sat Feb 22 14:31:23 2014  Zachary Scott  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* lib/resolv.rb: Ignore name servers which cause EAFNOSUPPORT on

lib/net/smtp.rb

@@ -76,8 +76,9 @@ class SMTPUnsupportedCommand < ProtocolError
   #
   # 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).
   #

lib/open-uri.rb

@@ -73,7 +73,7 @@ def open(name, *rest, &block) # :doc:
 # 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|
 #     # ...
 #   }
 #

version.h

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