update dependencies and fix compile errors

[rust.git] / README.md

diff --git a/README.md b/README.md
index df1177d6a58a7cd28871bb79bf0997e06d4bc18d..571ceb99f6c6c3b7820a83253958a59909131685 100644 (file)
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ multirust run nightly cargo install --git https://github.com/rust-lang-nursery/r
 
 * [Vim](http://johannh.me/blog/rustfmt-vim.html)
 * [Emacs](https://github.com/fbergroth/emacs-rustfmt)
+* [Atom](atom.md)
 
 
 ## How to build and test
@@ -55,7 +56,7 @@ screen, for example.
 
 Rustfmt is designed to be very configurable. You can create a TOML file called
 rustfmt.toml, place it in the project directory and it will apply the options
-in that file. See `cargo run --help-config` for the options which are available,
+in that file. See `cargo run -- --config-help` for the options which are available,
 or if you prefer to see source code, [src/config.rs].
 
 By default, Rustfmt uses a style which (mostly) confirms to the
@@ -73,6 +74,7 @@ options covering different styles. File an issue, or even better, submit a PR.
 ## Gotchas
 
 * For things you do not want rustfmt to mangle, use one of
+
     ```rust
     #[rustfmt_skip]
     #[cfg_attr(rustfmt, rustfmt_skip)]