about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-15 03:56:27 -0800
committerbors <bors@rust-lang.org>2014-02-15 03:56:27 -0800
commita7aa4c477e7ccc51f19805c42b74cf22dfe22c39 (patch)
treebb0af86bdce480091b801ce4d5dde454971e9c88
parentfba32ea79f1828ef441d91abca3635fad57f323d (diff)
parente7147ce84ff5d3e8d0e73a0dad3e901f5dc510c5 (diff)
downloadrust-a7aa4c477e7ccc51f19805c42b74cf22dfe22c39.tar.gz
rust-a7aa4c477e7ccc51f19805c42b74cf22dfe22c39.zip
auto merge of #12286 : sfackler/rust/no-conditions, r=alexcrichton
-rw-r--r--src/doc/tutorial.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md
index d620ed0b54f..a007ac20b89 100644
--- a/src/doc/tutorial.md
+++ b/src/doc/tutorial.md
@@ -3240,7 +3240,6 @@ guides on individual topics.
 * [Macros][macros]
 * [The foreign function interface][ffi]
 * [Containers and iterators][container]
-* [Error-handling and Conditions][conditions]
 * [Documenting Rust code][rustdoc]
 * [Testing Rust code][testing]
 * [The Rust Runtime][runtime]
@@ -3253,7 +3252,6 @@ There is further documentation on the [wiki], however those tend to be even more
 [macros]: guide-macros.html
 [ffi]: guide-ffi.html
 [container]: guide-container.html
-[conditions]: guide-conditions.html
 [testing]: guide-testing.html
 [runtime]: guide-runtime.html
 [rustdoc]: rustdoc.html