diff --git a/docs/conf.py b/docs/conf.py index 1c957162ed..ffbf15808f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -80,7 +80,7 @@ def nothing(*arg): # other places throughout the built documents. # # The short X.Y version. -version = '1.3b2' +version = '1.4dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/docs/glossary.rst b/docs/glossary.rst index 60920a73af..f68ea36bb6 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -876,11 +876,11 @@ Glossary on the Jinja2 templating system. Akhet - `Akhet `_ is a + `Akhet `_ is a Pyramid library and demo application with a Pylons-like feel. - It's most known for its former application scaffold, which helped + 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. + The scaffold has been retired but the demo plays a similar role. Pyramid Cookbook An additional documentation resource for Pyramid which presents topical,