about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Hansford <dangthrimble@hansfords.net>2015-07-24 12:12:11 +0100
committerJonathan Hansford <dangthrimble@hansfords.net>2015-07-24 12:12:11 +0100
commitbcee0a83b8ffd02269bd7cfa23bc1fc760719393 (patch)
tree9079e08f9b1513a9deb3503fe0e3636ca407b3f1
parent30584b06efd06899f3cb99cffeef5ac61913bf22 (diff)
downloadrust-bcee0a83b8ffd02269bd7cfa23bc1fc760719393.tar.gz
rust-bcee0a83b8ffd02269bd7cfa23bc1fc760719393.zip
Added link in glossary to expression-oriented language
Tidied up glossary.md and added link from hello-world.md to
'expression-oriented language' in glossary.md
-rw-r--r--src/doc/trpl/glossary.md20
-rw-r--r--src/doc/trpl/hello-world.md11
2 files changed, 17 insertions, 14 deletions
diff --git a/src/doc/trpl/glossary.md b/src/doc/trpl/glossary.md
index 900211200af..46d87e51f0d 100644
--- a/src/doc/trpl/glossary.md
+++ b/src/doc/trpl/glossary.md
@@ -48,16 +48,16 @@ expression might perform actions other than simply returning a value.
 
 ### Expression-Oriented Language
 
-In early programming languages [expressions] and [statements] were two separate
-syntactic categories: expressions had a value and statements did things.
-However, later languages blurred this distinction, allowing expressions to do
-things and statements to have a value. In an expression-oriented language,
-(nearly) every statement is an expression and therefore returns a value.
-Consequently these expression statements can themselves form part of larger
-expressions.
-
-[expressions]: glossary.html#expression
-[statements]: glossary.html#statement
+In early programming languages [expressions][expression] and
+[statements][statement] were two separate syntactic categories: expressions had
+a value and statements did things. However, later languages blurred this
+distinction, allowing expressions to do things and statements to have a value.
+In an expression-oriented language, (nearly) every statement is an expression
+and therefore returns a value. Consequently these expression statements can
+themselves form part of larger expressions.
+
+[expression]: glossary.html#expression
+[statement]: glossary.html#statement
 
 ### Statement
 
diff --git a/src/doc/trpl/hello-world.md b/src/doc/trpl/hello-world.md
index eec6fe62f22..cd4326a28d8 100644
--- a/src/doc/trpl/hello-world.md
+++ b/src/doc/trpl/hello-world.md
@@ -111,10 +111,13 @@ string to the screen. Easy enough!
 
 [allocation]: the-stack-and-the-heap.html
 
-Finally, the line ends with a semicolon (`;`). Rust is an ‘expression oriented’
-language, which means that most things are expressions, rather than statements.
-The `;` is used to indicate that this expression is over, and the next one is
-ready to begin. Most lines of Rust code end with a `;`.
+Finally, the line ends with a semicolon (`;`). Rust is an [‘expression oriented’
+language][expression-oriented language], which means that most things are
+expressions, rather than statements. The `;` is used to indicate that this
+expression is over, and the next one is ready to begin. Most lines of Rust code
+end with a `;`.
+
+[expression-oriented language]: glossary.html#expression-oriented-language
 
 Finally, actually compiling and running our program. We can compile with our
 compiler, `rustc`, by passing it the name of our source file: