usa	2017-03-26 03:28:27 +0900 (Sun, 26 Mar 2017)

  New Revision: 58122

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

  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_2/
  Modified files:
    branches/ruby_2_2/lib/optparse.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 58121)
+++ ruby_2_2/version.h	(revision 58122)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.7"
 #define RUBY_RELEASE_DATE "2017-03-26"
-#define RUBY_PATCHLEVEL 454
+#define RUBY_PATCHLEVEL 455
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/lib/optparse.rb
===================================================================
--- ruby_2_2/lib/optparse.rb	(revision 58121)
+++ ruby_2_2/lib/optparse.rb	(revision 58122)
@@ -2000,4 +2000,5 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/optparse.rb#L2000
 # ARGV is arguable by OptionParser
 ARGV.extend(OptionParser::Arguable)
 
-OptParse = OptionParser
+# An alias for OptionParser.
+OptParse = OptionParser  # :nodoc:

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


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