8000 Merge branch '3.4' into 4.0 · fmata/symfony-docs@a35d4a8 · GitHub
[go: up one dir, main page]
Skip to content

Commit a35d4a8

Browse files
weaverryanweaverryan
committed
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
2 parents 14f4899 + 1e9e842 commit a35d4a8

File tree

9 files changed

+77
-16
lines changed

9 files changed

+77
-16
lines changed

‎_build/_theme/_templates/layout.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
{% extends '!layout.html' %}
22

3-
{% set css_files = ['https://symfony.com/css/compiled/v5/all.css?v=4'] %}
3+
{% set css_files = ['./assets/css/app.css', './assets/css/doc.css'] %}
44
{# make sure the Sphinx stylesheet isn't loaded #}
55
{% set style = '' %}
66
{% set isIndex = pagename is index %}
77

88
{% block extrahead %}
99
{# add JS to support tabs #}
10-
<script src="https://symfony.com/js/v5/all.js?v=4"></script>
10+
<script src="./assets/js/manifest.js"></script>
11+
<script src="./assets/js/app.js"></script>
12+
<script src="./assets/js/doc.js"></script>
1113

1214
{# pygment's styles are still loaded, undo some unwanted styles #}
1315
<style>

‎_build/_theme/assets/css/app.css

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_build/_theme/assets/css/doc.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_build/_theme/assets/js/app.js

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_build/_theme/assets/js/doc.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_build/_theme/assets/js/manifest.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/lock.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ Locks are used to guarantee exclusive access to some shared resource. In
2626
Symfony applications, you can use locks for example to ensure that a command is
2727
not executed more than once at the same time (on the same or different servers).
2828

29-
In order to manage the state of locks, a ``Store`` needs to be created first
30-
and then use the :class:`Symfony\\Component\\Lock\\Factory` class to actually
31-
create the lock for some resource::
29+
Locks are created using a :class:`Symfony\\Component\\Lock\\Factory` class,
30+
which in turn requires another class to manage the storage of locks::
3231

3332
use Symfony\Component\Lock\Factory;
3433
use Symfony\Component\Lock\Store\SemaphoreStore;
3534

3635
$store = new SemaphoreStore();
3736
$factory = new Factory($store);
3837

39-
Then, a call to the :method:`Symfony\\Component\\Lock\\LockInterface::acquire`
40-
method will try to acquire the lock. Its first argument is an arbitrary string
41-
that represents the locked resource::
38+
The lock is created by calling the :method:`Symfony\\Component\\Lock\\Factory::createLock`
39+
method. Its first argument is an arbitrary string that represents the locked
40+
resource. Then, a call to the :method:`Symfony\\Component\\Lock\\LockInterface::acquire`
41+
method will try to acquire the lock::
4242

4343
// ...
4444
$lock = $factory->createLock('pdf-invoice-generation');

‎components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ A custom name converter can handle such cases::
444444
}
445445
}
446446

447-
The custom normalizer can be used by passing it as second parameter of any
447+
The custom name converter can be used by passing it as second parameter of any
448448
class extending :class:`Symfony\\Component\\Serializer\\Normalizer\\AbstractNormalizer`,
449449
including :class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer`
450450
and :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer`::

‎contributing/code/core_team.rst

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ must adhere to said rules and protocol.
1616
Core Organization
1717
-----------------
1818

19-
Symfony Core members are divided into three groups. Each member can only belong
20-
to one group at a time. The privileges granted to a group are automatically
21-
granted to all higher priority groups.
19+
Symfony Core members are divided into groups. Each member can only belong to one
20+
group at a time. The privileges granted to a group are automatically granted to
21+
all higher priority groups.
2222

2323
The Symfony Core groups, in descending order of priority, are as follows:
2424

@@ -27,15 +27,26 @@ The Symfony Core groups, in descending order of priority, are as follows:
2727
* Elects members in any other group;
2828
* Merges pull requests in all Symfony repositories.
2929

30-
2. **Mergers**
30+
2. **Mergers Team**
3131

3232
* Merge pull requests for the component or components on which they have been
3333
granted privileges.
3434

35-
3. **Deciders**
35+
3. **Deciders Team**
3636

3737
* Decide to merge or reject a pull request.
3838

39+
In addition, there are other groups created to manage specific topics:
40+
41+
**Security Team**
42+
43+
* Manage the whole security process (triaging reported vulnerabilities, fixing
44+
the reported issues, coordinating the release of security fixes, etc.)
45+
46+
**Documentation Team**
47+
48+
* Manage the whole `symfony-docs repository`_.
49+
3950
Active Core Members
4051
~~~~~~~~~~~~~~~~~~~
4152

@@ -47,7 +58,7 @@ Active Core Members
4758

4859
* **Fabien Potencier** (`fabpot`_).
4960

50-
* **Mergers** (``@symfony/mergers`` on GitHub):
61+
* **Mergers Team** (``@symfony/mergers`` on GitHub):
5162

5263
* **Tobias Schultze** (`Tobion`_) can merge into the Routing_,
5364
OptionsResolver_ and PropertyAccess_ components;
@@ -88,11 +99,25 @@ Active Core Members
8899

89100
* **Samuel Rozé** (`sroze`_) can merge into Messenger_ component.
90101

91-
* **Deciders** (``@symfony/deciders`` on GitHub):
102+
* **Deciders Team** (``@symfony/deciders`` on GitHub):
92103

93104
* **Jordi Boggiano** (`seldaek`_);
94105
* **Lukas Kahwe Smith** (`lsmith77`_).
95106

107+
* **Security Team** (``@symfony/security`` on GitHub):
108+
109+
* **Fabien Potencier** (`fabpot`_);
110+
* **Michael Cullum** (`michaelcullum`_).
111+
112+
* **Documentation Team** (``@symfony/team-symfony-docs`` on GitHub):
113+
114+
* **Fabien Potencier** (`fabpot`_);
115+
* **Ryan Weaver** (`weaverryan`_);
116+
* **Christian Flothmann** (`xabbuh`_);
117+
* **Wouter De Jong** (`wouterj`_);
118+
* **Jules Pietri** (`HeahDude`_);
119+
* **Javier Eguiluz** (`javiereguiluz`_).
120+
96121
Former Core Members
97122
~~~~~~~~~~~~~~~~~~~
98123

@@ -212,6 +237,7 @@ discretion of the **Project Leader**.
212237
.. _Workflow: https://github.com/symfony/workflow
213238
.. _Yaml: https://github.com/symfony/yaml
214239
.. _WebProfilerBundle: https://github.com/symfony/web-profiler-bundle
240+
.. _`symfony-docs repository`: https://github.com/symfony/symfony-docs
215241
.. _`fabpot`: https://github.com/fabpot/
216242
.. _`webmozart`: https://github.com/webmozart/
217243
.. _`Tobion`: https://github.com/Tobion/
@@ -231,3 +257,6 @@ discretion of the **Project Leader**.
231257
.. _`ogizanagi`: https://github.com/ogizanagi/
232258
.. _`Nyholm`: https://github.com/Nyholm
233259
.. _`sroze`: https://github.com/sroze
260+
.. _`michaelcullum`: https://github.com/michaelcullum
261+
.. _`wouterj`: https://github.com/wouterj
262+
.. _`HeahDude`: https://github.com/HeahDude

0 commit comments

Comments
 (0)
0