Merge pull request elixir-lang#140 from komiga/master

José Valim · José Valim · commit 02dcc00b9fc0 · 2013-08-20T00:23:28.000-07:00
Fix typos and normalize syntax highlighting in chapters 1, 2, and 3 of Getting Started
diff --git a/getting_started/1.markdown b/getting_started/1.markdown
@@ -249,7 +249,7 @@ true
 
 > Note: If you are an Erlang developer, `and` and `or` in Elixir actually map to the `andalso` and `orelse` operators in Erlang.
 
-Besides these boolean operators, Elixir also provides `||`, `&&` and `!` which accept arguments of any type. For these operators, all values except `false` and `nil` will evaluate to true:
+Besides these boolean operators, Elixir also provides `||`, `&&` and `!` which accept arguments of any type. For these operators, all values except `false` and `nil` will evaluate to `true`:
 
 ```iex
 # or
diff --git a/getting_started/2.markdown b/getting_started/2.markdown
@@ -245,7 +245,7 @@ iex> "h\xE9ll\xF2"
 "héllò"
 ```
 
-UTF-8 also plays nicely with pattern matching. In the exemple below, we are extracting the first UTF-8 codepoint of a String and assigning the rest of the string to the variable `rest`:
+UTF-8 also plays nicely with pattern matching. In the example below, we are extracting the first UTF-8 codepoint of a String and assigning the rest of the string to the variable `rest`:
 
 ```iex
 iex> << eacute :: utf8, rest :: binary >> = "épa"
@@ -638,11 +638,11 @@ else
 end
 ```
 
-In Elixir, all values except `false` and `nil` evaluate to `true`. Therefore there is no need to explicitly convert the `if` argument to a boolean. If you want to check if one of many conditions are true, you can use the `cond` macro.
+In Elixir, all values except `false` and `nil` evaluate to `true`. Therefore there is no need to explicitly convert the `if` argument to a boolean. If you want to check if one of many conditions are `true`, you can use the `cond` macro.
 
 ### 2.6.7 Cond
 
-Whenever you want to check for many conditions at the same time, Elixir allows developers to use `cond` insted of nesting many `if` expressions:
+Whenever you want to check for many conditions at the same time, Elixir allows developers to use `cond` instead of nesting many `if` expressions:
 
 ```elixir
 cond do
@@ -655,7 +655,7 @@ cond do
 end
 ```
 
-If none of the conditions return true, an error will be raised. For this reason, it is common to see a last condition equal to `true`, which will always match:
+If none of the conditions return `true`, an error will be raised. For this reason, it is common to see a last condition equal to `true`, which will always match:
 
 ```elixir
 cond do
diff --git a/getting_started/3.markdown b/getting_started/3.markdown
@@ -194,11 +194,11 @@ end
 
 If we save the code above in a file named "concat.ex" and compile it, Elixir will emit the following warning:
 
-    test_funs.ex:7: this clause cannot match because a previous clause at line 2 always matches
+    concat.ex:7: this clause cannot match because a previous clause at line 2 always matches
 
 The compiler is telling us that invoking the `join` function with two arguments will always choose the first definition of `join` whereas the second one will only be invoked when three arguments are passed:
 
-    $ iex test_funs.ex
+    $ iex concat.ex
 
 ```iex
 iex> Concat.join "Hello", "world"
