naruse	2017-03-13 01:28:42 +0900 (Mon, 13 Mar 2017)

  New Revision: 57926

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57926

  Log:
    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]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/lib/optparse.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/lib/optparse.rb
===================================================================
--- ruby_2_4/lib/optparse.rb	(revision 57925)
+++ ruby_2_4/lib/optparse.rb	(revision 57926)
@@ -2151,4 +2151,5 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_4/lib/optparse.rb#L2151
 # ARGV is arguable by OptionParser
 ARGV.extend(OptionParser::Arguable)
 
-OptParse = OptionParser
+# An alias for OptionParser.
+OptParse = OptionParser  # :nodoc:
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57925)
+++ ruby_2_4/version.h	(revision 57926)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #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

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57775


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/