Merge branch '5.2' into 5.x

javiereguiluz · javiereguiluz · commit 573d1d710abf · 2021-04-21T11:55:14.000+02:00
* 5.2:
  Fixed a XML code example
diff --git a/security.rst b/security.rst
@@ -665,7 +665,7 @@ and set the ``limiter`` option to its service ID:
                 >
                     <!-- 1st argument is the limiter for IP -->
                     <srv:argument type="service" id="limiter.ip_login"/>
-                    <1-- 2nd argument is the limiter for username+IP -->
+                    <!-- 2nd argument is the limiter for username+IP -->
                     <srv:argument type="service" id="limiter.username_ip_login"/>
                 </srv:service>
             </srv:services>

Original file line number	Diff line number	Diff line change
@@ -665,7 +665,7 @@ and set the ``limiter`` option to its service ID:
`665`	`665`	`>`
`666`	`666`	`<!-- 1st argument is the limiter for IP -->`
`667`	`667`	`<srv:argument type="service" id="limiter.ip_login"/>`
`668`		`- <1-- 2nd argument is the limiter for username+IP -->`
	`668`	`+ <!-- 2nd argument is the limiter for username+IP -->`
`669`	`669`	`<srv:argument type="service" id="limiter.username_ip_login"/>`
`670`	`670`	`</srv:service>`
`671`	`671`	`</srv:services>`