summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-05-09 09:31:30 -0400
committerChris McDonough <chrism@plope.com>2012-05-09 09:31:30 -0400
commit11fe8d003dc81901d8c9c5e12722ea6e44e4f151 (patch)
tree17af9308f9ca4af065f8ca409438ae765acbbd27 /docs/narr/introduction.rst
parent25f3e44681459deff685b7b5c769d98f21532704 (diff)
parentf36a9018a4b20917c8cc748b93da279bfeed39d1 (diff)
downloadpyramid-11fe8d003dc81901d8c9c5e12722ea6e44e4f151.tar.gz
pyramid-11fe8d003dc81901d8c9c5e12722ea6e44e4f151.tar.bz2
pyramid-11fe8d003dc81901d8c9c5e12722ea6e44e4f151.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 9b3a63089..b5fa6a9f7 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -534,14 +534,14 @@ Configuration extensibility
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Unlike other systems, Pyramid provides a structured "include" mechanism (see
-:meth:`~pyramid.config.Configurator.include`) that allows you to compose
+:meth:`~pyramid.config.Configurator.include`) that allows you to combine
applications from multiple Python packages. All the configuration statements
that can be performed in your "main" Pyramid application can also be
performed by included packages including the addition of views, routes,
subscribers, and even authentication and authorization policies. You can even
extend or override an existing application by including another application's
configuration in your own, overriding or adding new views and routes to
-it. This has the potential to allow you to compose a big application out of
+it. This has the potential to allow you to create a big application out of
many other smaller ones. For example, if you want to reuse an existing
application that already has a bunch of routes, you can just use the
``include`` statement with a ``route_prefix``; the new application will live