Merge branch '2.3' into 2.4

* 2.3: ��eraseCredentials method typo Update doctrine.rst
symfony · Jul 30, 2014 · 1f12a08 · 1f12a08
2 parents a7fe00f + b3f15b2
commit 1f12a08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -699,7 +699,7 @@ method of the entity manager::
     $em->flush();
 
 As you might expect, the ``remove()`` method notifies Doctrine that you'd
-like to remove the given entity from the database. The actual ``DELETE`` query,
+like to remove the given object from the database. The actual ``DELETE`` query,
 however, isn't actually executed until the ``flush()`` method is called.
 
 .. _`book-doctrine-queries`:

diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -194,7 +194,7 @@ interface forces the class to implement the five following methods:
 * :method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::getPassword`
 * :method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::getSalt`
 * :method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::getUsername`
-* :method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::eraseCredential`
+* :method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::eraseCredentials`
 
 For more details on each of these, see :class:`Symfony\\Component\\Security\\Core\\User\\UserInterface`.