Merge branch 'sreid'

Conflicts:
	authors.textile

Author: peterhellberg

authors.textile

@@ -9,6 +9,7 @@ _The following people are totally rad and awesome because they have contributed
 
 * David Brady [email protected]_
 * John Ford [email protected]_
+* Steven Reid _steven @ reidnorthwest . com_
 * ...You! What are you waiting for? Check out the <a href="/contributing">contributing</a> section and get cracking!
 
 

chapters/syntax/embedding_javascript.textile

@@ -6,19 +6,20 @@ chapter: Syntax
 
 h2. Problem
 
-You want to include some found/pre-written JavaScript code inline with your CoffeeScript
+You want to include some found/pre-written JavaScript code inline with your CoffeeScript.
 
 h2. Solution
 
 Wrap the JavaScript with backticks:
 
 {% highlight coffeescript %}
 `function greet(name) {
-alert("Hello "+name);
+return "Hello "+name;
 }`
 
 # Back to CoffeeScript
 greet "Coffee"
+# => "Hello Coffee"
 {% endhighlight %}
 
 h2. Discussion
@@ -27,9 +28,10 @@ This is a simple way to integrate small snippets of JavaScript code into your Co
 
 {% highlight coffeescript %}
 hello = `function (name) {
-alert("Hello "+name)
+return "Hello "+name
 }`
 hello "Coffee"
+# => "Hello Coffee"
 
 {% endhighlight %}
 Here the "hello" variable is still in CoffeeScript, but is assigned a function written in JavaScript.