diff --git a/lib/Twig/Parser.php b/lib/Twig/Parser.php
index e796f197a..2dd6bfcd8 100644
--- a/lib/Twig/Parser.php
+++ b/lib/Twig/Parser.php
@@ -383,7 +383,7 @@ class Twig_Parser implements Twig_ParserInterface
                 throw new Twig_Error_Syntax('A template that extends another one cannot start with a byte order mark (BOM); it must be removed.', $node->getTemplateLine(), $this->stream->getSourceContext());
             }
 
-            throw new Twig_Error_Syntax('A template that extends another one cannot include contents outside Twig blocks. Did you forget to put the contents inside a {% block %} tag?', $node->getTemplateLine(), $this->stream->getSourceContext());
+            throw new Twig_Error_Syntax('A template that extends another one cannot include content outside Twig blocks. Did you forget to put the content inside a {% block %} tag?', $node->getTemplateLine(), $this->stream->getSourceContext());
         }
 
         // bypass nodes that will "capture" the output
diff --git a/test/Twig/Tests/Fixtures/exceptions/child_contents_outside_blocks.test b/test/Twig/Tests/Fixtures/exceptions/child_contents_outside_blocks.test
index a3f0b50ff..2a9c5e797 100644
--- a/test/Twig/Tests/Fixtures/exceptions/child_contents_outside_blocks.test
+++ b/test/Twig/Tests/Fixtures/exceptions/child_contents_outside_blocks.test
@@ -1,5 +1,5 @@
 --TEST--
-Exception for child templates defining contents outside blocks defined by parent
+Exception for child templates defining content outside blocks defined by parent
 --TEMPLATE--
 {% extends 'base.twig' %}
 
@@ -12,4 +12,4 @@ Content outside a block.
 {% block sidebar %}
 {% endblock %}
 --EXCEPTION--
-Twig_Error_Syntax: A template that extends another one cannot include contents outside Twig blocks. Did you forget to put the contents inside a {% block %} tag in "index.twig" at line 3?
+Twig_Error_Syntax: A template that extends another one cannot include content outside Twig blocks. Did you forget to put the content inside a {% block %} tag in "index.twig" at line 3?