nightly-0.99.4

[rust.git] / Configurations.md

diff --git a/Configurations.md b/Configurations.md
index a0e3e63c74e61b074366df9994bd735544731a3f..ab91f11be04ea200e75ac0daf91a29474840913a 100644 (file)
--- a/Configurations.md
+++ b/Configurations.md
@@ -1055,10 +1055,10 @@ Format the bodies of macros.
 
 ```rust
 macro_rules! foo {
-    ($a:ident : $b:ty) => {
+    ($a: ident : $b: ty) => {
         $a(42): $b;
     };
-    ($a:ident $b:ident $c:ident) => {
+    ($a: ident $b: ident $c: ident) => {
         $a = $b + $c;
     };
 }
@@ -1068,8 +1068,8 @@ macro_rules! foo {
 
 ```rust
 macro_rules! foo {
-    ($a:ident : $b:ty) => { $a(42): $b; };
-    ($a:ident $b:ident $c:ident) => { $a=$b+$c; };
+    ($a: ident : $b: ty) => { $a(42): $b; };
+    ($a: ident $b: ident $c: ident) => { $a=$b+$c; };
 }
 ```
 
@@ -1338,10 +1338,29 @@ fn main() {
 
 Unix or Windows line endings
 
-- **Default value**: `"Native"`
-- **Possible values**: `"Native"`, `"Unix"`, `"Windows"`
+- **Default value**: `"Auto"`
+- **Possible values**: `"Auto"`, `"Native"`, `"Unix"`, `"Windows"`
 - **Stable**: Yes
 
+#### `Auto` (default):
+
+The newline style is detected automatically on a per-file basis. Files
+with mixed line endings will be converted to the first detected line
+ending style.
+
+#### `Native`
+
+Line endings will be converted to `\r\n` on Windows and `\n` on all
+other platforms.
+
+#### `Unix`
+
+Line endings will be converted to `\n`.
+
+#### `Windows`
+
+Line endings will be converted to `\r\n`.
+
 ## `normalize_comments`
 
 Convert /* */ comments to // comments where possible