Merge branch '2.0'

Author: weaverryan

cookbook/assetic/yuicompressor.rst

@@ -125,7 +125,7 @@ Disable Minification in Debug Mode
 
 Minified JavaScripts and Stylesheets are very difficult to read, let alone
 debug. Because of this, Assetic lets you disable a certain filter when your
-application is in debug mode. You can do this be prefixing the filter name
+application is in debug mode. You can do this by prefixing the filter name
 in your template with a question mark: ``?``. This tells Assetic to only
 apply this filter when debug mode is off.
 
@@ -157,4 +157,4 @@ apply this filter when debug mode is off.
 
 
 .. _`YUI Compressor`: http://developer.yahoo.com/yui/compressor/
-.. _`Download the JAR`: http://yuilibrary.com/downloads/#yuicompressor
+.. _`Download the JAR`: http://yuilibrary.com/downloads/#yuicompressor

cookbook/doctrine/reverse_engineering.rst

@@ -32,7 +32,7 @@ to a post record thanks to a foreign key constraint.
       `title` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
       `content` longtext COLLATE utf8_unicode_ci NOT NULL,
       `created_at` datetime NOT NULL,
-      PRIMARY KEY (`id`),
+      PRIMARY KEY (`id`)
     ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
     CREATE TABLE `blog_comment` (