diff --git a/book/doctrine.rst b/book/doctrine.rst
index ad681d971a4..84a54b49017 100644
--- 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
index 352427eb64e..80e0b08270b 100644
--- 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`.
 
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
index 69e67944b4c..1760cb43db7 100644
--- a/cookbook/security/voters.rst
+++ b/cookbook/security/voters.rst
@@ -49,11 +49,7 @@ and compare the IP address against a set of blacklisted IP addresses:
         protected $requestStack;
         private $blacklistedIp;
 
-<<<<<<< HEAD
         public function __construct(RequestStack $requestStack, array $blacklistedIp = array())
-=======
-        public function __construct(ContainerInterface $container, array $blacklistedIp = array())
->>>>>>> 2.3
         {
             $this->requestStack  = $requestStack;
             $this->blacklistedIp = $blacklistedIp;