aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/tempfile.rb6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a316fd4c8..4053ac7a11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 13 11:39:43 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * lib/tempfile.rb: Fix typo. [fix GH-933] Patch by @Zorbash
+
Sat Jun 13 11:38:00 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* ext/openssl/ossl_ocsp.c: fix documentation on ocsp response cert status.
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 63d4f8c330..77f3e4ede3 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -302,8 +302,8 @@ class Tempfile < DelegateClass(File)
end
end
-# Creates a temporally file as usual File object (not Tempfile).
-# It don't use finalizer and delegation.
+# Creates a temporary file as usual File object (not Tempfile).
+# It doesn't use finalizer and delegation.
#
# If no block is given, this is similar to Tempfile.new except
# creating File instead of Tempfile.
@@ -313,7 +313,7 @@ end
# If a block is given, then a File object will be constructed,
# and the block is invoked with the object as the argument.
# The File object will be automatically closed and
-# the temporally file is removed after the block terminates.
+# the temporary file is removed after the block terminates.
# The call returns the value of the block.
#
# In any case, all arguments (+*args+) will be treated as Tempfile.new.