summaryrefslogtreecommitdiff
path: root/docs/narr/project.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-28 21:02:36 -0500
committerChris McDonough <chrism@plope.com>2010-12-28 21:02:36 -0500
commitfcfc5aebc259fa34d8d2313adde7c2f57bab2e53 (patch)
treec52e454f30ca7453da814e57635accc302d61b2b /docs/narr/project.rst
parente8f26928bf5c8fb8490a72436718cedf8fe19281 (diff)
parent02c43fe07f1ffe0cc27e539618ed8d96014cddee (diff)
downloadpyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.tar.gz
pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.tar.bz2
pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.zip
Merge branch 'master' into viewderiver
Diffstat (limited to 'docs/narr/project.rst')
-rw-r--r--docs/narr/project.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index a096d8ca4..55a2711f3 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -64,8 +64,7 @@ The included templates are these:
:term:`ZCML` (declarative configuration).
``pyramid_zodb``
- URL mapping via :term:`traversal` and persistence via :term:`ZODB`, using
- :term:`ZCML` (declarative configuration).
+ URL mapping via :term:`traversal` and persistence via :term:`ZODB`.
``pyramid_routesalchemy``
URL mapping via :term:`URL dispatch` and persistence via
@@ -257,6 +256,8 @@ create`` -generated project. Within a project generated by the
single: IPython
single: paster pshell
+.. _interactive_shell:
+
The Interactive Shell
---------------------