---

yaml
---
r: 35808
b: refs/heads/try2
c: 8f9bb5d
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: d81a7aba3cc634ae11c412f528591a1647a02de1
+refs/heads/try2: 8f9bb5d2030abf71b42af1898d67446e11678c99
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/doc/rust.md

@@ -41,9 +41,6 @@ If you have suggestions to make, please try to focus them on *reductions* to
 the language: possible features that can be combined or omitted. We aim to
 keep the size and complexity of the language under control.
 
-> **Note:** This manual is very out of date. The best source of Rust
-> documentation is currently the tutorial.
-
 > **Note:** The grammar for Rust given in this document is rough and
 > very incomplete; only a modest number of sections have accompanying grammar
 > rules. Formalizing the grammar accepted by the Rust parser is ongoing work,
@@ -1370,10 +1367,8 @@ mod bar {
 fn add(x: int, y: int) { x + y }
 ~~~~~~~~
 
-In future versions of Rust, user-provided extensions to the compiler will be
-able to interpret attributes. When this facility is provided, the compiler
-will distinguish will be made between language-reserved and user-available
-attributes.
+> **Note:** In future versions of Rust, user-provided extensions to the compiler will be able to interpret attributes.
+> When this facility is provided, the compiler will distinguish between language-reserved and user-available attributes.
 
 At present, only the Rust compiler interprets attributes, so all attribute
 names are effectively reserved. Some significant attributes include:
@@ -2938,8 +2933,8 @@ An example of a *receive*:
 let s = comm::recv(po);
 ~~~~~~~~
 
-Note: this communication system will be replaced by a higher-performance system called "pipes",
-in future versions of Rust.
+> **Note:** this communication system will be replaced by a higher-performance system called "pipes",
+> in future versions of Rust.
 
 
 # Runtime services, linkage and debugging
@@ -2951,7 +2946,7 @@ run-time. It is smaller and simpler than many modern language runtimes. It is
 tightly integrated into the language's execution model of memory, tasks,
 communication and logging.
 
-Note: The runtime library will merge with the `core` library in future versions of Rust.
+> **Note:** The runtime library will merge with the `core` library in future versions of Rust.
 
 ### Memory allocation