summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--process.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 24a3c5174e..078ddcfa91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 03 15:50:12 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+
+ * process.c: Fix typo. patch from Aviv Ben-Yosef.
+
Tue Jan 3 13:43:37 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* tool/merger.rb: allow r0123 style revision number.
diff --git a/process.c b/process.c
index b3bdc8d8c8..11fb0d81fb 100644
--- a/process.c
+++ b/process.c
@@ -3277,7 +3277,7 @@ rb_f_system(int argc, VALUE *argv)
* This is different from fd.
* For example, :err=>:out means redirecting child stderr to parent stdout.
* But :err=>[:child, :out] means redirecting child stderr to child stdout.
- * They differs if stdout is redirected in the child process as follows.
+ * They differ if stdout is redirected in the child process as follows.
*
* # stdout and stderr is redirected to log file.
* # The file "log" is opened just once.