about summary refs log tree commit diff
path: root/doc/tutorial.md
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-01-13 23:26:36 -0800
committerbors <bors@rust-lang.org>2014-01-13 23:26:36 -0800
commit77eeddaa481fa083dfa857e5d7dd7f5ab784a9f1 (patch)
treed0e27a5fd35af72eb03487ab742ebec0a4ddae79 /doc/tutorial.md
parent900893112570eea5a01c0573ae1fa1e3a72397e9 (diff)
parent289ba105ae613291f0a3a16ef295875130abdc49 (diff)
downloadrust-77eeddaa481fa083dfa857e5d7dd7f5ab784a9f1.tar.gz
rust-77eeddaa481fa083dfa857e5d7dd7f5ab784a9f1.zip
auto merge of #11501 : alexcrichton/rust/dox, r=brson
The official documentation sorely needs an explanation of the rust runtime and what it is exactly, and I want this guide to provide that information.

I'm unsure of whether I've been too light on some topics while too heavy on others. I also feel like a few things are still missing. As always, feedback is appreciated, especially about things you'd like to see written about!
Diffstat (limited to 'doc/tutorial.md')
-rw-r--r--doc/tutorial.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tutorial.md b/doc/tutorial.md
index bb5e1bdd7bc..fd92a4cc080 100644
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@@ -2067,7 +2067,7 @@ fn head_bad<T>(v: &[T]) -> T {
 
 However, we can tell the compiler
 that the `head` function is only for copyable types.
-In Rust, copyable types are those that _implement the `Clone` trait_.  
+In Rust, copyable types are those that _implement the `Clone` trait_.
 We can then explicitly create a second copy of the value we are returning
 by calling the `clone` method:
 
@@ -3282,6 +3282,7 @@ guides on individual topics.
 * [Packaging up Rust code][rustpkg]
 * [Documenting Rust code][rustdoc]
 * [Testing Rust code][testing]
+* [The Rust Runtime][runtime]
 
 There is further documentation on the [wiki], however those tend to be even more out of date as this document.
 
@@ -3294,6 +3295,7 @@ There is further documentation on the [wiki], however those tend to be even more
 [conditions]: guide-conditions.html
 [rustpkg]: guide-rustpkg.html
 [testing]: guide-testing.html
+[runtime]: guide-runtime.html
 [rustdoc]: rustdoc.html
 [wiki]: https://github.com/mozilla/rust/wiki/Docs