summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-11 23:38:34 -0400
committerChris McDonough <chrism@plope.com>2011-08-11 23:38:34 -0400
commitefd07ccf6889e965f67b1dd0ef1a09f0efacbf2f (patch)
treea87a09954031e5ca66521ce239ef81232b99b8b6 /docs/narr
parent8cd013ed14f22b85096784ace1bac480f3825414 (diff)
downloadpyramid-efd07ccf6889e965f67b1dd0ef1a09f0efacbf2f.tar.gz
pyramid-efd07ccf6889e965f67b1dd0ef1a09f0efacbf2f.tar.bz2
pyramid-efd07ccf6889e965f67b1dd0ef1a09f0efacbf2f.zip
fix docs, scaffolds, and tutorials to use pyramid.includes
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/MyProject/development.ini2
-rw-r--r--docs/narr/project.rst12
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini
index 1818e387b..e134e9f06 100644
--- a/docs/narr/MyProject/development.ini
+++ b/docs/narr/MyProject/development.ini
@@ -7,7 +7,7 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = true
pyramid.default_locale_name = en
-pyramid.include = pyramid_debugtoolbar
+pyramid.includes = pyramid_debugtoolbar
[pipeline:main]
pipeline =
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index baf4c86fa..e59d04ee1 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -327,7 +327,7 @@ when you use the ``production.ini`` file instead of the ``development.ini``
ini file to run the application.
You can also turn the debug toolbar off by editing ``development.ini`` and
-commenting out the line ``pyramid.include = pyramid_debugtoolbar``. For
+commenting out the line ``pyramid.includes = pyramid_debugtoolbar``. For
example, instead of:
.. code-block:: ini
@@ -335,16 +335,16 @@ example, instead of:
[app:MyApp]
...
- pyramid.include = pyramid_debugtoolbar
+ pyramid.includes = pyramid_debugtoolbar
-Put a hash mark in front of the ``pyramid.include`` line:
+Put a hash mark in front of the ``pyramid.includes`` line:
.. code-block:: ini
:linenos:
[app:MyApp]
...
- #pyramid.include = pyramid_debugtoolbar
+ #pyramid.includes = pyramid_debugtoolbar
Then restart the application to see that the toolbar has been turned off.
@@ -526,9 +526,9 @@ information.
options should be turned off for production applications, as template
rendering is slowed when either is turned on.
-The ``pyramid.include`` setting in the ``[app:MyProject]`` section tells
+The ``pyramid.includes`` setting in the ``[app:MyProject]`` section tells
Pyramid to "include" configuration from another package. In this case, the
-line ``pyramid.include = pyramid_debugtoolbar`` tells Pyramid to include
+line ``pyramid.includes = pyramid_debugtoolbar`` tells Pyramid to include
configuration from the ``pyramid_debugtoolbar`` package. This turns on a
debugging panel in development mode which will be shown on the right hand
side of the screen. Including the debug toolbar will also make it possible