Skip to content

Commit 5546911

Browse files
committed
Merge branch '4.2'
* 4.2: Update session.rst renamed Patches to Pull Requests
2 parents adb16dc + 39869cc commit 5546911

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

contributing/map.rst.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* **Code**
99

1010
* :doc:`Bugs </contributing/code/bugs>`
11-
* :doc:`Patches </contributing/code/pull_requests>`
12-
* :doc:`Reviewing Issues and Patches </contributing/community/reviews>`
11+
* :doc:`Pull Requests </contributing/code/pull_requests>`
12+
* :doc:`Reviewing Issues and Pull Requests </contributing/community/reviews>`
1313
* :doc:`Maintenance </contributing/code/maintenance>`
1414
* :doc:`The Core Team </contributing/code/core_team>`
1515
* :doc:`Security </contributing/code/security>`

session.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ sessions, check their default configuration:
7171
Setting the ``handler_id`` config option to ``null`` means that Symfony will
7272
use the native PHP session mechanism. The session metadata files will be stored
7373
outside of the Symfony application, in a directory controlled by PHP. Although
74-
this usually simplify things, some session expiration related options may no
74+
this usually simplify things, some session expiration related options may not
7575
work as expected if other applications that write to the same directory have
7676
short max lifetime settings.
7777

0 commit comments

Comments
 (0)