Skip to content

Commit c92d2ed

Browse files
committed
Merge README.txt and INSTALL.txt into README.md
1 parent f7564c7 commit c92d2ed

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

INSTALL.txt renamed to README.md

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
### Installing Rust
1+
# The Rust programming language
22

3-
Source build
4-
=========================
3+
This is a compiler for Rust, including standard libraries, tools and
4+
documentation.
5+
6+
7+
## Installation
58

69
The Rust compiler is slightly unusual in that it is written in Rust and
710
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:
2730
* gnu make 3.81 or later
2831
* curl
2932

30-
31-
Building and installing
32-
=========================
33-
3433
Assuming you're on a relatively modern Linux/OSX system and have met the
3534
prerequisites, something along these lines should work:
3635

@@ -54,9 +53,15 @@ configure. Various other options are also supported, pass --help for more
5453
information on them.
5554

5655

57-
More help
58-
=========================
56+
## License
57+
58+
Rust is primarily distributed under the terms of the MIT license, with
59+
portions covered by various BSD-like licenses.
60+
61+
See LICENSE.txt for complete terms of copyright and redistribution.
62+
5963

60-
The tutorial is a good starting point:
64+
## More help
6165

62-
http://dl.rust-lang.org/doc/tutorial.html
66+
The [tutorial](http://dl.rust-lang.org/doc/tutorial.html) is a good
67+
starting point.

README.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)