symfony
diff --git a/‎contributing/code/core_team.rst
Lines changed: 29 additions & 93 deletions b/‎contributing/code/core_team.rst
Lines changed: 29 additions & 93 deletions
diff --git a/‎performance.rst
Lines changed: 5 additions & 6 deletions b/‎performance.rst
Lines changed: 5 additions & 6 deletions
@@ -29,12 +29,7 @@ The Symfony Core groups, in descending order of priority, are as follows:
 
 2. **Mergers Team**
 
-* Merge pull requests for the component or components on which they have been
-  granted privileges.
-
-3. **Deciders Team**
-
-* Decide to merge or reject a pull request.
+* Merge pull requests on the main Symfony repository.
 
 In addition, there are other groups created to manage specific topics:
 
@@ -43,6 +38,10 @@ In addition, there are other groups created to manage specific topics:
 * Manage the whole security process (triaging reported vulnerabilities, fixing
   the reported issues, coordinating the release of security fixes, etc.)
 
+**Recipes Team**
+
+* Manage the recipes in the main and contrib recipe repositories.
+
 **Documentation Team**
 
 * Manage the whole `symfony-docs repository`_.
@@ -56,55 +55,30 @@ Active Core Members
 
 * **Mergers Team** (``@symfony/mergers`` on GitHub):
 
-  * **Nicolas Grekas** (`nicolas-grekas`_) can merge into all components,
-    bridges and bundles;
-
-  * **Christophe Coevoet** (`stof`_) can merge into all components, bridges and
-    bundles;
-
-  * **Christian Flothmann** (`xabbuh`_) can merge into all components,
-    bridges and bundles;
-
-  * **Tobias Schultze** (`Tobion`_) can merge into the Routing_,
-    OptionsResolver_ and PropertyAccess_ components;
-
-  * **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_, the Serializer_
-    and the WebLink_ components;
-
-  * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ and Intl_
-    components;
-
-  * **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_;
-
-  * **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component;
-
-  * **Ryan Weaver** (`weaverryan`_) can merge into the Security_ component and
-    the SecurityBundle_;
-
-  * **Robin Chalas** (`chalasr`_) can merge into the Console_ and Security_
-    components and the SecurityBundle_;
-
-  * **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_,
-    Form_, Serializer_, DependencyInjection_, and HttpKernel_ components;
-
-  * **Tobias Nyholm** (`Nyholm`_) manages the official and contrib recipes
-    repositories;
-
-  * **Samuel Rozé** (`sroze`_) can merge into the Messenger_ component.
-
-  * **Yonel Ceruto** (`yceruto`_) can merge into the ErrorRenderer_,
-    OptionsResolver_, and Form_ components and TwigBundle_.
-
-* **Deciders Team** (``@symfony/deciders`` on GitHub):
-
-  * **Jordi Boggiano** (`seldaek`_);
-  * **Lukas Kahwe Smith** (`lsmith77`_).
+  * **Nicolas Grekas** (`nicolas-grekas`_);
+  * **Christophe Coevoet** (`stof`_);
+  * **Christian Flothmann** (`xabbuh`_);
+  * **Tobias Schultze** (`Tobion`_);
+  * **Kévin Dunglas** (`dunglas`_);
+  * **Jakub Zalas** (`jakzal`_);
+  * **Javier Eguiluz** (`javiereguiluz`_);
+  * **Grégoire Pineau** (`lyrixx`_);
+  * **Ryan Weaver** (`weaverryan`_);
+  * **Robin Chalas** (`chalasr`_);
+  * **Maxime Steinhausser** (`ogizanagi`_);
+  * **Samuel Rozé** (`sroze`_);
+  * **Yonel Ceruto** (`yceruto`_).
 
 * **Security Team** (``@symfony/security`` on GitHub):
 
   * **Fabien Potencier** (`fabpot`_);
   * **Michael Cullum** (`michaelcullum`_).
 
+* **Recipes Team**:
+
+  * **Fabien Potencier** (`fabpot`_);
+  * **Tobias Nyholm** (`Nyholm`_).
+
 * **Documentation Team** (``@symfony/team-symfony-docs`` on GitHub):
 
   * **Fabien Potencier** (`fabpot`_);
@@ -123,7 +97,8 @@ Symfony contributions:
 
 * **Bernhard Schussek** (`webmozart`_);
 * **Abdellatif AitBoudad** (`aitboudad`_);
