Merge branch '2.0'

Conflicts: book/routing.rst
symfony · May 20, 2012 · 99698bd · 99698bd
2 parents 9acf5b6 + f378f18
commit 99698bd
Showing 1 changed file with 1 addition and 1 deletion.
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.