about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-25 16:26:30 -0800
committerbors <bors@rust-lang.org>2014-02-25 16:26:30 -0800
commit3b09469a62aee835e87317b58742149ab8a2ac41 (patch)
tree1047333285a28a2122c267d18ce92443225fb622
parentc24946e9c68e4543686cf11c392837d4cffea361 (diff)
parent7e854317759743026b2066079d2dee90c4bbdd8a (diff)
downloadrust-3b09469a62aee835e87317b58742149ab8a2ac41.tar.gz
rust-3b09469a62aee835e87317b58742149ab8a2ac41.zip
auto merge of #12539 : gmjosack/rust/master, r=alexcrichton
std::condition was removed in 454882dcb7fdb03867d695a88335e2d2c8f7561a
but there are still links to the guide. Removing them.
-rwxr-xr-xconfigure1
-rw-r--r--src/doc/index.md1
2 files changed, 0 insertions, 2 deletions
diff --git a/configure b/configure
index a25eb832114..a69069183e7 100755
--- a/configure
+++ b/configure
@@ -803,7 +803,6 @@ do
     make_dir $h/test/doc-guide-pointers
     make_dir $h/test/doc-guide-container
     make_dir $h/test/doc-guide-tasks
-    make_dir $h/test/doc-guide-conditions
     make_dir $h/test/doc-complement-cheatsheet
     make_dir $h/test/doc-rust
 done
diff --git a/src/doc/index.md b/src/doc/index.md
index 25eb063352a..2500e1593e0 100644
--- a/src/doc/index.md
+++ b/src/doc/index.md
@@ -19,7 +19,6 @@ li {list-style-type: none; }
 * [Foreign Function Interface](guide-ffi.html)
 * [Macros](guide-macros.html)
 * [Testing](guide-testing.html)
-* [Conditions](guide-conditions.html)
 * [Rust's Runtime](guide-runtime.html)
 
 # Libraries