Merge branch '4.0'

* 4.0: (32 commits)
  [#8928] Fixing a few more bad XML routes
  Added Symfony\Component\Security\Guard\Authenticator\AbstractFormLoginAuthenticator
  Reworded the note about supressing form validation
  [PropertyInfo] Fixed doc about PhpDocExtractor
  use ValidatorInterface
  Update file_permissions.rst
  Update setup.rst
  How to use the route in xml
  adding install details about annotations in the routing chapter
  Removed an unneeded note in the Lock docs
  Fixed a grammar error
  Update web_server_configuration.rst
  Replaced class per id in service definition in XML
  Update http_foundation.rst
  bundles.rst: Conflict resolving clean up
  fix typo the_architecture.rst
  Update the_big_picture.rst
  add validator dependency
  Update flex_recipes.rst
  Minor reword.
  ...

Author: weaverryan

_build/redirection_map

@@ -124,7 +124,7 @@
 /cookbook/console/style /console/style
 /cookbook/console/usage /console
 /console/usage /console
-/cookbook/controller/csrf_token_validation /controller/csrf_token_validation
+/cookbook/controller/csrf_token_validation /security/csrf
 /cookbook/controller/error_pages /controller/error_pages
 /cookbook/controller/forwarding /controller/forwarding
 /cookbook/controller/index /controller
@@ -221,7 +221,7 @@
 /cookbook/security/acl /security/acl
 /cookbook/security/acl_advanced /security/acl_advanced
 /cookbook/security/api_key_authentication /security/api_key_authentication
-/cookbook/security/csrf_in_login_form /security/csrf_in_login_form
+/cookbook/security/csrf_in_login_form /security/csrf
 /cookbook/security/custom_authentication_provider /security/custom_authentication_provider
 /cookbook/security/custom_password_authenticator /security/custom_password_authenticator
 /cookbook/security/custom_provider /security/custom_provider
@@ -361,7 +361,9 @@
 /components/yaml/introduction /components/yaml
 /components/yaml/index /components/yaml
 /console/logging /console
+/controller/csrf_token_validation /security/csrf
 /deployment/tools /deployment
+/form/csrf_protection /security/csrf
 /install/bundles /setup/bundles
 /email/gmail /email
 /email/cloud /email
@@ -376,6 +378,7 @@
 /frontend/assetic/yuicompressor /frontend/assetic
 /reference/configuration/assetic /frontend/assetic
 /security/target_path /security
+/security/csrf_in_login_form /security/csrf
 /service_container/third_party /service_container
 /templating/templating_service /templates
 /testing/simulating_authentication /testing/http_authentication

bundles.rst

@@ -151,7 +151,6 @@ As you move through the guides, you'll learn how to persist objects to a
 database, create and validate forms, create translations for your application,
 write tests and much more. Each of these has their own place and role within
 the bundle.
->>>>>>> 3.4
 
 Learn more
 ----------

components/lock.rst

@@ -8,9 +8,6 @@ The Lock Component
     The Lock Component creates and manages `locks`_, a mechanism to provide
     exclusive access to a shared resource.
 
-.. versionadded:: 3.4
-    The Lock component was introduced in Symfony 3.4.
-
 Installation
 ------------
 

components/process.rst

@@ -258,38 +258,6 @@ instead::
     );
     $process->run();
 
-To make your code work better on all platforms, you might want to use the
-:class:`Symfony\\Component\\Process\\ProcessBuilder` class instead::
-
-    use Symfony\Component\Process\ProcessBuilder;
-
-    $builder = new ProcessBuilder(array('ls', '-lsa'));
-    $builder->getProcess()->run();
-
-In case you are building a binary driver, you can use the
-:method:`Symfony\\Component\\Process\\ProcessBuilder::setPrefix` method to prefix all
-the generated process commands.
-
-The following example will generate two process commands for a tar binary
-adapter::
-
-    use Symfony\Component\Process\ProcessBuilder;
-
-    $builder = new ProcessBuilder();
-    $builder->setPrefix('/usr/bin/tar');
-
-    // '/usr/bin/tar' '--list' '--file=archive.tar.gz'
-    echo $builder
-        ->setArguments(array('--list', '--file=archive.tar.gz'))
-        ->getProcess()
-        ->getCommandLine();
-
-    // '/usr/bin/tar' '-xzf' 'archive.tar.gz'
-    echo $builder
-        ->setArguments(array('-xzf', 'archive.tar.gz'))
-        ->getProcess()
-        ->getCommandLine();
-
 Process Timeout
 ---------------
 

