Merge remote-tracking branch 'upstream/develop' into 4.5

Author: kenjis

system/Commands/Utilities/FilterCheck.php

@@ -57,7 +57,7 @@ class FilterCheck extends BaseCommand
      */
     protected $arguments = [
         'method' => 'The HTTP method. get, post, put, etc.',
-        'route'  => 'The route (URI path) to check filtes.',
+        'route'  => 'The route (URI path) to check filters.',
     ];
 
     /**

user_guide_src/source/libraries/validation.rst

@@ -576,7 +576,7 @@ or the value that was validated you can add the ``{field}``, ``{param}`` and ``{
 On a field with the human name Username and a rule of ``min_length[6]`` with a value of "Pizza", an error would display: "Supplied value (Pizza) for Username must have
 at least 6 characters."
 
-.. warning:: If you get the error messages with ``getErrors()`` or ``getError()``, the messages are not HTML escaped. If you use user input data like ``({value})`` to make the error message, it might contain HTML tags. If you don't escape the messages before displying them, XSS attacks are possible.
+.. warning:: If you get the error messages with ``getErrors()`` or ``getError()``, the messages are not HTML escaped. If you use user input data like ``({value})`` to make the error message, it might contain HTML tags. If you don't escape the messages before displaying them, XSS attacks are possible.
 
 .. note:: When using label-style error messages, if you pass the second parameter to ``setRules()``, it will be overwritten with the value of the first parameter.