summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-24 03:33:47 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-24 03:33:47 +0000
commit345d52c8f57078afec56fd56703a19ce08cee1a6 (patch)
tree7d86b2485365260c398d36abf89becc6bc6ffab6
parentb9c0eba5a1cd5e6259978e61f24c7c28f48ca2c1 (diff)
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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/net/smtp.rb5
-rw-r--r--lib/open-uri.rb2
-rw-r--r--version.h6
4 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 347236e061..d1970d6cc8 100644
--- 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
index ca6b70669b..3c7af8008c 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -78,8 +78,9 @@ module Net
#
# 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
index 6e24b40ba5..3241c3b27a 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -72,7 +72,7 @@ end
# 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
index b416b9b7e8..e8247a726e 100644
--- 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"