diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
| commit | 7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce (patch) | |
| tree | 227c5b5e5a0b1ee8d8974679b58f29a162b8b2af /docs/whatsnew-1.0.rst | |
| parent | 7a73e56d4d86d9139fd54a9cd83a68d25bc02df7 (diff) | |
| parent | 26787cf215b9bb6ddc0cce84a777f7c2e3079842 (diff) | |
| download | pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.gz pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.bz2 pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/whatsnew-1.0.rst')
| -rw-r--r-- | docs/whatsnew-1.0.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/whatsnew-1.0.rst b/docs/whatsnew-1.0.rst index d1f3046ca..8750863e7 100644 --- a/docs/whatsnew-1.0.rst +++ b/docs/whatsnew-1.0.rst @@ -92,7 +92,7 @@ BFG Conversion Script The ``bfg2pyramid`` conversion script performs a mostly automated conversion of an existing :mod:`repoze.bfg` application to Pyramid. The process is -described in :ref:`converting_a_bfg_app`. +described in "Converting a BFG Application to Pyramid". Scaffold Improvements ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -203,8 +203,8 @@ Mako ~~~~ In addition to Chameleon templating, Pyramid now also provides built-in -support for :term:`Mako` templating. See :ref:`mako_templates` for more -information. +support for :term:`Mako` templating. See +:ref:`available_template_system_bindings` for more information. URL Dispatch ~~~~~~~~~~~~ |