-* **Romain Neutron**.
+* **Romain Neutron**;
+* **Jordi Boggiano** (`Seldaek`_).
 
 Core Membership Application
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -170,11 +145,11 @@ A pull request **can be merged** if:
 
 * It is a minor change [1]_;
 
-* Enough time was given for peer reviews (at least 2 days for "regular"
-  pull requests, and 4 days for pull requests with "a significant impact");
+* Enough time was given for peer reviews;
 
-* At least the component's **Merger** or two other Core members voted ``+1``
-  and no Core member voted ``-1``.
+* At least two **Merger Team** members voted ``+1`` (only one if the submitter
+  is part of the Merger team) and no Core member voted ``-1`` (via Github
+  reviews or as comments).
 
 Pull Request Merging Process
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -199,45 +174,6 @@ discretion of the **Project Leader**.
 .. [1] Minor changes comprise typos, DocBlock fixes, code standards
        violations, and minor CSS, JavaScript and HTML modifications.
 
-.. _PhpUnitBridge: https://github.com/symfony/phpunit-bridge
-.. _BrowserKit: https://github.com/symfony/browser-kit
-.. _Cache: https://github.com/symfony/cache
-.. _Config: https://github.com/symfony/config
-.. _Console: https://github.com/symfony/console
-.. _Debug: https://github.com/symfony/debug
-.. _DebugBundle: https://github.com/symfony/debug-bundle
-.. _DependencyInjection: https://github.com/symfony/dependency-injection
-.. _DoctrineBridge: https://github.com/symfony/doctrine-bridge
-.. _EventDispatcher: https://github.com/symfony/event-dispatcher
-.. _DomCrawler: https://github.com/symfony/dom-crawler
-.. _ErrorRenderer: https://github.com/symfony/error-renderer
-.. _Form: https://github.com/symfony/form
-.. _HttpFoundation: https://github.com/symfony/http-foundation
-.. _HttpKernel: https://github.com/symfony/http-kernel
-.. _Icu: https://github.com/symfony/icu
-.. _Intl: https://github.com/symfony/intl
-.. _LDAP: https://github.com/symfony/ldap
-.. _Locale: https://github.com/symfony/locale
-.. _Messenger: https://github.com/symfony/messenger
-.. _MonologBridge: https://github.com/symfony/monolog-bridge
-.. _OptionsResolver: https://github.com/symfony/options-resolver
-.. _Process: https://github.com/symfony/process
-.. _PropertyAccess: https://github.com/symfony/property-access
-.. _PropertyInfo: https://github.com/symfony/property-info
-.. _Routing: https://github.com/symfony/routing
-.. _Serializer: https://github.com/symfony/serializer
-.. _Translation: https://github.com/symfony/translation
-.. _Security: https://github.com/symfony/security
-.. _SecurityBundle: https://github.com/symfony/security-bundle
-.. _Stopwatch: https://github.com/symfony/stopwatch
-.. _TwigBridge: https://github.com/symfony/twig-bridge
-.. _TwigBundle: https://github.com/symfony/twig-bundle
-.. _Validator: https://github.com/symfony/validator
-.. _VarDumper: https://github.com/symfony/var-dumper
-.. _Workflow: https://github.com/symfony/workflow
-.. _Yaml: https://github.com/symfony/yaml
-.. _WebProfilerBundle: https://github.com/symfony/web-profiler-bundle
-.. _WebLink: https://github.com/symfony/web-link
 .. _`symfony-docs repository`: https://github.com/symfony/symfony-docs
 .. _`fabpot`: https://github.com/fabpot/
 .. _`webmozart`: https://github.com/webmozart/
 
@@ -125,14 +125,13 @@ deployment process too):
 
 .. code-block:: terminal
 
-    $ composer dump-autoload --optimize --no-dev --classmap-authoritative
+    $ composer dump-autoload --no-dev --classmap-authoritative
 
-* ``--optimize`` dumps every PSR-0 and PSR-4 compatible class used in your
-  application;
 * ``--no-dev`` excludes the classes that are only needed in the development
-  environment (e.g. tests);
-* ``--classmap-authoritative`` prevents Composer from scanning the file
-  system for classes that are not found in the class map.
+  environment (i.e. ``require-dev`` dependencies and ``autoload-dev`` rules);
+* ``--classmap-authoritative`` creates a class map for PSR-0 and PSR-4 compatible classes
+  used in your application and prevents Composer from scanning the file system for
+  classes that are not found in the class map. (see: `Composer's autoloader optimization`_).
 
 Learn more
 ----------