pyramid_sqla -> akhet

2 files changed, 15 insertions, 17 deletions

diff --git a/docs/glossary.rst b/docs/glossary.rst
index 098f2eadf..97fc68707 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -872,11 +872,12 @@ Glossary
      ``pyramid_jinja2_starter``, which creates an application package based
      on the Jinja2 templating system.
 
-   pyramid_sqla
-     A package which provides a Pylons-esque scaffold which sports
-     support for :term:`view handler` application development,
-     :term:`SQLAlchemy` support, and other Pylons-like features.  See
-     https://bytebucket.org/sluggo/pyramid_sqla/wiki/html/index.html for more
+   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.
 
    Pyramid Cookbook
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index ea8acdf2a..c1558266a 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -64,21 +64,18 @@ The included scaffolds are these:
   :term:`SQLAlchemy`
 
 .. note:: At this time, each of these scaffolds uses the :term:`Chameleon`
-   templating system, which is incompatible with both Jython and PyPy.  To
-   use scaffolds to build applications which will run on Jython and
-   PyPy, you can try the ``pyramid_jinja2_starter`` scaffold which ships as
-   part of the :term:`pyramid_jinja2` package or the ``pyramid_sqla`` scaffold
-   which ships with the :term:`pyramid_sqla` package (it uses Mako),
-   both available from :term:`PyPI`.  You can also just use the above
-   scaffold and replace the Chameleon template it includes with a :term:`Mako` 
+   templating system, which is incompatible with Jython.  To use scaffolds to
+   build applications which will run on Jython, you can try the
+   ``pyramid_jinja2_starter`` scaffold which ships as part of the
+   :term:`pyramid_jinja2` package.  You can also just use any above scaffold
+   and replace the Chameleon template it includes with a :term:`Mako`
    analogue.
 
 Rather than use any of the above scaffolds, Pylons 1 users may feel more
-comfortable installing the :term:`pyramid_sqla` add-on package, which
-provides a scaffold named ``pyramid_sqla``.  This scaffold configures a 
-Pyramid application in a "Pylons-esque" way, including the use of a 
-:term:`view handler` to map URLs to code (it's much like a Pylons
-"controller").
+comfortable installing the :term:`Akhet` development environment, which
+provides a scaffold named ``akhet``.  This scaffold configures a Pyramid
+application in a "Pylons-esque" way, including the use of a :term:`view
+handler` to map URLs to code (a handler is much like a Pylons "controller").
 
 .. index::
    single: creating a project