yugui	2010-11-24 18:37:15 +0900 (Wed, 24 Nov 2010)

  New Revision: 29913

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

  Log:
    merges r29269 from trunk into ruby_1_9_2.
    --
    * sprintf.c (rb_f_sprintf): fix rdoc.  pointed out by Tomoyuki
      Chikanaga at [ruby-core:32395], and a patch from Daniel
      Bovensiepen at [ruby-core:32403].

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/sprintf.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29912)
+++ ruby_1_9_2/ChangeLog	(revision 29913)
@@ -1,3 +1,9 @@
+Thu Sep 16 08:30:28 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* sprintf.c (rb_f_sprintf): fix rdoc.  pointed out by Tomoyuki
+	  Chikanaga at [ruby-core:32395], and a patch from Daniel
+	  Bovensiepen at [ruby-core:32403].
+
 Thu Sep 16 08:27:36 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
Index: ruby_1_9_2/sprintf.c
===================================================================
--- ruby_1_9_2/sprintf.c	(revision 29912)
+++ ruby_1_9_2/sprintf.c	(revision 29913)
@@ -425,9 +425,9 @@
  *  %<name>s style uses format style, but %{name} style doesn't.
  *
  *  Exapmles:
- *    sprintf("%<foo>d : %<bar>f" % { :foo => 1, :bar => 2 })
+ *    sprintf("%<foo>d : %<bar>f", { :foo => 1, :bar => 2 })
  *      #=> 1 : 2.000000
- *    sprintf("%{foo}f" % { :foo => 1 })
+ *    sprintf("%{foo}f", { :foo => 1 })
  *      # => "1f"
  */
 
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29912)
+++ ruby_1_9_2/version.h	(revision 29913)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 45
+#define RUBY_PATCHLEVEL 46
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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