summaryrefslogtreecommitdiff
path: root/docs/narr/extending.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-04-03 03:58:34 -0400
committerChris McDonough <chrism@plope.com>2013-04-03 03:58:34 -0400
commit2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (patch)
treef3a290b6e0a21549703050a33433dffef2acc87d /docs/narr/extending.rst
parentdacbe656d8851580234214fb655b60d24f5800fb (diff)
parentf8afd1638456fc89bc3d17858f309686b40a40a4 (diff)
downloadpyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.gz
pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.bz2
pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/extending.rst')
-rw-r--r--docs/narr/extending.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/extending.rst b/docs/narr/extending.rst
index beece7640..a60a49fea 100644
--- a/docs/narr/extending.rst
+++ b/docs/narr/extending.rst
@@ -50,7 +50,7 @@ layers are apt to provide the necessary "opinions" (such as mandating a
storage layer, a templating system, and a structured, well-documented pattern
of registering that certain URLs map to certain bits of code) which makes the
concept of a "pluggable application" possible. "Pluggable applications",
-thus, should not plug in to Pyramid itself but should instead plug into a
+thus, should not plug into Pyramid itself but should instead plug into a
system written atop Pyramid.
Although it does not provide for "pluggable applications", Pyramid *does*
@@ -209,7 +209,7 @@ like this:
- Wire the new views and assets created in the new package up using
imperative registrations within the ``main`` function of the
- ``__init__.py`` file of the new application. These wiring should happen
+ ``__init__.py`` file of the new application. This wiring should happen
*after* including the configuration functions of the old application.
These registrations will extend or override any registrations performed by
the original application. See :ref:`overriding_views`,