Permalink
Browse files

Merge branch '2.0'

Conflicts:
	book/routing.rst
  • Loading branch information...
2 parents 9acf5b6 + f378f18 commit 99698bda51e52943b46467334cffb8e721d3b883 @weaverryan weaverryan committed May 20, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 book/routing.rst
View
@@ -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.

0 comments on commit 99698bd

Please sign in to comment.