* 2.7:  Fixing bad conflict fix

* 2.8:  Fixing bad conflict fix

* 2.7:  fix status code in snippet

* 2.8:  fix status code in snippet

Ldap is the new user provider in  Symfony 2.8, so it would be good to mention it in the list of all user providers.

This PR was merged into the 2.8 branch.Discussion----------fix broken mergeCommits-------5ba5224 fix broken merge

…ta` option

…Type (kgilden, HeahDude)

The current code generates a Fatal Error. I can see in the HttpKernel Component's documentation that RouterListener needs a $matcher and a RequestStack object as paramers.

This PR was submitted for the 3.0 branch but it was merged into the 2.8 branch instead (closessymfony#6509).Discussion----------Update http_kernel_httpkernel_class.rstThe current code generates a Fatal Error. I can see in the HttpKernel Component's documentation that RouterListener needs a $matcher and a RequestStack object as paramers.Commits-------ee94747 Update http_kernel_httpkernel_class.rst

This PR was merged into the 2.8 branch.Discussion----------fix typo| Q             | A| ------------- | ---| Doc fix?      | yes| New docs?     | no| Applies to    | >= 2.8I feel in@pborreli's shoesCommits-------1bfe021 fix typo

…hov)This PR was merged into the 2.8 branch.Discussion----------Added ldap to the list of user providers| Q             | A| ------------- | ---| Doc fix?      | yes| New docs?     | no| Applies to    | 2.8+| Fixed tickets | n/aLdap is the new user provider in  Symfony 2.8, so it would be good to mention it in the list of all user providers.Commits-------f723ea5 Added ldap to the list of user providers

* 2.7:  remove documentation of not supported "verbose" option value  use port 587 in Amazon SES example  [symfony#6464] Minor tweak  Fix one more occurence of /read  Fix typo  Added possible values for access_decision_manager.strategy

* 2.8:  [symfony#6465] fix newline position  remove documentation of not supported "verbose" option value  Update http_kernel_httpkernel_class.rst  use port 587 in Amazon SES example  fix typo  [symfony#6464] Minor tweak  Fix one more occurence of /read  Fix typo  Added ldap to the list of user providers  Added possible values for access_decision_manager.strategy

* 2.7:  [symfony#6472] Updating description, after change  Avoid confusion  Added file paths  Fixes and rewords  Documented the config options of TwigBundle  [symfony#6427] Adding a header  Tests: Explain how to add or remove data in a collection of forms  Document constraint validator alias optional

* 2.8:  [symfony#6472] Updating description, after change  Avoid confusion  Added file paths  Fixes and rewords  Documented the config options of TwigBundle  [symfony#6427] Adding a header  Tests: Explain how to add or remove data in a collection of forms  Document constraint validator alias optional

* 2.7:  On line 360 the  header not working  The `$link` argument must be passed as a reference  Fix snippet

* 2.8:  On line 360 the  header not working  The `$link` argument must be passed as a reference  Fix snippet

The CssSelector class does not exists since 2.8. The behavior is now automatic if the content is an XML file.

- fix typo from services to service in the first paragraph- fix typo from "if your buildForm" to "of your buildForm"

…erbaldwin)This PR was merged into the 2.8 branch.Discussion----------[PropertyInfo] Add Component Documentation| Q             | A| ------------- | ---| Doc fix?      | no| New docs?     | yes (symfony/symfony#15858)| Applies to    | `2.8`, `3.0`| Fixed tickets | N/AThis is still a *work in progress*, but I'd like feedback from anyone regarding structure, grammar and any other improvements while I continue. After speaking with@dunglas, I'm creating a new PR due our branches differing by about 400 commits.Commits-------a0409d7 Update Reference to Service Container Tags78ea4a5 Update PropertyAccess Component Path7b786af Fix Incorrect Indent96b139b Suggested Changescf7a0ea Add PropertyInfo Component Documentation

* 2.7:  Adding details about the Symfony framework as comments  Adjust Application use statement  replacing with index, otherwise these documents are not included in *any* index  Removed the "Learn more" section  Created a "Platform as a Service" section  Minor improvements  Fixed the "make" command  Fixed again the tricky list syntax  Fixed the syntax of the list  Minor fixes  Reword the third step  Added the missing link references  Updated the instructions to build docs locally  Refactore how to get the container in a test  Fixed a reference  Created the main article about "deployment"

* 2.8: (31 commits)  Adding details about the Symfony framework as comments  Adjust Application use statement  replacing with index, otherwise these documents are not included in *any* index  Error in CSRF example code snippet  Added missing reference  Update serializer.rst  Adding missing link reference forsymfony#6877, because someone must have been in a hurry :)  Remove additional backslash  Add a class specificity for SplFileInfo  Update Reference to Service Container Tags  Remove extra quotes from ExprBuilder::thenInvalid() usage  Update PropertyAccess Component Path  Fix Incorrect Indent  Suggested Changes  Add PropertyInfo Component Documentation  missing "`"  added lyrixx to the core team  Remove redundant verb  Removed the "Learn more" section  Created a "Platform as a Service" section  ...

* origin/3.0:

This PR was merged into the 3.0 branch.Discussion----------[FormComponent] Fix typos- fix typo from services to service in the first paragraph- fix typo from "if your buildForm" to "of your buildForm"Commits-------6d282e4 Fix typos

"in_memory" does not exist. This is a just a provider name. The real keyword is "memory"

This PR was submitted for the 3.1 branch but it was merged into the 2.8 branch instead (closessymfony#6892).Discussion----------Update custom_provider.rst"in_memory" does not exist. This is a just a provider name. The real keyword is "memory"Commits-------2d5b420 Update custom_provider.rst

* 2.7:  [symfony#6892] The provider is called `memory`  Fix typos  Update templating.rst  Update templating.rst  Adds bin folder creation instruction  service_container : fix php Definition instance  [Routing] Fix a route path in a routing example  Minor unrelated spacing fixes  Update doctrine.rst

* 2.8:  Update custom_provider.rst  [symfony#6892] The provider is called `memory`  Fix typos  Update templating.rst  Update templating.rst  Adds bin folder creation instruction  service_container : fix php Definition instance  [Routing] Fix a route path in a routing example  Minor unrelated spacing fixes  Update doctrine.rst

… Sf3