- Use [app:main] instead of a pipeline in all scaffolds and tutorials

  and narrative docs.

- Break out awkward description of PasteDeploy entry points from
  project chapter into its own Paste chapter.

11 files changed, 14 insertions, 53 deletions

diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 0fd64fde4..2d25ace00 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -19,10 +19,11 @@ package.  We use ``__init__.py`` both as a package marker and to contain
 configuration code.
 
 The generated ``development.ini`` file is read by ``paster`` which looks for
-the application module in the ``use`` variable of the ``app:tutorial``
+the application module in the ``use`` variable of the ``app:main``
 section. The *entry point* is defined in the Setuptools configuration of this
 module, specifically in the ``setup.py`` file. For this tutorial, the *entry
-point* is defined as ``tutorial:main`` and points to a function named ``main``.
+point* is defined as ``tutorial:main`` and points to a function named
+``main``.
 
 First we need some imports to support later code:
 
@@ -33,7 +34,7 @@ First we need some imports to support later code:
 
 Next we define the main function and create a SQLAlchemy database engine from
 the ``sqlalchemy.`` prefixed settings in the ``development.ini`` file's
-``[app:tutorial]`` section.  This will be a URI (something like
+``[app:main]`` section.  This will be a URI (something like
 ``sqlite://``):
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
diff --git a/docs/tutorials/wiki2/src/authorization/development.ini b/docs/tutorials/wiki2/src/authorization/development.ini
index f93a88e6b..799ce7161 100644
--- a/docs/tutorials/wiki2/src/authorization/development.ini
+++ b/docs/tutorials/wiki2/src/authorization/development.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
@@ -11,10 +11,6 @@ pyramid.includes = pyramid_debugtoolbar
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [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 45ef791b7..df91d0b49 100644
--- a/docs/tutorials/wiki2/src/authorization/production.ini
+++ b/docs/tutorials/wiki2/src/authorization/production.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
@@ -10,10 +10,6 @@ pyramid.includes = pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index f93a88e6b..799ce7161 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
@@ -11,10 +11,6 @@ pyramid.includes = pyramid_debugtoolbar
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [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 45ef791b7..df91d0b49 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
@@ -10,10 +10,6 @@ pyramid.includes = pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
diff --git a/docs/tutorials/wiki2/src/models/development.ini b/docs/tutorials/wiki2/src/models/development.ini
index f93a88e6b..799ce7161 100644
--- a/docs/tutorials/wiki2/src/models/development.ini
+++ b/docs/tutorials/wiki2/src/models/development.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
@@ -11,10 +11,6 @@ pyramid.includes = pyramid_debugtoolbar
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [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 45ef791b7..df91d0b49 100644
--- a/docs/tutorials/wiki2/src/models/production.ini
+++ b/docs/tutorials/wiki2/src/models/production.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
@@ -10,10 +10,6 @@ pyramid.includes = pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
diff --git a/docs/tutorials/wiki2/src/tests/development.ini b/docs/tutorials/wiki2/src/tests/development.ini
index f93a88e6b..799ce7161 100644
--- a/docs/tutorials/wiki2/src/tests/development.ini
+++ b/docs/tutorials/wiki2/src/tests/development.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
@@ -11,10 +11,6 @@ pyramid.includes = pyramid_debugtoolbar
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [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 45ef791b7..df91d0b49 100644
--- a/docs/tutorials/wiki2/src/tests/production.ini
+++ b/docs/tutorials/wiki2/src/tests/production.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
@@ -10,10 +10,6 @@ pyramid.includes = pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini
index f93a88e6b..799ce7161 100644
--- a/docs/tutorials/wiki2/src/views/development.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
@@ -11,10 +11,6 @@ pyramid.includes = pyramid_debugtoolbar
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [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 45ef791b7..df91d0b49 100644
--- a/docs/tutorials/wiki2/src/views/production.ini
+++ b/docs/tutorials/wiki2/src/views/production.ini
@@ -1,4 +1,4 @@
-[app:tutorial]
+[app:main]
 use = egg:tutorial
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
@@ -10,10 +10,6 @@ pyramid.includes = pyramid_tm
 
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
-[pipeline:main]
-pipeline =
-    tutorial
-
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0