Merge branch '4.4' into 5.0

javiereguiluz · javiereguiluz · commit 99b1b4bad519 · 2020-05-19T16:12:19.000+02:00
* 4.4:
  Update templates.rst
diff --git a/templates.rst b/templates.rst
@@ -947,7 +947,7 @@ JavaScript popup window.
 
 This is known as a `Cross-Site Scripting`_ (XSS) attack. And while the previous
 example seems harmless, the attacker could write more advanced JavaScript code
-to performs malicious actions.
+to perform malicious actions.
 
 To prevent this attack, use *"output escaping"* to transform the characters
 which have special meaning (e.g. replace ``<`` by the ``&lt;`` HTML entity).
