summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-01-19 06:00:34 +0000
committerChris McDonough <chrism@agendaless.com>2010-01-19 06:00:34 +0000
commit1b8fb64d15d9e7328df153cd4529a4d3a1554ee5 (patch)
tree710af6a3e76b7a6aa31e6a6512ba85a6565d4731
parentf5106b6f242e4436aedb60f04784e149eedfeb7f (diff)
downloadpyramid-1b8fb64d15d9e7328df153cd4529a4d3a1554ee5.tar.gz
pyramid-1b8fb64d15d9e7328df153cd4529a4d3a1554ee5.tar.bz2
pyramid-1b8fb64d15d9e7328df153cd4529a4d3a1554ee5.zip
Renderings and typo fix.
-rw-r--r--docs/narr/project.rst4
-rw-r--r--docs/narr/zca.rst2
2 files changed, 1 insertions, 5 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 56580451c..797930ba6 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -39,20 +39,16 @@ differ from each other on two axes:
The included templates are these:
``bfg_starter``
-
URL mapping via :term:`traversal` and no persistence mechanism.
``bfg_zodb``
-
URL mapping via :term:`traversal` and persistence via :term:`ZODB`
``bfg_routesalchemy``
-
URL mapping via :term:`URL dispatch` and persistence via
:term:`SQLAlchemy`
``bfg_alchemy``
-
URL mapping via :term:`traversal` and persistence va
:term:`SQLAlchemy`
diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst
index 2fbdcd873..05bb12ec0 100644
--- a/docs/narr/zca.rst
+++ b/docs/narr/zca.rst
@@ -91,7 +91,7 @@ will appear to fail when used in a :mod:`repoze.bfg` application,
because they'll be consulting the ZCA global registry rather than the
component registry associated with your :mod:`repoze.bfg` application.
-There are three ways to fix this: by disusing the ZCA global registry
+There are three ways to fix this: by disusing the ZCA global API
entirely, by using
:meth:`repoze.bfg.configuration.Configurator.hook_zca` or by passing
the ZCA global registry to the :term:`Configurator` constructor at