Merge branch 'master' into pr/306

This commit is contained in:
Paul Tagliamonte 2013-10-10 17:17:20 -04:00
commit a70bcc1f2f

View File

@ -24,8 +24,8 @@ languages.
* UTF-8 entities will be encoded using * UTF-8 entities will be encoded using
`punycode <http://en.wikipedia.org/wiki/Punycode>`_ and prefixed with `punycode <http://en.wikipedia.org/wiki/Punycode>`_ and prefixed with
`hy_`. For instance, `⚘` will become `hy_w7h`, and `♥` will become `hy_`. For instance, `⚘` will become `hy_w7h`, `♥` will become `hy_g6h`,
`hy_g6h`. and `i♥u` will become `hy_iu_t0x`.
* Symbols that contain dashes will have them replaced with underscores. For * Symbols that contain dashes will have them replaced with underscores. For
example, `render-template` will become `render_template`. example, `render-template` will become `render_template`.