---

yaml
---
r: 11788
b: refs/heads/master
c: fde4c1e
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d7ae9f1370fc14cd77f9da6b547e533cebf7e12b
+refs/heads/master: fde4c1efbbe2c3fbd29b50a9fe61283714cd8769
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/doc/rust.md

@@ -550,6 +550,9 @@ location of which -- in the module tree of the current crate -- is defined
 from outside the source file: either by an explicit `source_directive` in
 a referencing crate file, or by the filename of the source file itself.
 
+A source file that contains a `main` function can be compiled to an
+executable. If a `main` function is present, it must have no [type parameters](#type-parameters)
+and no [constraints](#constraints). Its return type must be [`nil`](#primitive-types) and it must either have no arguments, or a single argument of type `[str]`.
 
 # Items and attributes
 
@@ -592,6 +595,8 @@ the name of the enclosing item, or is private to the enclosing item (in the
 case of functions). The exact locations in which sub-items may be declared is
 given by the grammar.
 
+### Type Parameters
+
 All items except modules may be *parametrized* by type. Type parameters are
 given as a comma-separated list of identifiers enclosed in angle brackets
 (`<...>`), after the name of the item and before its definition. The type