Merge pull request #3014 from PSeitz/master

[rust.git] / README.md

diff --git a/README.md b/README.md
index 0fdd47f33f1b05889de7c366f3c56534cc5a6045..c9153a6eade4d769c594eadfe12dccd12cb3b4fd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ cargo +nightly fmt
 To format code that requires edition 2018, create a `rustfmt.toml` [configuration](#configuring-rustfmt) file containing:
 
 ```toml
-edition = "Edition2018"
+edition = "2018"
 ```
 
 ## Limitations
@@ -129,8 +129,6 @@ A minimal Travis setup could look like this (requires Rust 1.24.0 or greater):
 
 ```yaml
 language: rust
-rust:
-- nightly
 before_script:
 - rustup component add rustfmt-preview
 script:
@@ -191,7 +189,7 @@ See [Configurations.md](Configurations.md) for details.
   Example:
 
   ```
-  cargo fmt --emit files
+  cargo fmt -- --emit files
   ```
 
   Options:
@@ -199,7 +197,7 @@ See [Configurations.md](Configurations.md) for details.
   | Flag |Description| Nightly Only |
   |:---:|:---:|:---:|
   | files | overwrites output to files | No |
-  | stdout | writes output to stdout | No | 
+  | stdout | writes output to stdout | No |
   | coverage | displays how much of the input file was processed | Yes |
   | checkstyle | emits in a checkstyle format | Yes |