about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-06-10 07:43:52 -0700
committerGitHub <noreply@github.com>2016-06-10 07:43:52 -0700
commita267d6cee40c2f2fa3db999afbb2bd1384f7840a (patch)
tree7f019ee7195a933addb73b8f0dee845c1349bd08 /src/libstd
parent68241f00ad8fb90474748b37ebd68b6bd46c796b (diff)
parent107d423f1ab9a110fdf2253e7d0074f0ab5bf868 (diff)
downloadrust-a267d6cee40c2f2fa3db999afbb2bd1384f7840a.tar.gz
rust-a267d6cee40c2f2fa3db999afbb2bd1384f7840a.zip
Auto merge of #34200 - sanxiyn:rollup, r=sanxiyn
Rollup of 12 pull requests

- Successful merges: #34088, #34129, #34136, #34145, #34146, #34148, #34159, #34160, #34165, #34175, #34184, #34185
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/process.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 3ce9bcc79f2..96ddda32ae4 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -182,8 +182,10 @@ impl FromInner<AnonPipe> for ChildStderr {
     }
 }
 
-/// The `Command` type acts as a process builder, providing fine-grained control
-/// over how a new process should be spawned. A default configuration can be
+/// A process builder, providing fine-grained control
+/// over how a new process should be spawned.
+///
+/// A default configuration can be
 /// generated using `Command::new(program)`, where `program` gives a path to the
 /// program to be executed. Additional builder methods allow the configuration
 /// to be changed (for example, by adding arguments) prior to spawning: