nagachika	2013-03-09 21:47:17 +0900 (Sat, 09 Mar 2013)

  New Revision: 39657

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

  Log:
    merge revision(s) 39365:
    
    * doc/globals.rdoc:  Document what setting $DEBUG does.
    
    * doc/globals.rdoc:  Added pointer to $-d 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 39656)
+++ ruby_2_0_0/doc/globals.rdoc	(revision 39657)
@@ -25,7 +25,11 @@ $$::   The process number of the Ruby ru https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/doc/globals.rdoc#L25
 $?::   The status of the last executed child process.
 $:::   Load path for scripts and binary modules by load or require.
 $"::   The array contains the module names loaded by require.
-$DEBUG::     The status of the -d switch.
+$DEBUG::     The debug flag, which is set by the -d switch.  Enabling debug
+             output prints each exception raised to $stderr (but not its
+             backtrace).  Setting this to a true value enables debug output as
+             if -d were given on the command line.  Setting this to a false
+             value disables debug output.
 $FILENAME::  Current input file from $<. Same as $<.filename.
 $LOAD_PATH:: The alias to the $:.
 $stderr::    The current standard error output.
@@ -37,7 +41,7 @@ $VERBOSE::   The verbose flag, which is https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/doc/globals.rdoc#L41
              including from Kernel#warn.
 $-0::  The alias to $/.
 $-a::  True if option -a is set. Read-only variable.
-$-d::  The alias to $DEBUG.
+$-d::  The alias of $DEBUG.  See $DEBUG above for further discusison.
 $-F::  The alias to $;.
 $-i::  In in-place-edit mode, this variable holds the extension, otherwise nil.
 $-I::  The alias to $:.
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39656)
+++ ruby_2_0_0/ChangeLog	(revision 39657)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Mar  9 21:46:41 2013  Eric Hodel  <drbrain@s...>
+
+	* doc/globals.rdoc:  Document what setting $DEBUG does.
+
+	* doc/globals.rdoc:  Added pointer to $-d for full documentation.
+
 Sat Mar  9 21:45:38 2013  Eric Hodel  <drbrain@s...>
 
 	* doc/globals.rdoc:  Document what setting $VERBOSE does.  [Bug #7899]
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39656)
+++ ruby_2_0_0/version.h	(revision 39657)
@@ -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 26
+#define RUBY_PATCHLEVEL 27
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39365


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