Permalink
Browse files

Merge branch 'mso' into 1.3-branch

  • Loading branch information...
2 parents 7f89e2d + 94c28eb commit 9f2cf5c8921184a29830ed7cb9c283ae547c80f2 @mikeorr mikeorr committed Feb 19, 2012
Showing with 7 additions and 6 deletions.
  1. +2 −0 CONTRIBUTORS.txt
  2. +5 −6 docs/glossary.rst
View
2 CONTRIBUTORS.txt
@@ -160,3 +160,5 @@ Contributors
- Klee Dienes, 2011/10/30
- Michael Ryabushin, 2011/12/14
+
+- Mike Orr, 2012/02/14
View
11 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,

0 comments on commit 9f2cf5c

Please sign in to comment.