diff --git a/doc/tags/autoescape.rst b/doc/tags/autoescape.rst
index 4208d1a31..8aa8c75d1 100644
--- a/doc/tags/autoescape.rst
+++ b/doc/tags/autoescape.rst
@@ -6,8 +6,6 @@ template to be escaped or not by using the ``autoescape`` tag:
 
 .. code-block:: jinja
 
-    {# The following syntax works as of Twig 1.8 -- see the note below for previous versions #}
-
     {% autoescape %}
         Everything will be automatically escaped in this block
         using the HTML strategy
diff --git a/doc/templates.rst b/doc/templates.rst
index b0955d7b8..8826c5691 100644
--- a/doc/templates.rst
+++ b/doc/templates.rst
@@ -424,10 +424,8 @@ everything by default.
 
 Twig supports both, automatic escaping is enabled by default.
 
-.. note::
-
-    Automatic escaping is only supported if the *escaper* extension has been
-    enabled (which is the default).
+The automatic escaping strategy can be configured via the
+:ref:`autoescape<environment_options>` option and defaults to ``html``.
 
 Working with Manual Escaping
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~