diff options
| author | Michael Merickel <michael@merickel.org> | 2013-04-01 11:42:28 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-04-01 11:42:28 -0500 |
| commit | 5f3eee1d89b52458e372875bbf71efb0cc5e3fcf (patch) | |
| tree | 6d6b61cc0799bc3c68da24e86691e8b985bdc821 /docs/narr/extending.rst | |
| parent | 75a3d11316fa2ab98afd1d8ac68d2f672b7ac871 (diff) | |
| parent | a9cdf8f67a59e051233dae1a8e21e3b60037c608 (diff) | |
| download | pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.tar.gz pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.tar.bz2 pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.zip | |
Merge branch 'pull.963'
Diffstat (limited to 'docs/narr/extending.rst')
| -rw-r--r-- | docs/narr/extending.rst | 4 |
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`, |