Merge branch '3.0'

* 3.0: (28 commits)
  [Console] Fix an autocompletion question helper issue with non-sequentially indexed choices
  [Process] Fix pipes handling
  [Finder] Partially revert #17134 to fix a regression
  Mentioned the deprecation of deep parameters in UPGRADE files
  [HttpKernel] Fix mem usage when stripping the prod container
  [Filesystem] Fix false positive in ->remove()
  [Filesystem] Cleanup/sync with 2.3
  [Validator] Fix the locale validator so it treats a locale alias as a valid locale
  [HttpFoundation] Fix transient test
  [HttpFoundation] Add a dependency on the mbstring polyfill
  [2.7] update readme files for new components
  add readme files where missing
  [2.8] update readme files for new components
  fix lowest TwigBridge deps versions
  reference form type by name on Symfony 2.7
  [EventDispatcher] fix syntax error
  Don't use reflections when possible
  Don't use reflections when possible
  [Form] Update form tests after the ICU data update
  [Intl] Update tests and the number formatter to match behaviour of the intl extension
  ...

Conflicts:
	src/Symfony/Component/Ldap/README.md
	src/Symfony/Component/Security/Core/README.md
	src/Symfony/Component/Security/Csrf/README.md
	src/Symfony/Component/Security/Http/README.md

3 files changed, 18 insertions, 24 deletions

diff --git a/Core/README.md b/Core/README.md
index a423666..ede185b 100644
--- a/Core/README.md
+++ b/Core/README.md
@@ -9,15 +9,8 @@ the Java Spring framework.
 Resources
 ---------
 
-Documentation:
-
-https://symfony.com/doc/3.1/book/security.html
-
-Tests
------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Security/Core/
-    $ composer.phar install --dev
-    $ phpunit
+  * [Documentation](https://symfony.com/doc/current/components/security/index.html)
+  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+  * [Report issues](https://github.com/symfony/symfony/issues) and
+    [send Pull Requests](https://github.com/symfony/symfony/pulls)
+    in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/Csrf/README.md b/Csrf/README.md
index 68b5268..aff72a0 100644
--- a/Csrf/README.md
+++ b/Csrf/README.md
@@ -7,15 +7,8 @@ The Security CSRF (cross-site request forgery) component provides a class
 Resources
 ---------
 
-Documentation:
-
-https://symfony.com/doc/3.1/book/security.html
-
-Tests
------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Security/Csrf/
-    $ composer.phar install --dev
-    $ phpunit
+  * [Documentation](https://symfony.com/doc/current/components/security/index.html)
+  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+  * [Report issues](https://github.com/symfony/symfony/issues) and
+    [send Pull Requests](https://github.com/symfony/symfony/pulls)
+    in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/Http/README.md b/Http/README.md
index e5ee6b1..aaacc14 100644
--- a/Http/README.md
+++ b/Http/README.md
@@ -9,6 +9,7 @@ the Java Spring framework.
 Resources
 ---------
 
+<<<<<<< HEAD
 Documentation:
 
 https://symfony.com/doc/3.1/book/security.html
@@ -21,3 +22,10 @@ You can run the unit tests with the following command:
     $ cd path/to/Symfony/Component/Security/Http/
     $ composer.phar install --dev
     $ phpunit
+=======
+  * [Documentation](https://symfony.com/doc/current/components/security/index.html)
+  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+  * [Report issues](https://github.com/symfony/symfony/issues) and
+    [send Pull Requests](https://github.com/symfony/symfony/pulls)
+    in the [main Symfony repository](https://github.com/symfony/symfony)
+>>>>>>> 3.0