Skip to content

Commit 2078481

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Fixing missing space in configuration docs Minor formatting tweaks in the Core Team article
2 parents 52dc0e6 + 70fda01 commit 2078481

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ readable. These are the main advantages and disadvantages of each format:
6969

7070
* **YAML**: simple, clean and readable, but not all IDEs support autocompletion
7171
and validation for it. :doc:`Learn the YAML syntax </components/yaml/yaml_format>`;
72-
* **XML**:autocompleted/validated by most IDEs and is parsed natively by PHP,
72+
* **XML**: autocompleted/validated by most IDEs and is parsed natively by PHP,
7373
but sometimes it generates configuration considered too verbose. `Learn the XML syntax`_;
7474
* **PHP**: very powerful and it allows you to create dynamic configuration with
7575
arrays or a :ref:`ConfigBuilder <config-config-builder>`.

contributing/code/core_team.rst

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,21 @@ The Symfony Core groups, in descending order of priority, are as follows:
2424

2525
1. **Project Leader**
2626

27-
* Elects members in any other group;
28-
* Merges pull requests in all Symfony repositories.
27+
* Elects members in any other group;
28+
* Merges pull requests in all Symfony repositories.
2929

3030
2. **Mergers Team**
3131

32-
* Merge pull requests on the main Symfony repository.
32+
* Merge pull requests on the main Symfony repository.
3333

3434
In addition, there are other groups created to manage specific topics:
3535

36-
**Security Team**
36+
* **Security Team**: manages the whole security process (triaging reported vulnerabilities,
37+
fixing the reported issues, coordinating the release of security fixes, etc.)
3738

38-
* Manage the whole security process (triaging reported vulnerabilities, fixing
39-
the reported issues, coordinating the release of security fixes, etc.)
39+
* **Recipes Team**: manages the recipes in the main and contrib recipe repositories.
4040

41-
**Recipes Team**
42-
43-
* Manage the recipes in the main and contrib recipe repositories.
44-
45-
**Documentation Team**
46-
47-
* Manage the whole `symfony-docs repository`_.
41+
* **Documentation Team**: manages the whole `symfony-docs repository`_.
4842

4943
Active Core Members
5044
~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)