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

unak · unak · commit 345d52c8f570 · 2014-02-24T03:33:47.000Z
* 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_1_9_3@45154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 24 12:33:38 2014  Zachary Scott  <e@zzak.io>
+
+	* 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 19:14:25 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/io/console/console.c (console_dev): need read access for conout$
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
@@ -78,8 +78,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).
   #
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
@@ -72,7 +72,7 @@ def open(name, *rest, &block) # :doc:
 # The environment variables such as http_proxy, https_proxy and ftp_proxy
 # are in effect by default.  :proxy => nil disables proxy.
 #
-#   open("http://www.ruby-lang.org/en/raa.html", :proxy => nil) {|f|
+#   open("http://www.ruby-lang.org/en/", :proxy => nil) {|f|
 #     # ...
 #   }
 #
diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 542
+#define RUBY_PATCHLEVEL 543
 
-#define RUBY_RELEASE_DATE "2014-02-22"
+#define RUBY_RELEASE_DATE "2014-02-24"
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
 

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,9 @@ class SMTPUnsupportedCommand < ProtocolError`
`78`	`78`	`#`
`79`	`79`	`# This library does NOT provide functions to compose internet mails.`
`80`	`80`	`# You must create them by yourself. If you want better mail support,`
`81`		`- # try RubyMail or TMail. You can get both libraries from RAA.`
`82`		`- # (http://www.ruby-lang.org/en/raa.html)`
	`81`	`+ # try RubyMail or TMail or search for alternatives in`
	`82`	`+ # {RubyGems.org}[https://rubygems.org/] or {The Ruby`
	`83`	`+ # Toolbox}[https://www.ruby-toolbox.com/].`
`83`	`84`	`#`
`84`	`85`	`# FYI: the official documentation on internet mail is: [RFC2822] (http://www.ietf.org/rfc/rfc2822.txt).`
`85`	`86`	`#`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ def open(name, *rest, &block) # :doc:`
`72`	`72`	`# The environment variables such as http_proxy, https_proxy and ftp_proxy`
`73`	`73`	`# are in effect by default. :proxy => nil disables proxy.`
`74`	`74`	`#`
`75`		`-# open("http://www.ruby-lang.org/en/raa.html", :proxy => nil) {\|f\|`
	`75`	`+# open("http://www.ruby-lang.org/en/", :proxy => nil) {\|f\|`
`76`	`76`	`# # ...`
`77`	`77`	`# }`
`78`	`78`	`#`