]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #8777 : Kimundi/rust/doc_stuff, r=cmr
authorbors <bors@rust-lang.org>
Tue, 27 Aug 2013 13:45:50 +0000 (06:45 -0700)
committerbors <bors@rust-lang.org>
Tue, 27 Aug 2013 13:45:50 +0000 (06:45 -0700)
1  2 
doc/tutorial.md

diff --cc doc/tutorial.md
index 5737c3d8dcb6f23b73a4214fa1850f69aae6387c,051de260a098c0d6b38b71fc5ad315ed39cb4519..7614e8482377c458cde8fe2c38dd9bb059a5a387
@@@ -2553,9 -2978,8 +2978,9 @@@ tutorials on individual topics
  * [Macros][macros]
  * [The foreign function interface][ffi]
  * [Containers and iterators](tutorial-container.html)
 +* [Error-handling and Conditions](tutorial-conditions.html)
  
- There is further documentation on the [wiki].
+ There is further documentation on the [wiki], however those tend to be even more out of date as this document.
  
  [borrow]: tutorial-borrowed-ptr.html
  [tasks]: tutorial-tasks.html