Merge branch '3.3' into 3.4

* 3.3:
  Update event_listeners_subscribers.rst
  Update event_listeners_subscribers.rst
  add missing link target for Ansistrano
  Corrected a spelling error.
  Update Custom UsernamePasswordToken Authenticator
  fixing ref
  removing some deploy strategies + adding & reordering

Author: weaverryan

deployment.rst

@@ -78,13 +78,15 @@ Using Build Scripts and other Tools
 There are also tools to help ease the pain of deployment. Some of them have been
 specifically tailored to the requirements of Symfony.
 
-`Capistrano`_ with `Symfony plugin`_
-    `Capistrano`_ is a remote server automation and deployment tool written in Ruby.
-    `Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
-    (which works only with Capistrano 2).
+`EasyDeployBundle`_
+    A Symfony bundle that adds easy deploy tools to your application.
 
-`sf2debpkg`_
-    Helps you build a native Debian package for your Symfony project.
+`Deployer`_
+    This is another native PHP rewrite of Capistrano, with some ready recipes for
+    Symfony.
+
+`Ansistrano`_
+    An Ansible role that allows you to configure a powerful deploy via YAML files.
 
 `Magallanes`_
     This Capistrano-like deployment tool is built in PHP, and may be easier
@@ -94,13 +96,14 @@ specifically tailored to the requirements of Symfony.
     This Python-based library provides a basic suite of operations for executing
     local or remote shell commands and uploading/downloading files.
 
-`Deployer`_
-    This is another native PHP rewrite of Capistrano, with some ready recipes for
-    Symfony.
+`Capistrano`_ with `Symfony plugin`_
+    `Capistrano`_ is a remote server automation and deployment tool written in Ruby.
+    `Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
+    (which works only with Capistrano 2).
+
+`sf2debpkg`_
+    Helps you build a native Debian package for your Symfony project.
 
-Bundles
-    There are some `bundles that add deployment features`_ directly into your
-    Symfony console.
 
 Basic scripting
     You can of course use shell, `Ant`_ or any other build tool to script
@@ -241,11 +244,12 @@ kernel and return your project's root directory::
 .. _`Capistrano`: http://capistranorb.com/
 .. _`sf2debpkg`: https://github.com/liip/sf2debpkg
 .. _`Fabric`: http://www.fabfile.org/
+.. _`Ansistrano`: https://ansistrano.com/
 .. _`Magallanes`: https://github.com/andres-montanez/Magallanes
 .. _`Ant`: http://blog.sznapka.pl/deploying-symfony2-applications-with-ant
-.. _`bundles that add deployment features`: https://github.com/search?utf8=✓&q=topic%3Asymfony-bundle+topic%3Adeploy&type=Repositories&ref=searchresults
 .. _`Memcached`: http://memcached.org/
 .. _`Redis`: http://redis.io/
 .. _`Symfony plugin`: https://github.com/capistrano/symfony/
 .. _`Deployer`: http://deployer.org/
 .. _`Git Tagging`: https://git-scm.com/book/en/v2/Git-Basics-Tagging
+.. _`EasyDeployBundle`: https://github.com/EasyCorp/easy-deploy-bundle

doctrine/event_listeners_subscribers.rst

@@ -102,14 +102,14 @@ a ``postPersist()`` method, which will be called when the event is dispatched::
     {
         public function postPersist(LifecycleEventArgs $args)
         {
-            $object = $args->getObject();
+            $entity = $args->getEntity();
 
             // only act on some "Product" entity
-            if (!$object instanceof Product) {
+            if (!$entity instanceof Product) {
                 return;
             }
 
-            $objectManager = $args->getObjectManager();
+            $entityManager = $args->getEntityManager();
             // ... do something with the Product
         }
     }
@@ -166,7 +166,7 @@ interface and have an event method for each event it subscribes to::
 
         public function index(LifecycleEventArgs $args)
         {
-            $entity = $args->getObject();
+            $entity = $args->getEntity();
 
             // perhaps you only want to act on some "Product" entity
             if ($entity instanceof Product) {

security/custom_password_authenticator.rst

@@ -61,6 +61,7 @@ the user::
                     // (so don't put any un-trusted messages / error strings here)
                     throw new CustomUserMessageAuthenticationException(
                         'You can only log in between 2 and 4!',
+                        array(), // Message Data
                         412 // HTTP 412 Precondition Failed
                     );
                 }

workflow/state-machines.rst

@@ -14,7 +14,7 @@ machine.
 Example of a State Machine
 --------------------------
 
-A pull request starts in an intial "start" state, a state for e.g. running
+A pull request starts in an initial "start" state, a state for e.g. running
 tests on Travis. When this is finished, the pull request is in the "review"
 state, where contributors can require changes, reject or accept the
 pull request. At any time, you can also "update" the pull request, which