about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-06-06 12:28:50 +0000
committerbors <bors@rust-lang.org>2015-06-06 12:28:50 +0000
commitd6b82428b5f7ad3691adaa1c2a1ed10b2c96baa4 (patch)
treeb5586a673031ff8db519cbd240ad1fcd2caacf84 /src/libstd
parentc21fd9a34f763c532ded7bf141b90a01cef76c43 (diff)
parent17d76b350b6fc73f7ea3fee9046b74740906bf37 (diff)
Auto merge of #26045 - sourcefrog:patch-1, r=alexcrichton
File handles are inherited from, not by, the parent process
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/process.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 42d9ad81b59..ee7cf009fc4 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -268,7 +268,7 @@ impl Command {
 
     /// Executes the command as a child process, returning a handle to it.
     ///
-    /// By default, stdin, stdout and stderr are inherited by the parent.
+    /// By default, stdin, stdout and stderr are inherited from the parent.
     #[stable(feature = "process", since = "1.0.0")]
     pub fn spawn(&mut self) -> io::Result<Child> {
         self.spawn_inner(StdioImp::Raw(imp::Stdio::Inherit))
@@ -300,7 +300,7 @@ impl Command {
     /// Executes a command as a child process, waiting for it to finish and
     /// collecting its exit status.
     ///
-    /// By default, stdin, stdout and stderr are inherited by the parent.
+    /// By default, stdin, stdout and stderr are inherited from the parent.
     ///
     /// # Examples
     ///