From 488a07de474feff400dad1e133fcc0dfa1fc2f17 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 12 Mar 2017 16:28:42 +0000
Subject: merge revision(s) 57775: [Backport #13281]

	nodoc OptParse

	* lib/optparse.rb: [DOC] nodoc OptParse, introduced with r46126,
	  to avoid leaking of its documentation (OptionParser's docs) into
	  the class documentation of Object.  [ruby-core:79909] [Bug #13281]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/optparse.rb | 3 ++-
 version.h       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/optparse.rb b/lib/optparse.rb
index afeff80740..d887e2f98d 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -2151,4 +2151,5 @@ end
 # ARGV is arguable by OptionParser
 ARGV.extend(OptionParser::Arguable)
 
-OptParse = OptionParser
+# An alias for OptionParser.
+OptParse = OptionParser  # :nodoc:
diff --git a/version.h b/version.h
index 13e3a1410d..41b9a7381d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-13"
-#define RUBY_PATCHLEVEL 81
+#define RUBY_PATCHLEVEL 82
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
-- 
cgit v1.2.3