Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit b50dd72dd5b7 · 2014-09-19T14:01:40.000-04:00
* 2.4:
  Applied comments
  Update remove.rst
  Update remove.rst
  Update remove.rst
  Removed unnecessary comma
diff --git a/cookbook/bundles/remove.rst b/cookbook/bundles/remove.rst
@@ -81,6 +81,12 @@ can remove the ``Acme`` directory as well.
 
         echo $this->container->get('kernel')->getBundle('AcmeDemoBundle')->getPath();
 
+3.1 Remove Bundle Assets
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Remove the assets of the bundle in the web/ directory (e.g.
+``web/bundles/acmedemo`` for the AcmeDemoBundle).
+
 4. Remove Integration in other Bundles
 --------------------------------------
 
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -367,7 +367,7 @@ fetch the user from the database before checking the password validity.
 .. note::
 
     By default, the entity provider uses the default entity manager to fetch
-    user information from the database. If you,
+    user information from the database. If you
     :doc:`use multiple entity managers </cookbook/doctrine/multiple_entity_managers>`,
     you can specify which manager to use with the ``manager_name`` option:
 
