summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src
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/tutorials/wiki2/src
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/tutorials/wiki2/src')
-rw-r--r--docs/tutorials/wiki2/src/authorization/development.ini9
-rw-r--r--docs/tutorials/wiki2/src/authorization/production.ini6
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/development.ini9
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/production.ini7
-rw-r--r--docs/tutorials/wiki2/src/models/development.ini9
-rw-r--r--docs/tutorials/wiki2/src/models/production.ini7
-rw-r--r--docs/tutorials/wiki2/src/tests/development.ini9
-rw-r--r--docs/tutorials/wiki2/src/tests/production.ini7
-rw-r--r--docs/tutorials/wiki2/src/views/development.ini9
-rw-r--r--docs/tutorials/wiki2/src/views/production.ini7
10 files changed, 24 insertions, 55 deletions
diff --git a/docs/tutorials/wiki2/src/authorization/development.ini b/docs/tutorials/wiki2/src/authorization/development.ini
index bd71cdba5..f93a88e6b 100644
--- a/docs/tutorials/wiki2/src/authorization/development.ini
+++ b/docs/tutorials/wiki2/src/authorization/development.ini
@@ -6,18 +6,15 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = true
pyramid.default_locale_name = en
+pyramid.includes = pyramid_debugtoolbar
+ pyramid_tm
+
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[pipeline:main]
pipeline =
- egg:WebError#evalerror
- tm
tutorial
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[server:main]
use = egg:Paste#http
host = 0.0.0.0
diff --git a/docs/tutorials/wiki2/src/authorization/production.ini b/docs/tutorials/wiki2/src/authorization/production.ini
index ed8eadacc..f7b742cb9 100644
--- a/docs/tutorials/wiki2/src/authorization/production.ini
+++ b/docs/tutorials/wiki2/src/authorization/production.ini
@@ -6,6 +6,7 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = false
pyramid.default_locale_name = en
+pyramid.includes = pyramid_tm
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[filter:weberror]
@@ -22,14 +23,9 @@ debug = false
;smtp_use_tls =
;error_message =
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[pipeline:main]
pipeline =
weberror
- tm
tutorial
[server:main]
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index bd71cdba5..f93a88e6b 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -6,18 +6,15 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = true
pyramid.default_locale_name = en
+pyramid.includes = pyramid_debugtoolbar
+ pyramid_tm
+
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[pipeline:main]
pipeline =
- egg:WebError#evalerror
- tm
tutorial
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[server:main]
use = egg:Paste#http
host = 0.0.0.0
diff --git a/docs/tutorials/wiki2/src/basiclayout/production.ini b/docs/tutorials/wiki2/src/basiclayout/production.ini
index ed8eadacc..c80a0a216 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -6,6 +6,8 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = false
pyramid.default_locale_name = en
+pyramid.includes = pyramid_tm
+
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[filter:weberror]
@@ -22,14 +24,9 @@ debug = false
;smtp_use_tls =
;error_message =
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[pipeline:main]
pipeline =
weberror
- tm
tutorial
[server:main]
diff --git a/docs/tutorials/wiki2/src/models/development.ini b/docs/tutorials/wiki2/src/models/development.ini
index bd71cdba5..f93a88e6b 100644
--- a/docs/tutorials/wiki2/src/models/development.ini
+++ b/docs/tutorials/wiki2/src/models/development.ini
@@ -6,18 +6,15 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = true
pyramid.default_locale_name = en
+pyramid.includes = pyramid_debugtoolbar
+ pyramid_tm
+
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[pipeline:main]
pipeline =
- egg:WebError#evalerror
- tm
tutorial
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[server:main]
use = egg:Paste#http
host = 0.0.0.0
diff --git a/docs/tutorials/wiki2/src/models/production.ini b/docs/tutorials/wiki2/src/models/production.ini
index ed8eadacc..c80a0a216 100644
--- a/docs/tutorials/wiki2/src/models/production.ini
+++ b/docs/tutorials/wiki2/src/models/production.ini
@@ -6,6 +6,8 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = false
pyramid.default_locale_name = en
+pyramid.includes = pyramid_tm
+
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[filter:weberror]
@@ -22,14 +24,9 @@ debug = false
;smtp_use_tls =
;error_message =
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[pipeline:main]
pipeline =
weberror
- tm
tutorial
[server:main]
diff --git a/docs/tutorials/wiki2/src/tests/development.ini b/docs/tutorials/wiki2/src/tests/development.ini
index bd71cdba5..f93a88e6b 100644
--- a/docs/tutorials/wiki2/src/tests/development.ini
+++ b/docs/tutorials/wiki2/src/tests/development.ini
@@ -6,18 +6,15 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = true
pyramid.default_locale_name = en
+pyramid.includes = pyramid_debugtoolbar
+ pyramid_tm
+
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[pipeline:main]
pipeline =
- egg:WebError#evalerror
- tm
tutorial
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[server:main]
use = egg:Paste#http
host = 0.0.0.0
diff --git a/docs/tutorials/wiki2/src/tests/production.ini b/docs/tutorials/wiki2/src/tests/production.ini
index ed8eadacc..c80a0a216 100644
--- a/docs/tutorials/wiki2/src/tests/production.ini
+++ b/docs/tutorials/wiki2/src/tests/production.ini
@@ -6,6 +6,8 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = false
pyramid.default_locale_name = en
+pyramid.includes = pyramid_tm
+
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[filter:weberror]
@@ -22,14 +24,9 @@ debug = false
;smtp_use_tls =
;error_message =
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[pipeline:main]
pipeline =
weberror
- tm
tutorial
[server:main]
diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini
index bd71cdba5..f93a88e6b 100644
--- a/docs/tutorials/wiki2/src/views/development.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
@@ -6,18 +6,15 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = true
pyramid.default_locale_name = en
+pyramid.includes = pyramid_debugtoolbar
+ pyramid_tm
+
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[pipeline:main]
pipeline =
- egg:WebError#evalerror
- tm
tutorial
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[server:main]
use = egg:Paste#http
host = 0.0.0.0
diff --git a/docs/tutorials/wiki2/src/views/production.ini b/docs/tutorials/wiki2/src/views/production.ini
index ed8eadacc..c80a0a216 100644
--- a/docs/tutorials/wiki2/src/views/production.ini
+++ b/docs/tutorials/wiki2/src/views/production.ini
@@ -6,6 +6,8 @@ pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.debug_templates = false
pyramid.default_locale_name = en
+pyramid.includes = pyramid_tm
+
sqlalchemy.url = sqlite:///%(here)s/tutorial.db
[filter:weberror]
@@ -22,14 +24,9 @@ debug = false
;smtp_use_tls =
;error_message =
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[pipeline:main]
pipeline =
weberror
- tm
tutorial
[server:main]