Skip to content

Commit 08a2663

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: remove mention of master branch, no longer exists [Session] Update incorrect default value for session.handler_id Added redirections to specific anchors for removed Templating articles
2 parents 6e27733 + 62663fb commit 08a2663

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

_build/redirection_map

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -449,15 +449,15 @@
449449
/reference/requirements /setup
450450
/bundles/inheritance /bundles/override
451451
/templating /templates
452-
/templating/escaping /templates
453-
/templating/syntax /templates
454-
/templating/debug /templates
455-
/templating/render_without_controller /templates
456-
/templating/app_variable /templates
452+
/templating/escaping /templates#output-escaping
453+
/templating/syntax /templates#linting-twig-templates
454+
/templating/debug /templates#the-dump-twig-utilities
455+
/templating/render_without_controller /templates#rendering-a-template-directly-from-a-route
456+
/templating/app_variable /templates#the-app-global-variable
457457
/templating/formats /templates
458-
/templating/namespaced_paths /templates
459-
/templating/embedding_controllers /templates
460-
/templating/inheritance /templates
458+
/templating/namespaced_paths /templates#template-namespaces
459+
/templating/embedding_controllers /templates#embedding-controllers
460+
/templating/inheritance /templates#template-inheritance-and-layouts
461461
/testing/doctrine /testing/database
462462
/doctrine/lifecycle_callbacks /doctrine/events
463463
/doctrine/event_listeners_subscribers /doctrine/events

contributing/documentation/overview.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ branch of the ``upstream`` remote, which is the original Symfony Docs repository
121121
Fixes should always be based on the **oldest maintained branch** which contains
122122
the error. Nowadays this is the ``4.4`` branch. If you are instead documenting a
123123
new feature, switch to the first Symfony version that included it, e.g.
124-
``upstream/3.1``. Not sure? That's OK! Just use the ``upstream/master`` branch.
124+
``upstream/3.1``.
125125

126126
**Step 5.** Now make your changes in the documentation. Add, tweak, reword and
127127
even remove any content and do your best to comply with the
@@ -295,12 +295,12 @@ Please be patient. It can take up to several days before your pull request can
295295
be fully reviewed. After merging the changes, it could take again several hours
296296
before your changes appear on the Symfony website.
297297

298-
Why Should I Use the Oldest Maintained Branch Instead of the Master Branch?
298+
Why Should I Use the Oldest Maintained Branch Instead of the Latest Branch?
299299
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
300300

301301
Consistent with Symfony's source code, the documentation repository is split
302302
into multiple branches, corresponding to the different versions of Symfony itself.
303-
The ``master`` branch holds the documentation for the development branch of
303+
The latest (e.g. ``5.x``) branch holds the documentation for the development branch of
304304
the code.
305305

306306
Unless you're documenting a feature that was introduced after Symfony 4.4,

reference/configuration/framework.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,11 +1240,11 @@ alias will be set to this service id. This class has to implement
12401240
handler_id
12411241
..........
12421242

1243-
**type**: ``string`` **default**: ``null``
1243+
**type**: ``string`` **default**: ``'session.handler.native_file'``
12441244

1245-
The service id used for session storage. The default ``null`` value means to use
1246-
the native PHP session mechanism. Set it to ``'session.handler.native_file'`` to
1247-
let Symfony manage the sessions itself using files to store the session metadata.
1245+
The service id used for session storage. The default value ``'session.handler.native_file'``
1246+
will let Symfony manage the sessions itself using files to store the session metadata.
1247+
Set it to ``null`` to use the native PHP session mechanism.
12481248
You can also :doc:`store sessions in a database </session/database>`.
12491249

12501250
.. _name:

0 commit comments

Comments
 (0)