Auto merge of #30160 - adambadawy:fix_wait_with_output_typo, r=bluss

bors · bors · commit 88397e092e01 · 2015-12-02T07:36:40.000Z
r? @steveklabnik
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
@@ -531,7 +531,7 @@ impl Child {
     }
 
     /// Simultaneously waits for the child to exit and collect all remaining
-    /// output on the stdout/stderr handles, returning a `Output`
+    /// output on the stdout/stderr handles, returning an `Output`
     /// instance.
     ///
     /// The stdin handle to the child process, if any, will be closed

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ impl Child {`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`/// Simultaneously waits for the child to exit and collect all remaining`
`534`		- /// output on the stdout/stderr handles, returning a `Output`
	`534`	+ /// output on the stdout/stderr handles, returning an `Output`
`535`	`535`	`/// instance.`
`536`	`536`	`///`
`537`	`537`	`/// The stdin handle to the child process, if any, will be closed`