diff options
| author | Patricio Paez <pp@pp.com.mx> | 2012-05-07 21:45:40 -0500 |
|---|---|---|
| committer | Patricio Paez <pp@pp.com.mx> | 2012-05-07 21:45:40 -0500 |
| commit | 1d03bbca7fe9f005d4a08c7dfe7eb139ab4b0df1 (patch) | |
| tree | 56d2952b8d064e53ef57aafbec363ad532e14716 /docs/narr | |
| parent | eba3b0763cf4fa3aa4b099adb2e10c53c6d99e74 (diff) | |
| download | pyramid-1d03bbca7fe9f005d4a08c7dfe7eb139ab4b0df1.tar.gz pyramid-1d03bbca7fe9f005d4a08c7dfe7eb139ab4b0df1.tar.bz2 pyramid-1d03bbca7fe9f005d4a08c7dfe7eb139ab4b0df1.zip | |
Two grammatical fixes
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/advconfig.rst | 2 | ||||
| -rw-r--r-- | docs/narr/introduction.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 9cb4db325..2949dc808 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -282,7 +282,7 @@ Pyramid application, and they want to customize the configuration of this application without hacking its code "from outside", they can "include" a configuration function from the package and override only some of its configuration statements within the code that does the include. No conflicts -will be generated by configuration statements within the code which does the +will be generated by configuration statements within the code that does the including, even if configuration statements in the included code would conflict if it was moved "up" to the calling code. 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 |