summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-07 03:49:23 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-07 03:49:23 +0000
commita30ba8d76426f821cbf63e2398c2d1f1ab431254 (patch)
tree008304774b79c00d556bae8885db6b5c9d3bafb7
parentc579174a367e3ac04f4504b3e10a5a6910af1673 (diff)
merge revision(s) 45896: [Backport #9773]
* man/ruby.1: remove deadlink. [ruby-core:62145][Bug #9773] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--man/ruby.12
-rw-r--r--version.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ea04d51da..8274767d79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 7 12:49:10 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * man/ruby.1: remove deadlink. [ruby-core:62145][Bug #9773]
+
Mon Jul 7 12:46:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* struct.c (not_a_member): extract name error and use same error
diff --git a/man/ruby.1 b/man/ruby.1
index 3a60215365..84f6bf47d7 100644
--- a/man/ruby.1
+++ b/man/ruby.1
@@ -493,8 +493,6 @@ The official web site.
hosting many open source ruby projects.
.It http://raa.ruby-lang.org
Ruby Application Archive.
-.It https://github.com/languages/Ruby
-Ruby projects on Github.
.El
.Pp
.Sh REPORTING BUGS
diff --git a/version.h b/version.h
index 2b833b9642..c24df8dce5 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-07-07"
-#define RUBY_PATCHLEVEL 525
+#define RUBY_PATCHLEVEL 526
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 7