components/property_info.rst

@@ -379,7 +379,7 @@ PhpDocExtractor
 
 .. note::
 
-    This extractor depends on the `phpdocumentor/reflection`_ library.
+    This extractor depends on the `phpdocumentor/reflection-docblock`_ library.
 
 Using `phpDocumentor Reflection`_ to parse property and method annotations,
 the :class:`Symfony\\Component\\PropertyInfo\\Extractor\\PhpDocExtractor`
@@ -481,8 +481,8 @@ service by defining it as a service with one or more of the following
 * ``property_info.access_extractor`` if it provides access information.
 
 .. _Packagist: https://packagist.org/packages/symfony/property-info
-.. _`phpDocumentor Reflection`: https://github.com/phpDocumentor/Reflection
-.. _`phpdocumentor/reflection`: https://packagist.org/packages/phpdocumentor/reflection
+.. _`phpDocumentor Reflection`: https://github.com/phpDocumentor/ReflectionDocBlock
+.. _`phpdocumentor/reflection-docblock`: https://packagist.org/packages/phpdocumentor/reflection-docblock
 .. _`Doctrine ORM`: http://www.doctrine-project.org/projects/orm.html
 .. _`symfony/serializer`: https://packagist.org/packages/symfony/serializer
 .. _`symfony/doctrine-bridge`: https://packagist.org/packages/symfony/doctrine-bridge

components/var_dumper.rst

@@ -79,9 +79,8 @@ current PHP SAPI:
 DebugBundle and Twig Integration
 --------------------------------
 
-The DebugBundle allows greater integration of the component into the Symfony
-full-stack framework. It is enabled by default in the *dev* and *test*
-environment of the Symfony Standard Edition.
+The DebugBundle allows greater integration of this component into Symfony
+applications. 
 
 Since generating (even debug) output in the controller or in the model
 of your application may just break it by e.g. sending HTTP headers or

configuration/external_parameters.rst

@@ -29,7 +29,7 @@ put in a ``DATABASE_URL`` environment variable:
     DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name"
 
 This variable is referenced in the service container configuration using
-``%env(DATABASE_HOST)%``:
+``%env(DATABASE_URL)%``:
 
 .. configuration-block::
 

configuration/multiple_kernels.rst

@@ -6,7 +6,7 @@ How To Create Symfony Applications with Multiple Kernels
 
 .. caution::
 
-    Creating aplications with multiple kernels is no longer recommended by
+    Creating applications with multiple kernels is no longer recommended by
     Symfony. Consider creating multiple small applications instead.
 
 In most Symfony applications, incoming requests are processed by the

controller/csrf_token_validation.rst

@@ -285,15 +285,15 @@ the wheel.
 
 I've almost forgot to talk about one added benefit: using the HttpFoundation
 component is the start of better interoperability between all frameworks and
-applications using it (like `Symfony`_, `Drupal 8`_, `phpBB 4`_, `ezPublish
+applications using it (like `Symfony`_, `Drupal 8`_, `phpBB 3`_, `ezPublish
 5`_, `Laravel`_, `Silex`_ and `more`_).
 
 .. _`Twig`: http://twig.sensiolabs.org/
 .. _`HTTP specification`: http://tools.ietf.org/wg/httpbis/
 .. _`audited`: https://symfony.com/blog/symfony2-security-audit
 .. _`Symfony`: https://symfony.com/
 .. _`Drupal 8`: https://drupal.org/
-.. _`phpBB 4`: https://www.phpbb.com/
+.. _`phpBB 3`: https://www.phpbb.com/
 .. _`ezPublish 5`: http://ez.no/
 .. _`Laravel`: http://laravel.com/
 .. _`Silex`: http://silex.sensiolabs.org/