about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-05-15 22:55:03 +0000
committerbors <bors@rust-lang.org>2015-05-15 22:55:03 +0000
commitdaaf71553929a63d619d2a7337588fed1baf6bfe (patch)
treeb01dfc7bbd1de754cf000225ce61edd4bd0135bb
parenta9ea33fa30fc2c1a8084e035455ba2a0a0dfea3e (diff)
parent94be1153f1b9e8b154cb8982b7f180505ae7dab0 (diff)
downloadrust-daaf71553929a63d619d2a7337588fed1baf6bfe.tar.gz
rust-daaf71553929a63d619d2a7337588fed1baf6bfe.zip
Auto merge of #25432 - killercup:patch-12, r=steveklabnik
`[let]` was already defined in line 11. Pandoc shows a warning for this. I'm not sure if it's actually invalid Markdown.

r? @steveklabnik 
-rw-r--r--src/doc/trpl/const-and-static.md4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/doc/trpl/const-and-static.md b/src/doc/trpl/const-and-static.md
index be0c87319b3..f309dd0fad6 100644
--- a/src/doc/trpl/const-and-static.md
+++ b/src/doc/trpl/const-and-static.md
@@ -31,10 +31,8 @@ static N: i32 = 5;
 
 Unlike [`let`][let] bindings, you must annotate the type of a `static`.
 
-[let]: variable-bindings.html
-
 Statics live for the entire lifetime of a program, and therefore any
-reference stored in a constant has a [`’static` lifetime][lifetimes]:
+reference stored in a constant has a [`'static` lifetime][lifetimes]:
 
 ```rust
 static NAME: &'static str = "Steve";