merges r29254 from trunk into ruby_1_9_2.

--
* string.c (rb_str_times): mentioned about Hash argument.  a patch
  from Daniel Bovensiepen at [ruby-core:32386].

* sprintf.c (get_hash): ditto, and fix typo.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/sprintf.c b/sprintf.c
index bf0d3d6fcf..319e68a956 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -422,13 +422,13 @@ get_hash(volatile VALUE *hash, int argc, const VALUE *argv)
  *     sprintf("%u", -123)                        #=> "-123"
  *
  *  For more complex formatting, Ruby supports a reference by name.
- *  %<name>s style uses format style, but ${name} style doesn't.
+ *  %<name>s style uses format style, but %{name} style doesn't.
  *
  *  Exapmles:
  *    sprintf("%<foo>d : %<bar>f" % { :foo => 1, :bar => 2 })
  *      #=> 1 : 2.000000
- *    sprintf("%d %{foo}" % { :foo => 'bar' })
- *      # => "%d bar"
+ *    sprintf("%{foo}f" % { :foo => 1 })
+ *      # => "1f"
  */
 
 VALUE