summaryrefslogtreecommitdiff
path: root/docs/narr/project.rst
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
commit1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad (patch)
tree0db5dd6f25a9166c118c4a24d66f281f43b0aeba /docs/narr/project.rst
parent30ae71b4a7ad97a649165374a75a70f4b64ae25c (diff)
parentaa6e5fe4f1190e6df123e3f6ccde9deb789eb344 (diff)
downloadpyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.gz
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.bz2
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.zip
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/narr/project.rst')
-rw-r--r--docs/narr/project.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 5103bb6b8..923fde436 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -447,7 +447,7 @@ commenting out a line. For example, instead of:
:linenos:
[app:main]
- ...
+ # ... elided configuration
pyramid.includes =
pyramid_debugtoolbar
@@ -457,7 +457,7 @@ Put a hash mark at the beginning of the ``pyramid_debugtoolbar`` line:
:linenos:
[app:main]
- ...
+ # ... elided configuration
pyramid.includes =
# pyramid_debugtoolbar