Merge branch '3.4' into 4.0

* 3.4:
  Reworded the lock usage introduction
  Fix documentation regarding createLock() method
  Added the JS and CSS assets required by the doc theme
  Fix a small name error
  Added the Symfony Docs team
  Added Michael to the Core Team group

Author: weaverryan

_build/_theme/_templates/layout.html

@@ -1,13 +1,15 @@
 {% extends '!layout.html' %}
 
-{% set css_files = ['https://symfony.com/css/compiled/v5/all.css?v=4'] %}
+{% set css_files = ['./assets/css/app.css', './assets/css/doc.css'] %}
 {# make sure the Sphinx stylesheet isn't loaded #}
 {% set style = '' %}
 {% set isIndex = pagename is index %}
 
 {% block extrahead %}
 {# add JS to support tabs #}
-<script src="https://symfony.com/js/v5/all.js?v=4"></script>
+<script src="./assets/js/manifest.js"></script>
+<script src="./assets/js/app.js"></script>
+<script src="./assets/js/doc.js"></script>
 
 {# pygment's styles are still loaded, undo some unwanted styles #}
 <style>

_build/_theme/assets/css/app.css

@@ -26,19 +26,19 @@ Locks are used to guarantee exclusive access to some shared resource. In
 Symfony applications, you can use locks for example to ensure that a command is
 not executed more than once at the same time (on the same or different servers).
 
-In order to manage the state of locks, a ``Store`` needs to be created first
-and then use the :class:`Symfony\\Component\\Lock\\Factory` class to actually
-create the lock for some resource::
+Locks are created using a :class:`Symfony\\Component\\Lock\\Factory` class,
+which in turn requires another class to manage the storage of locks::
 
     use Symfony\Component\Lock\Factory;
     use Symfony\Component\Lock\Store\SemaphoreStore;
 
     $store = new SemaphoreStore();
     $factory = new Factory($store);
 
-Then, a call to the :method:`Symfony\\Component\\Lock\\LockInterface::acquire`
-method will try to acquire the lock. Its first argument is an arbitrary string
-that represents the locked resource::
+The lock is created by calling the :method:`Symfony\\Component\\Lock\\Factory::createLock`
+method. Its first argument is an arbitrary string that represents the locked
+resource. Then, a call to the :method:`Symfony\\Component\\Lock\\LockInterface::acquire`
+method will try to acquire the lock::
 
     // ...
     $lock = $factory->createLock('pdf-invoice-generation');

_build/_theme/assets/css/doc.css

@@ -444,7 +444,7 @@ A custom name converter can handle such cases::
         }
     }
 
-The custom normalizer can be used by passing it as second parameter of any
+The custom name converter can be used by passing it as second parameter of any
 class extending :class:`Symfony\\Component\\Serializer\\Normalizer\\AbstractNormalizer`,
 including :class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer`
 and :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer`::

_build/_theme/assets/js/app.js

@@ -16,9 +16,9 @@ must adhere to said rules and protocol.
 Core Organization
 -----------------
 
-Symfony Core members are divided into three groups. Each member can only belong
-to one group at a time. The privileges granted to a group are automatically
-granted to all higher priority groups.
+Symfony Core members are divided into groups. Each member can only belong to one
+group at a time. The privileges granted to a group are automatically granted to
+all higher priority groups.
 
 The Symfony Core groups, in descending order of priority, are as follows:
 
@@ -27,15 +27,26 @@ The Symfony Core groups, in descending order of priority, are as follows:
 * Elects members in any other group;
 * Merges pull requests in all Symfony repositories.
 
-2. **Mergers**
+2. **Mergers Team**
 
 * Merge pull requests for the component or components on which they have been
   granted privileges.
 
-3. **Deciders**
+3. **Deciders Team**
 
 * Decide to merge or reject a pull request.
 
+In addition, there are other groups created to manage specific topics:
+
+**Security Team**
+
+* Manage the whole security process (triaging reported vulnerabilities, fixing
+  the reported issues, coordinating the release of security fixes, etc.)
+
+**Documentation Team**
+
+* Manage the whole `symfony-docs repository`_.
+
 Active Core Members
 ~~~~~~~~~~~~~~~~~~~
 
@@ -47,7 +58,7 @@ Active Core Members
 
   * **Fabien Potencier** (`fabpot`_).
 
-* **Mergers** (``@symfony/mergers`` on GitHub):
+* **Mergers Team** (``@symfony/mergers`` on GitHub):
 
   * **Tobias Schultze** (`Tobion`_) can merge into the Routing_,
     OptionsResolver_ and PropertyAccess_ components;
@@ -88,11 +99,25 @@ Active Core Members
 
   * **Samuel Rozé** (`sroze`_) can merge into Messenger_ component.
 
-* **Deciders** (``@symfony/deciders`` on GitHub):
+* **Deciders Team** (``@symfony/deciders`` on GitHub):
 
   * **Jordi Boggiano** (`seldaek`_);
   * **Lukas Kahwe Smith** (`lsmith77`_).
 
+* **Security Team** (``@symfony/security`` on GitHub):
+
+  * **Fabien Potencier** (`fabpot`_);
+  * **Michael Cullum** (`michaelcullum`_).
+
+* **Documentation Team** (``@symfony/team-symfony-docs`` on GitHub):
+
+  * **Fabien Potencier** (`fabpot`_);
+  * **Ryan Weaver** (`weaverryan`_);
+  * **Christian Flothmann** (`xabbuh`_);
+  * **Wouter De Jong** (`wouterj`_);
+  * **Jules Pietri** (`HeahDude`_);
+  * **Javier Eguiluz** (`javiereguiluz`_).
+
 Former Core Members
 ~~~~~~~~~~~~~~~~~~~
 
@@ -212,6 +237,7 @@ discretion of the **Project Leader**.
 .. _Workflow: https://github.com/symfony/workflow
 .. _Yaml: https://github.com/symfony/yaml
 .. _WebProfilerBundle: https://github.com/symfony/web-profiler-bundle
+.. _`symfony-docs repository`: https://github.com/symfony/symfony-docs
 .. _`fabpot`: https://github.com/fabpot/
 .. _`webmozart`: https://github.com/webmozart/
 .. _`Tobion`: https://github.com/Tobion/
@@ -231,3 +257,6 @@ discretion of the **Project Leader**.
 .. _`ogizanagi`: https://github.com/ogizanagi/
 .. _`Nyholm`: https://github.com/Nyholm
 .. _`sroze`: https://github.com/sroze
+.. _`michaelcullum`: https://github.com/michaelcullum
+.. _`wouterj`: https://github.com/wouterj
+.. _`HeahDude`: https://github.com/HeahDude