Skip to content

Commit 8a4ffbf

Browse files
committed
auto merge of #13416 : brson/rust/30min, r=alexcrichton
This is intended to be the first thing somebody new to the language reads about Rust. It is supposed to be simple and intriguing, to give the user an idea of whether Rust is appropriate for them, and to hint that there's a lot of cool stuff to learn if they just keep diving deeper. I'm particularly happy with the sequence of concurrency examples.
2 parents 168b2d1 + d1eb0e3 commit 8a4ffbf

File tree

3 files changed

+435
-1
lines changed

3 files changed

+435
-1
lines changed

mk/docs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# L10N_LANGS are the languages for which the docs have been
2727
# translated.
2828
######################################################################
29-
DOCS := index tutorial guide-ffi guide-macros guide-lifetimes \
29+
DOCS := index intro tutorial guide-ffi guide-macros guide-lifetimes \
3030
guide-tasks guide-container guide-pointers guide-testing \
3131
guide-runtime complement-bugreport complement-cheatsheet \
3232
complement-lang-faq complement-project-faq rust rustdoc \

src/doc/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
li {list-style-type: none; }
88
</style>
99

10+
* [A 30-minute Intro to Rust](intro.html)
1011
* [The Rust tutorial](tutorial.html) (* [PDF](tutorial.pdf))
1112
* [The Rust reference manual](rust.html) (* [PDF](rust.pdf))
1213

0 commit comments

Comments
 (0)