summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/basiclayout
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-19 17:55:38 -0500
committerChris McDonough <chrism@plope.com>2012-02-19 17:55:38 -0500
commit4c3cca9d034818d3ab280bd3a1ff890b543bfa81 (patch)
tree42cd6958e035436b2bd5d8ee1f5e844983c86837 /docs/tutorials/wiki2/src/basiclayout
parent5baff75c94768628e777ec74fe8f653ef69dd0db (diff)
parent51919e05d9c251f7f80a4736be2b822eafc5d189 (diff)
downloadpyramid-4c3cca9d034818d3ab280bd3a1ff890b543bfa81.tar.gz
pyramid-4c3cca9d034818d3ab280bd3a1ff890b543bfa81.tar.bz2
pyramid-4c3cca9d034818d3ab280bd3a1ff890b543bfa81.zip
Merge branch '1.3-branch'
Diffstat (limited to 'docs/tutorials/wiki2/src/basiclayout')
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/development.ini5
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/production.ini3
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index 2bb74454c..06c51fb12 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -7,8 +7,9 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = true
pyramid.default_locale_name = en
-pyramid.includes = pyramid_debugtoolbar
- pyramid_tm
+pyramid.includes =
+ pyramid_debugtoolbar
+ pyramid_tm
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
diff --git a/docs/tutorials/wiki2/src/basiclayout/production.ini b/docs/tutorials/wiki2/src/basiclayout/production.ini
index ec6dea135..cefb5c231 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -7,7 +7,8 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = false
pyramid.default_locale_name = en
-pyramid.includes = pyramid_tm
+pyramid.includes =
+ pyramid_tm
sqlalchemy.url = sqlite:///%(here)s/tutorial.db