From 6f09d80f97457fd69fa736d71c491042b2c945df Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Fri, 27 Sep 2013 17:03:34 -0700 Subject: Add Pointer tutorial, rename borrowed pointer tutorial. --- doc/tutorial.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'doc/tutorial.md') diff --git a/doc/tutorial.md b/doc/tutorial.md index 2f017c77c0b..18766195ce2 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -1423,10 +1423,8 @@ intuitive sense: you must wait for a borrowed value to be returned (that is, for the borrowed pointer to go out of scope) before you can make full use of it again. -For a more in-depth explanation of borrowed pointers, read the -[borrowed pointer tutorial][borrowtut]. - -[borrowtut]: tutorial-borrowed-ptr.html +For a more in-depth explanation of borrowed pointers and lifetimes, read the +[lifetimes and borrowed pointer tutorial][lifetimes]. ## Freezing @@ -3265,7 +3263,8 @@ re-export a bunch of 'officially blessed' crates that get managed with `rustpkg` Now that you know the essentials, check out any of the additional guides on individual topics. -* [Borrowed pointers][borrow] +* [Pointers][pointers] +* [Lifetimes][lifetimes] * [Tasks and communication][tasks] * [Macros][macros] * [The foreign function interface][ffi] @@ -3275,9 +3274,10 @@ guides on individual topics. * [Documenting Rust code][rustdoc] * [Testing Rust code][testing] -There is further documentation on the [Main Page](index.html). +There is further documentation on the [wiki], however those tend to be even more out of date as this document. -[borrow]: guide-borrowed-ptr.html +[pointers]: guide-pointers.html +[lifetimes]: guide-lifetimes.html [tasks]: guide-tasks.html [macros]: guide-macros.html [ffi]: guide-ffi.html @@ -3286,5 +3286,6 @@ There is further documentation on the [Main Page](index.html). [rustpkg]: guide-rustpkg.html [testing]: guide-testing.html [rustdoc]: rustdoc.html +[wiki]: https://github.com/mozilla/rust/wiki/Docs [wiki-packages]: https://github.com/mozilla/rust/wiki/Doc-packages,-editors,-and-other-tools -- cgit 1.4.1-3-g733a5