nagachika	2013-03-09 21:45:57 +0900 (Sat, 09 Mar 2013)

  New Revision: 39656

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39656

  Log:
    merge revision(s) 39364:
    
    * doc/globals.rdoc:  Document what setting $VERBOSE does.  [Bug #7899]
    
    * doc/globals.rdoc:  Added pointer to $-w and $-v for full
      documentation.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/doc/globals.rdoc
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/doc/globals.rdoc
===================================================================
--- ruby_2_0_0/doc/globals.rdoc	(revision 39655)
+++ ruby_2_0_0/doc/globals.rdoc	(revision 39656)
@@ -31,7 +31,10 @@ $LOAD_PATH:: The alias to the $:. https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/doc/globals.rdoc#L31
 $stderr::    The current standard error output.
 $stdin::     The current standard input.
 $stdout::    The current standard output.
-$VERBOSE::   The verbose flag, which is set by the -v switch.
+$VERBOSE::   The verbose flag, which is set by the -w or -v switch.  Setting
+             this to a true value enables warnings as if -w or -v were given
+             on the command line.  Setting this to nil disables warnings,
+             including from Kernel#warn.
 $-0::  The alias to $/.
 $-a::  True if option -a is set. Read-only variable.
 $-d::  The alias to $DEBUG.
@@ -40,8 +43,8 @@ $-i::  In in-place-edit mode, this varia https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/doc/globals.rdoc#L43
 $-I::  The alias to $:.
 $-l::  True if option -l is set. Read-only variable.
 $-p::  True if option -p is set. Read-only variable.
-$-v::  The alias to $VERBOSE.
-$-w::  True if option -w is set.
+$-v::  An alias of $VERBOSE.  See $VERBOSE above for further discussion.
+$-w::  An alias of $VERBOSE.  See $VERBOSE above for further discussion.
 
 == Pre-defined global constants
 
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39655)
+++ ruby_2_0_0/ChangeLog	(revision 39656)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Mar  9 21:45:38 2013  Eric Hodel  <drbrain@s...>
+
+	* doc/globals.rdoc:  Document what setting $VERBOSE does.  [Bug #7899]
+
+	* doc/globals.rdoc:  Added pointer to $-w and $-v for full
+	  documentation.
+
 Sat Mar  9 21:29:45 2013  Naohisa Goto  <ngotogenome@g...>
 
 	* signal.c (ruby_abort): fix typo in r39354 [Bug #5014]
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39655)
+++ ruby_2_0_0/version.h	(revision 39656)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 25
+#define RUBY_PATCHLEVEL 26
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39362-39364


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