yugui	2011-05-29 08:31:24 +0900 (Sun, 29 May 2011)

  New Revision: 31768

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

  Log:
    merges r30975 from trunk into ruby_1_9_2.
    --
    * lib/tempfile.rb: Fix example file paths in docs for tempfile.
      https://github.com/ruby/ruby/pull/5

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/tempfile.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31767)
+++ ruby_1_9_2/ChangeLog	(revision 31768)
@@ -1,3 +1,8 @@
+Mon Feb 28 13:02:15 2011  Danial Pearce <github@t...>
+
+	* lib/tempfile.rb: Fix example file paths in docs for tempfile.
+	  https://github.com/ruby/ruby/pull/5
+
 Mon Feb 21 10:54:29 2011  Aaron Patterson <aaron@t...>
 
 	* ext/psych/lib/psych/json/stream.rb: do not emit custom tags in maps
Index: ruby_1_9_2/lib/tempfile.rb
===================================================================
--- ruby_1_9_2/lib/tempfile.rb	(revision 31767)
+++ ruby_1_9_2/lib/tempfile.rb	(revision 31768)
@@ -96,11 +96,11 @@
   # element, and end with the second element. For example:
   #
   #   file = Tempfile.new('hello')
-  #   file.path  # => something like: "/tmp/foo????-????-????9382--0"
+  #   file.path  # => something like: "/tmp/hello????-????-????9382--0"
   #
   #   # Use the Array form to enforce an extension in the filename:
   #   file = Tempfile.new(['hello', '.jpg'])
-  #   file.path  # => something like: "/tmp/foo????-????-????9382--0.jpg"
+  #   file.path  # => something like: "/tmp/hello????-????-????9382--0.jpg"
   #
   # The temporary file will be placed in the directory as specified
   # by the +tmpdir+ parameter. By default, this is +Dir.tmpdir+.
@@ -110,7 +110,7 @@
   # come from environment variables (e.g. <tt>$TMPDIR</tt>).
   #
   #   file = Tempfile.new('hello', '/home/aisaka')
-  #   file.path  # => something like: "/home/aisaka/foo????-????-????9382--0"
+  #   file.path  # => something like: "/home/aisaka/hello????-????-????9382--0"
   #
   # You can also pass an options hash. Under the hood, Tempfile creates
   # the temporary file using +File.open+. These options will be passed to
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31767)
+++ ruby_1_9_2/version.h	(revision 31768)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 206
+#define RUBY_PATCHLEVEL 207
 #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/