Commits

Armin Ronacher  committed 6327f79 Merge

Merge pull request #137 from PaulMcMillan/improve_whitespace_docs

Improve whitespace docs to reflect reality.

  • Participants
  • Parent commits a21f2ed, b4188e0

Comments (0)

Files changed (1)

File docs/templates.rst

 Whitespace Control
 ------------------
 
-In the default configuration whitespace is not further modified by the
-template engine, so each whitespace (spaces, tabs, newlines etc.) is returned
-unchanged.  If the application configures Jinja to `trim_blocks` the first
-newline after a a template tag is removed automatically (like in PHP).
+In the default configuration, a single trailing newline is stripped if
+present, and whitespace is not further modified by the template engine. Each
+whitespace (spaces, tabs, newlines etc.) is returned unchanged.  If the
+application configures Jinja to `trim_blocks` the first newline after a a
+template tag is removed automatically (like in PHP).
 
 But you can also strip whitespace in templates by hand.  If you put an minus
 sign (``-``) to the start or end of an block (for example a for tag), a