Merge branch '5.2' into 5.x

* 5.2:
  [RateLimiter] Adding config reference for policy and lock_factory
  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
  Update lockable_trait.rst

Author: javiereguiluz

_build/redirection_map

@@ -449,15 +449,15 @@
 /reference/requirements /setup
 /bundles/inheritance /bundles/override
 /templating /templates
-/templating/escaping /templates
-/templating/syntax /templates
-/templating/debug /templates
-/templating/render_without_controller /templates
-/templating/app_variable /templates
+/templating/escaping /templates#output-escaping
+/templating/syntax /templates#linting-twig-templates
+/templating/debug /templates#the-dump-twig-utilities
+/templating/render_without_controller /templates#rendering-a-template-directly-from-a-route
+/templating/app_variable /templates#the-app-global-variable
 /templating/formats /templates
-/templating/namespaced_paths /templates
-/templating/embedding_controllers /templates
-/templating/inheritance /templates
+/templating/namespaced_paths /templates#template-namespaces
+/templating/embedding_controllers /templates#embedding-controllers
+/templating/inheritance /templates#template-inheritance-and-layouts
 /testing/doctrine /testing/database
 /doctrine/lifecycle_callbacks /doctrine/events
 /doctrine/event_listeners_subscribers /doctrine/events

console/lockable_trait.rst

@@ -39,7 +39,7 @@ that adds two convenient methods to lock and release commands::
             // automatically when the execution of the command ends
             $this->release();
 
-            return Command:SUCCESS;
+            return Command::SUCCESS;
         }
     }
 

contributing/documentation/overview.rst

@@ -121,7 +121,7 @@ branch of the ``upstream`` remote, which is the original Symfony Docs repository
 Fixes should always be based on the **oldest maintained branch** which contains
 the error. Nowadays this is the ``4.4`` branch. If you are instead documenting a
 new feature, switch to the first Symfony version that included it, e.g.
-``upstream/3.1``. Not sure? That's OK! Just use the ``upstream/master`` branch.
+``upstream/3.1``.
 
 **Step 5.** Now make your changes in the documentation. Add, tweak, reword and
 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
 be fully reviewed. After merging the changes, it could take again several hours
 before your changes appear on the Symfony website.
 
-Why Should I Use the Oldest Maintained Branch Instead of the Master Branch?
+Why Should I Use the Oldest Maintained Branch Instead of the Latest Branch?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Consistent with Symfony's source code, the documentation repository is split
 into multiple branches, corresponding to the different versions of Symfony itself.
-The ``master`` branch holds the documentation for the development branch of
+The latest (e.g. ``5.x``) branch holds the documentation for the development branch of
 the code.
 
 Unless you're documenting a feature that was introduced after Symfony 4.4,

rate_limiter.rst

@@ -16,6 +16,8 @@ Symfony uses these rate limiters in built-in features like "login throttling",
 which limits how many failed login attempts a user can make in a given period of
 time, but you can use them for your own features too.
 
+.. _rate-limiter-policies:
+
 Rate Limiting Policies
 ----------------------
 

reference/configuration/framework.rst

@@ -211,6 +211,13 @@ Configuration
 
   * :ref:`enabled <reference-property-info-enabled>`
 
+* `rate_limiter`_:
+
+  * :ref:`name <reference-rate-limiter-name>`
+
+    * `lock_factory`_
+    * `policy`_
+
 * `request`_:
 
   * `formats`_
@@ -1226,6 +1233,35 @@ dsn
 
 The DSN where to store the profiling information.
 
+rate_limiter
+~~~~~~~~~~~~
+
+.. _reference-rate-limiter-name:
+
+name
+....
+
+**type**: ``prototype``
+
+Name of the rate limiter you want to create.
+
+lock_factory
+""""""""""""
+
+**type**: ``string`` **default:** ``lock.factory``
+
+The service that is used to create a lock. The service has to be an instance of
+the :class:`Symfony\\Component\\Lock\\LockFactory` class.
+
+policy
+""""""
+
+**type**: ``string`` **required**
+
+The name of the rate limiting algorithm to use. Example names are ``fixed_window``,
+``sliding_window`` and ``no_limit``. See :ref:`Rate Limiter Policies <rate-limiter-policies>`)
+for more information.
+
 request
 ~~~~~~~
 
@@ -1399,11 +1435,11 @@ alias will be set to this service id. This class has to implement
 handler_id
 ..........
 
-**type**: ``string`` **default**: ``null``
+**type**: ``string`` **default**: ``'session.handler.native_file'``
 
-The service id used for session storage. The default ``null`` value means to use
-the native PHP session mechanism. Set it to ``'session.handler.native_file'`` to
-let Symfony manage the sessions itself using files to store the session metadata.
+The service id used for session storage. The default value ``'session.handler.native_file'``
+will let Symfony manage the sessions itself using files to store the session metadata.
+Set it to ``null`` to use the native PHP session mechanism.
 You can also :doc:`store sessions in a database </session/database>`.
 
 .. _name: