Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8cdfc03

Browse filesBrowse files
committed
Merge branch '6.0' into 6.1
* 6.0: Fix some code issue [Refs] Fixed refs displaying incorrectly
2 parents 343e56d + d51cad1 commit 8cdfc03
Copy full SHA for 8cdfc03

File tree

3 files changed

+16
-6
lines changed
Filter options

3 files changed

+16
-6
lines changed

‎.doctor-rst.yaml

Copy file name to clipboardExpand all lines: .doctor-rst.yaml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ whitelist:
9393
- 'provides a ``loginUser()`` method to simulate logging in in your functional'
9494
- '.. code-block:: twig'
9595
- '.. versionadded:: 3.6' # MonologBundle
96+
- '.. versionadded:: 3.8' # MonologBundle
9697
- '// bin/console'
9798
- '.. _`a feature to test applications using Mercure`: https://github.com/symfony/panther#creating-isolated-browsers-to-test-apps-using-mercure-or-websocket'
9899
- '.. End to End Tests (E2E)'

‎components/lock.rst

Copy file name to clipboardExpand all lines: components/lock.rst
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ will fallback to a write lock by calling the ``acquire()`` method.
299299
The Owner of The Lock
300300
---------------------
301301

302-
Locks that are acquired for the first time are owned [1]_ by the ``Lock`` instance that acquired
302+
Locks that are acquired for the first time are :ref:`owned <lock-owner-technical-details>` by the ``Lock`` instance that acquired
303303
it. If you need to check whether the current ``Lock`` instance is (still) the owner of
304304
a lock, you can use the ``isAcquired()`` method::
305305

@@ -336,7 +336,11 @@ lose the lock it acquired automatically::
336336
you have to use ``acquire()`` for this. The ``isAcquired()`` method is used to check
337337
if the lock has been acquired by the **current process** only.
338338

339-
.. [1] Technically, the true owners of the lock are the ones that share the same instance of ``Key``,
339+
.. _lock-owner-technical-details:
340+
341+
.. note::
342+
343+
Technically, the true owners of the lock are the ones that share the same instance of ``Key``,
340344
not ``Lock``. But from a user perspective, ``Key`` is internal and you will likely only be working
341345
with the ``Lock`` instance so it's easier to think of the ``Lock`` instance as being the one that
342346
is the owner of the lock.

‎contributing/code/core_team.rst

Copy file name to clipboardExpand all lines: contributing/code/core_team.rst
+9-4Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Pull Request Merging Policy
146146

147147
A pull request **can be merged** if:
148148

149-
* It is a minor change [1]_;
149+
* It is a :ref:`minor change <core-team_minor-changes>`;
150150

151151
* Enough time was given for peer reviews;
152152

@@ -162,7 +162,8 @@ Pull Request Merging Process
162162
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
163163

164164
All code must be committed to the repository through pull requests, except for
165-
minor changes [1]_ which can be committed directly to the repository.
165+
:ref:`minor change <core-team_minor-changes>` which can be committed directly
166+
to the repository.
166167

167168
**Mergers** must always use the command-line ``gh`` tool provided by the
168169
**Project Leader** to merge the pull requests.
@@ -178,8 +179,12 @@ Symfony Core Rules and Protocol Amendments
178179
The rules described in this document may be amended at any time at the
179180
discretion of the **Project Leader**.
180181

181-
.. [1] Minor changes comprise typos, DocBlock fixes, code standards
182-
violations, and minor CSS, JavaScript and HTML modifications.
182+
.. _core-team_minor-changes:
183+
184+
.. note::
185+
186+
Minor changes comprise typos, DocBlock fixes, code standards
187+
violations, and minor CSS, JavaScript and HTML modifications.
183188

184189
.. _`symfony-docs repository`: https://github.com/symfony/symfony-docs
185190
.. _`fabpot`: https://github.com/fabpot/

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.