Permalink
Browse files

Merge README.txt and INSTALL.txt into README.md

  • Loading branch information...
1 parent f7564c7 commit c92d2ed4c957c8fa94238061c1f4d3e46e598cc5 @brson brson committed Jul 10, 2012
Showing with 16 additions and 17 deletions.
  1. +16 −11 INSTALL.txt → README.md
  2. +0 −6 README.txt
@@ -1,7 +1,10 @@
-### Installing Rust
+# The Rust programming language
-Source build
-=========================
+This is a compiler for Rust, including standard libraries, tools and
+documentation.
+
+
+## Installation
The Rust compiler is slightly unusual in that it is written in Rust and
therefore must be built by a precompiled "snapshot" version of itself (made in
@@ -27,10 +30,6 @@ To build from source you will also need the following prerequisite packages:
* gnu make 3.81 or later
* curl
-
-Building and installing
-=========================
-
Assuming you're on a relatively modern Linux/OSX system and have met the
prerequisites, something along these lines should work:
@@ -54,9 +53,15 @@ configure. Various other options are also supported, pass --help for more
information on them.
-More help
-=========================
+## License
+
+Rust is primarily distributed under the terms of the MIT license, with
+portions covered by various BSD-like licenses.
+
+See LICENSE.txt for complete terms of copyright and redistribution.
+
-The tutorial is a good starting point:
+## More help
- http://dl.rust-lang.org/doc/tutorial.html
+The [tutorial](http://dl.rust-lang.org/doc/tutorial.html) is a good
+starting point.
View
@@ -1,6 +0,0 @@
-This is a compiler and suite of associated libraries and documentation for the
-Rust programming language.
-
-See LICENSE.txt for terms of copyright and redistribution.
-
-See http://www.rust-lang.org for more information.

0 comments on commit c92d2ed

Please sign in to comment.