summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMike Orr <sluggoster@gmail.com>2012-02-18 23:09:33 -0800
committerMike Orr <sluggoster@gmail.com>2012-02-18 23:09:33 -0800
commit9f2cf5c8921184a29830ed7cb9c283ae547c80f2 (patch)
treee6901c9ccf3552f4e125ae7c48e433b11781392f /docs
parent7f89e2d6c727d3022b38f09d72921afd9302a39c (diff)
parent94c28eb885204f93222dcc0bb3340ae1514b62dd (diff)
downloadpyramid-9f2cf5c8921184a29830ed7cb9c283ae547c80f2.tar.gz
pyramid-9f2cf5c8921184a29830ed7cb9c283ae547c80f2.tar.bz2
pyramid-9f2cf5c8921184a29830ed7cb9c283ae547c80f2.zip
Merge branch 'mso' into 1.3-branch
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst11
1 files changed, 5 insertions, 6 deletions
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,