Merge branch '5.2' into 5.x

javiereguiluz · javiereguiluz · commit 9c6529b33bb8 · 2021-03-18T09:26:32.000+01:00
* 5.2:
  Fix to use yaml syntax
diff --git a/deployment/proxies.rst b/deployment/proxies.rst
@@ -31,11 +31,11 @@ and what headers your reverse proxy uses to send information:
         # config/packages/framework.yaml
         framework:
             # ...
-            // the IP address (or range) of your proxy
+            # the IP address (or range) of your proxy
             trusted_proxies: '192.0.0.1,10.0.0.0/8'
-            // trust *all* "X-Forwarded-*" headers
+            # trust *all* "X-Forwarded-*" headers
             trusted_headers: ['x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port']
-            // or, if your proxy instead uses the "Forwarded" header
+            # or, if your proxy instead uses the "Forwarded" header
             trusted_headers: ['forwarded']
 
     .. code-block:: xml
