merge revision(s) 41348:

	* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Author: nagachika

ChangeLog

@@ -1,3 +1,7 @@
+Tue Jun 18 00:43:27 2013  Zachary Scott  <[email protected]>
+
+	* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1
+
 Tue Jun 18 00:34:57 2013  CHIKANAGA Tomoyuki  <[email protected]>
 
 merge revision(s) 41347: [Backport #5048] [Backport #5465] [Backport #8319]

version.h

@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-06-18"
-#define RUBY_PATCHLEVEL 223
+#define RUBY_PATCHLEVEL 224
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6

vm_backtrace.c

@@ -177,10 +177,27 @@ location_label(rb_backtrace_location_t *loc)
  *
  * Usually consists of method, class, module, etc names with decoration.
  *
- * For example, using +caller_locations.rb+ from Thread::Backtrace::Location
+ * Consider the following example:
+ *
+ *	def foo
+ *	  puts caller_locations(0).first.label
+ *
+ *	  1.times do
+ *	    puts caller_locations(0).first.label
+ *
+ *	    1.times do
+ *	      puts caller_locations(0).first.label
+ *	    end
+ *
+ *	  end
+ *	end
+ *
+ * The result of calling +foo+ is this:
+ *
+ *	label: foo
+ *	label: block in foo
+ *	label: block (2 levels) in foo
  *
- *	loc = c(0..1).first
- *	loc.label #=> a
  */
 static VALUE
 location_label_m(VALUE self)