diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-19 11:07:14 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-19 11:07:14 -0500 |
| commit | 8d9aafb56f00506109cce444e6037cba63428ad4 (patch) | |
| tree | 42a99b30e4b874811fcb636c2759eed09a1e0be9 | |
| parent | d21ba4b61e901b27ceae36f29dac23387a8129d5 (diff) | |
| parent | 9f2cf5c8921184a29830ed7cb9c283ae547c80f2 (diff) | |
| download | pyramid-8d9aafb56f00506109cce444e6037cba63428ad4.tar.gz pyramid-8d9aafb56f00506109cce444e6037cba63428ad4.tar.bz2 pyramid-8d9aafb56f00506109cce444e6037cba63428ad4.zip | |
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | docs/glossary.rst | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 050225b5b..a3c1ab35b 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -160,3 +160,5 @@ Contributors - Klee Dienes, 2011/10/30 - Michael Ryabushin, 2011/12/14 + +- Mike Orr, 2012/02/14 diff --git a/docs/glossary.rst b/docs/glossary.rst index 8307c0472..60920a73a 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -876,12 +876,11 @@ Glossary on the Jinja2 templating system. Akhet - Akhet is a Pyramid-based development environment which provides a - Pylons-esque scaffold which sports support for :term:`view handler` - application development, :term:`SQLAlchemy` support, :term:`Mako` - templating by default, and other Pylons-like features. See - http://docs.pylonsproject.org/projects/akhet/dev/index.html for more - information. + `Akhet <http://docs.pylonsproject.org/projects/akhet/en/latest/>`_ is a + Pyramid library and demo application with a Pylons-like feel. + It's most known for its former application scaffold, which helped + users transition from Pylons and those prefering a more Pylons-like API. + The scaffold has been retired but the demo plays a similar role. Pyramid Cookbook An additional documentation resource for Pyramid which presents topical, |