Merge branch '1.x' into 2.x

* 1.x:
  Backport #3397
  Update block.rst
This commit is contained in:
Fabien Potencier
2020-09-14 15:18:06 +02:00
+1 -2
View File
@@ -5,7 +5,6 @@ Blocks are used for inheritance and act as placeholders and replacements at
the same time. They are documented in detail in the documentation for the
:doc:`extends<../tags/extends>` tag.
Block names should consist of alphanumeric characters, and underscores. Dashes
are not permitted.
Block names must consist of alphanumeric characters, and underscores. The first char can't be a digit and dashes are not permitted.
.. seealso:: :doc:`block<../functions/block>`, :doc:`parent<../functions/parent>`, :doc:`use<../tags/use>`, :doc:`extends<../tags/extends>`