Merge branch '2.x' into 3.x

* 2.x:
  added missing items in the CHANGELOG
  removed obsolete comments

CHANGELOG

@@ -18,6 +18,11 @@
 * 2.9.0 (2019-XX-XX)
 
  * deprecated the "filter" tag (use the "apply" tag instead)
+ * added the "apply" tag as a replacement for the "filter" tag
+ * allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)
+ * added support for "Twig\Markup" instances in the "in" test
+ * fixed "import" when macros are stored in a template string
+ * fixed Lexer when using custom options containing the # char
  * added template line number to twig_get_attribute()
 
 * 2.8.1 (2019-04-16)

src/Error/Error.php

@@ -47,13 +47,6 @@ class Error extends \Exception
     /**
      * Constructor.
      *
-     * Set both the line number and the name to false to
-     * disable automatic guessing of the original template name
-     * and line number.
-     *
-     * Set the line number to -1 to enable its automatic guessing.
-     * Set the name to null to enable its automatic guessing.
-     *
      * By default, automatic guessing is enabled.
      *
      * @param string      $message  The error message