summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/basiclayout
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-10-06 05:40:58 -0400
committerChris McDonough <chrism@plope.com>2011-10-06 05:40:58 -0400
commit87dbfa4cd26171414d971d4f56f2aceaceb9a6eb (patch)
tree38876d7fe78e1b32763fa185f0dc9546e113671a /docs/tutorials/wiki2/src/basiclayout
parent206a7f6eb776ff91043ce9cf4627dad20f68b937 (diff)
parent75f05a60f8754c9c5c234b9731dbc08646ba89a9 (diff)
downloadpyramid-87dbfa4cd26171414d971d4f56f2aceaceb9a6eb.tar.gz
pyramid-87dbfa4cd26171414d971d4f56f2aceaceb9a6eb.tar.bz2
pyramid-87dbfa4cd26171414d971d4f56f2aceaceb9a6eb.zip
Merge branch 'feature.glue'
Diffstat (limited to 'docs/tutorials/wiki2/src/basiclayout')
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/development.ini2
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/production.ini2
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/setup.py1
3 files changed, 2 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index 799ce7161..d1e262324 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_debugtoolbar
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
host = 0.0.0.0
port = 6543
diff --git a/docs/tutorials/wiki2/src/basiclayout/production.ini b/docs/tutorials/wiki2/src/basiclayout/production.ini
index df91d0b49..ac02acf3f 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -11,7 +11,7 @@ pyramid.includes = pyramid_tm
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[server:main]
-use = egg:Paste#http
+use = egg:pyramid#wsgiref
host = 0.0.0.0
port = 6543
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py
index 99b7cabda..3ab493912 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -42,6 +42,5 @@ setup(name='tutorial',
[paste.app_factory]
main = tutorial:main
""",
- paster_plugins=['pyramid'],
)