Merge branch '2.0'

weaverryan · weaverryan · commit 99698bda51e5 · 2012-05-20T14:32:59.000-05:00
Conflicts:
	book/routing.rst
diff --git a/book/routing.rst b/book/routing.rst
@@ -1101,7 +1101,7 @@ In an upcoming section, you'll learn how to generate URLs from inside templates.
 
     .. code-block:: javascript
 
-        var url = Routing.generate('blog_show', { "slug": 'my-blog-post});
+        var url = Routing.generate('blog_show', { "slug": 'my-blog-post'});
 
     For more information, see the documentation for that bundle.
 
