---

yaml
---
r: 41851
b: refs/heads/master
c: 49e466f
h: refs/heads/master
i:
  41849: 974c166
  41847: 2a65939
v: v3

Author: cpeterso

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c3c90d2e4c4a1df80fe350099017124694e767d2
+refs/heads/master: 49e466f1e1b908e4e97d772d2676e91fe3486113
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/doc/rust.md

@@ -594,16 +594,16 @@ and may optionally begin with any number of `attributes` that apply to the conta
 Atributes on the anonymous crate module define important metadata that influences
 the behavior of the compiler.
 
-~~~~~~~~{.xfail-test}
+~~~~~~~~
 // Linkage attributes
-#[ link(name = "projx"
+#[ link(name = "projx",
         vers = "2.5",
         uuid = "9cccc5d5-aceb-4af5-8285-811211826b82") ];
 
 // Additional metadata attributes
-#[ desc = "Project X",
-   license = "BSD" ];
-   author = "Jane Doe" ];
+#[ desc = "Project X" ];
+#[ license = "BSD" ];
+#[ author = "Jane Doe" ];
 
 // Specify the output type
 #[ crate_type = "lib" ];
@@ -2472,7 +2472,7 @@ disabled dynamically at run-time on a per-task and per-item basis. See
 Each `log` expression must be provided with a *level* argument in
 addition to the value to log. The logging level is a `u32` value, where
 lower levels indicate more-urgent levels of logging. By default, the lowest
-four logging levels (`1_u32 ... 4_u32`) are predefined as the constants
+four logging levels (`0_u32 ... 3_u32`) are predefined as the constants
 `error`, `warn`, `info` and `debug` in the `core` library.
 
 Additionally, the macros `error!`, `warn!`, `info!` and `debug!` are defined
@@ -3242,10 +3242,10 @@ level will be output to the console.
 The path to a module consists of the crate name, any parent modules,
 then the module itself, all separated by double colons (`::`).  The
 optional log level can be appended to the module path with an equals
-sign (`=`) followed by the log level, from 1 to 4, inclusive. Level 1
-is the error level, 2 is warning, 3 info, and 4 debug. Any logs
+sign (`=`) followed by the log level, from 0 to 3, inclusive. Level 0
+is the error level, 1 is warning, 2 info, and 3 debug. Any logs
 less than or equal to the specified level will be output. If not
-specified then log level 4 is assumed.
+specified then log level 3 is assumed.
 
 As an example, to see all the logs generated by the compiler, you would set
 `RUST_LOG` to `rustc`, which is the crate name (as specified in its `link`