Merge remote branch 'markstory/ticket-277'
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 21 Mar 2011 18:24:59 +0000 (19:24 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 21 Mar 2011 18:24:59 +0000 (19:24 +0100)
commit79ab9babedee7f737b95cd83d39480431a092c01
tree2519282e9dfe60d6543bc572d1d88061194accca
parent081b26c366bffd7fae8e14262266fe819c462253
parent92b0ec434f35dd5e6094031bc6f525748044437f
Merge remote branch 'markstory/ticket-277'

* markstory/ticket-277:
  Updating documentation for blocks, mentioning that block names cannot contain -.  Fixes #277
doc/templates.rst