summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/narr/MyProject/development.ini3
-rw-r--r--docs/narr/MyProject/production.ini3
-rw-r--r--docs/narr/project.rst11
-rw-r--r--docs/narr/startup.rst4
-rw-r--r--docs/quick_tour/package/development.ini3
-rw-r--r--docs/quick_tour/sqla_demo/development.ini3
-rw-r--r--docs/quick_tour/sqla_demo/production.ini3
-rw-r--r--docs/quick_tutorial/authentication/development.ini3
-rw-r--r--docs/quick_tutorial/authorization/development.ini3
-rw-r--r--docs/quick_tutorial/databases/development.ini3
-rw-r--r--docs/quick_tutorial/debugtoolbar/development.ini3
-rw-r--r--docs/quick_tutorial/forms/development.ini3
-rw-r--r--docs/quick_tutorial/functional_testing/development.ini3
-rw-r--r--docs/quick_tutorial/ini/development.ini3
-rw-r--r--docs/quick_tutorial/jinja2/development.ini3
-rw-r--r--docs/quick_tutorial/json/development.ini3
-rw-r--r--docs/quick_tutorial/logging/development.ini3
-rw-r--r--docs/quick_tutorial/more_view_classes/development.ini3
-rw-r--r--docs/quick_tutorial/request_response/development.ini3
-rw-r--r--docs/quick_tutorial/retail_forms/development.ini3
-rw-r--r--docs/quick_tutorial/routing/development.ini3
-rw-r--r--docs/quick_tutorial/scaffolds/development.ini3
-rw-r--r--docs/quick_tutorial/scaffolds/production.ini3
-rw-r--r--docs/quick_tutorial/sessions/development.ini3
-rw-r--r--docs/quick_tutorial/static_assets/development.ini3
-rw-r--r--docs/quick_tutorial/templating/development.ini3
-rw-r--r--docs/quick_tutorial/unit_testing/development.ini3
-rw-r--r--docs/quick_tutorial/view_classes/development.ini3
-rw-r--r--docs/quick_tutorial/views/development.ini3
-rw-r--r--docs/tutorials/wiki/src/authorization/development.ini3
-rw-r--r--docs/tutorials/wiki/src/authorization/production.ini3
-rw-r--r--docs/tutorials/wiki/src/basiclayout/development.ini3
-rw-r--r--docs/tutorials/wiki/src/basiclayout/production.ini3
-rw-r--r--docs/tutorials/wiki/src/installation/development.ini3
-rw-r--r--docs/tutorials/wiki/src/installation/production.ini3
-rw-r--r--docs/tutorials/wiki/src/models/development.ini3
-rw-r--r--docs/tutorials/wiki/src/models/production.ini3
-rw-r--r--docs/tutorials/wiki/src/tests/development.ini3
-rw-r--r--docs/tutorials/wiki/src/tests/production.ini3
-rw-r--r--docs/tutorials/wiki/src/views/development.ini3
-rw-r--r--docs/tutorials/wiki/src/views/production.ini3
-rw-r--r--docs/tutorials/wiki2/src/authentication/development.ini3
-rw-r--r--docs/tutorials/wiki2/src/authentication/production.ini3
-rw-r--r--docs/tutorials/wiki2/src/authorization/development.ini3
-rw-r--r--docs/tutorials/wiki2/src/authorization/production.ini3
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/development.ini3
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/production.ini3
-rw-r--r--docs/tutorials/wiki2/src/installation/development.ini3
-rw-r--r--docs/tutorials/wiki2/src/installation/production.ini3
-rw-r--r--docs/tutorials/wiki2/src/models/development.ini3
-rw-r--r--docs/tutorials/wiki2/src/models/production.ini3
-rw-r--r--docs/tutorials/wiki2/src/tests/development.ini3
-rw-r--r--docs/tutorials/wiki2/src/tests/production.ini3
-rw-r--r--docs/tutorials/wiki2/src/views/development.ini3
-rw-r--r--docs/tutorials/wiki2/src/views/production.ini3
-rw-r--r--pyramid/scaffolds/alchemy/development.ini_tmpl3
-rw-r--r--pyramid/scaffolds/alchemy/production.ini_tmpl3
-rw-r--r--pyramid/scaffolds/starter/development.ini_tmpl3
-rw-r--r--pyramid/scaffolds/starter/production.ini_tmpl3
-rw-r--r--pyramid/scaffolds/zodb/development.ini_tmpl3
-rw-r--r--pyramid/scaffolds/zodb/production.ini_tmpl3
-rw-r--r--pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl3
-rw-r--r--pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl3
63 files changed, 68 insertions, 130 deletions
diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini
index 94fece8ce..42c514794 100644
--- a/docs/narr/MyProject/development.ini
+++ b/docs/narr/MyProject/development.ini
@@ -24,8 +24,7 @@ pyramid.includes =
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/narr/MyProject/production.ini b/docs/narr/MyProject/production.ini
index 1174b1cc7..3114b9d4d 100644
--- a/docs/narr/MyProject/production.ini
+++ b/docs/narr/MyProject/production.ini
@@ -18,8 +18,7 @@ pyramid.default_locale_name = en
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 6c42881f4..ec26b880e 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -295,16 +295,15 @@ Here's sample output from a run of ``pserve`` on UNIX:
Access is restricted such that only a browser running on the same machine as
Pyramid will be able to access your Pyramid application. However, if you want
to open access to other machines on the same network, then edit the
-``development.ini`` file, and replace the ``host`` value in the
-``[server:main]`` section, changing it from ``127.0.0.1`` to ``0.0.0.0``. For
+``development.ini`` file, and replace the ``listen`` value in the
+``[server:main]`` section, changing it from ``127.0.0.1:6543`` to ``0.0.0.0:6543``. For
example:
.. code-block:: ini
[server:main]
use = egg:waitress#main
- host = 0.0.0.0
- port = 6543
+ listen = 0.0.0.0:6543
Now when you use ``pserve`` to start the application, it will respond to
requests on *all* IP addresses possessed by your system, not just requests to
@@ -320,8 +319,8 @@ browser by visiting ``http://192.168.1.50:6543/``.
You can change the port on which the server runs on by changing the same
portion of the ``development.ini`` file. For example, you can change the
-``port = 6543`` line in the ``development.ini`` file's ``[server:main]``
-section to ``port = 8080`` to run the server on port 8080 instead of port 6543.
+``listen = 127.0.0.1:6543`` line in the ``development.ini`` file's ``[server:main]``
+section to ``listen = 127:0.0.1:8080`` to run the server on port 8080 instead of port 6543.
You can shut down a server started this way by pressing ``Ctrl-C`` (or
``Ctrl-Break`` on Windows).
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst
index 3e168eaea..b71cff57d 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -130,8 +130,8 @@ Here's a high-level time-ordered overview of what happens when you press
#. ``pserve`` starts the WSGI *server* defined within the ``[server:main]``
section. In our case, this is the Waitress server (``use =
- egg:waitress#main``), and it will listen on all interfaces (``host =
- 127.0.0.1``), on port number 6543 (``port = 6543``). The server code itself
+ egg:waitress#main``), and it will listen on all interfaces (``listen =
+ 127.0.0.1:6543``), on port number 6543. The server code itself
is what prints ``serving on http://127.0.0.1:6543``. The server serves the
application, and the application is running, waiting to receive requests.
diff --git a/docs/quick_tour/package/development.ini b/docs/quick_tour/package/development.ini
index 20f9817a9..05571183d 100644
--- a/docs/quick_tour/package/development.ini
+++ b/docs/quick_tour/package/development.ini
@@ -25,8 +25,7 @@ pyramid.includes =
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/quick_tour/sqla_demo/development.ini b/docs/quick_tour/sqla_demo/development.ini
index 0db0950a0..a14402769 100644
--- a/docs/quick_tour/sqla_demo/development.ini
+++ b/docs/quick_tour/sqla_demo/development.ini
@@ -27,8 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/sqla_demo.sqlite
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/quick_tour/sqla_demo/production.ini b/docs/quick_tour/sqla_demo/production.ini
index 38f3b6318..e0bfd8ea0 100644
--- a/docs/quick_tour/sqla_demo/production.ini
+++ b/docs/quick_tour/sqla_demo/production.ini
@@ -18,8 +18,7 @@ sqlalchemy.url = sqlite:///%(here)s/sqla_demo.sqlite
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/quick_tutorial/authentication/development.ini b/docs/quick_tutorial/authentication/development.ini
index 8a39b2fe7..cbf694b2c 100644
--- a/docs/quick_tutorial/authentication/development.ini
+++ b/docs/quick_tutorial/authentication/development.ini
@@ -7,5 +7,4 @@ tutorial.secret = 98zd
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/authorization/development.ini b/docs/quick_tutorial/authorization/development.ini
index 8a39b2fe7..cbf694b2c 100644
--- a/docs/quick_tutorial/authorization/development.ini
+++ b/docs/quick_tutorial/authorization/development.ini
@@ -7,5 +7,4 @@ tutorial.secret = 98zd
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/databases/development.ini b/docs/quick_tutorial/databases/development.ini
index 5da87d602..6145b5817 100644
--- a/docs/quick_tutorial/databases/development.ini
+++ b/docs/quick_tutorial/databases/development.ini
@@ -9,8 +9,7 @@ sqlalchemy.url = sqlite:///%(here)s/sqltutorial.sqlite
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
# Begin logging configuration
diff --git a/docs/quick_tutorial/debugtoolbar/development.ini b/docs/quick_tutorial/debugtoolbar/development.ini
index 52b2a3a41..c4b1b3c1d 100644
--- a/docs/quick_tutorial/debugtoolbar/development.ini
+++ b/docs/quick_tutorial/debugtoolbar/development.ini
@@ -5,5 +5,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/forms/development.ini b/docs/quick_tutorial/forms/development.ini
index 4d47e54a5..7114a48bb 100644
--- a/docs/quick_tutorial/forms/development.ini
+++ b/docs/quick_tutorial/forms/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543 \ No newline at end of file
diff --git a/docs/quick_tutorial/functional_testing/development.ini b/docs/quick_tutorial/functional_testing/development.ini
index 52b2a3a41..c4b1b3c1d 100644
--- a/docs/quick_tutorial/functional_testing/development.ini
+++ b/docs/quick_tutorial/functional_testing/development.ini
@@ -5,5 +5,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/ini/development.ini b/docs/quick_tutorial/ini/development.ini
index 8853e2c2b..14dfcd36d 100644
--- a/docs/quick_tutorial/ini/development.ini
+++ b/docs/quick_tutorial/ini/development.ini
@@ -3,5 +3,4 @@ use = egg:tutorial
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/jinja2/development.ini b/docs/quick_tutorial/jinja2/development.ini
index 4d47e54a5..e2b176d9c 100644
--- a/docs/quick_tutorial/jinja2/development.ini
+++ b/docs/quick_tutorial/jinja2/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/json/development.ini b/docs/quick_tutorial/json/development.ini
index 4d47e54a5..e2b176d9c 100644
--- a/docs/quick_tutorial/json/development.ini
+++ b/docs/quick_tutorial/json/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/logging/development.ini b/docs/quick_tutorial/logging/development.ini
index 62e0c5123..fa22c0c51 100644
--- a/docs/quick_tutorial/logging/development.ini
+++ b/docs/quick_tutorial/logging/development.ini
@@ -6,8 +6,7 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
# Begin logging configuration
diff --git a/docs/quick_tutorial/more_view_classes/development.ini b/docs/quick_tutorial/more_view_classes/development.ini
index 4d47e54a5..e2b176d9c 100644
--- a/docs/quick_tutorial/more_view_classes/development.ini
+++ b/docs/quick_tutorial/more_view_classes/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/request_response/development.ini b/docs/quick_tutorial/request_response/development.ini
index 4d47e54a5..e2b176d9c 100644
--- a/docs/quick_tutorial/request_response/development.ini
+++ b/docs/quick_tutorial/request_response/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/retail_forms/development.ini b/docs/quick_tutorial/retail_forms/development.ini
index 4d47e54a5..7114a48bb 100644
--- a/docs/quick_tutorial/retail_forms/development.ini
+++ b/docs/quick_tutorial/retail_forms/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543 \ No newline at end of file
diff --git a/docs/quick_tutorial/routing/development.ini b/docs/quick_tutorial/routing/development.ini
index 4d47e54a5..e2b176d9c 100644
--- a/docs/quick_tutorial/routing/development.ini
+++ b/docs/quick_tutorial/routing/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/scaffolds/development.ini b/docs/quick_tutorial/scaffolds/development.ini
index b31d06194..a9ad1e60d 100644
--- a/docs/quick_tutorial/scaffolds/development.ini
+++ b/docs/quick_tutorial/scaffolds/development.ini
@@ -24,8 +24,7 @@ pyramid.includes =
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/quick_tutorial/scaffolds/production.ini b/docs/quick_tutorial/scaffolds/production.ini
index 1418e6bf6..64f04dbec 100644
--- a/docs/quick_tutorial/scaffolds/production.ini
+++ b/docs/quick_tutorial/scaffolds/production.ini
@@ -18,8 +18,7 @@ pyramid.default_locale_name = en
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/quick_tutorial/sessions/development.ini b/docs/quick_tutorial/sessions/development.ini
index 4d47e54a5..e2b176d9c 100644
--- a/docs/quick_tutorial/sessions/development.ini
+++ b/docs/quick_tutorial/sessions/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/static_assets/development.ini b/docs/quick_tutorial/static_assets/development.ini
index 4d47e54a5..e2b176d9c 100644
--- a/docs/quick_tutorial/static_assets/development.ini
+++ b/docs/quick_tutorial/static_assets/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/templating/development.ini b/docs/quick_tutorial/templating/development.ini
index 4d47e54a5..e2b176d9c 100644
--- a/docs/quick_tutorial/templating/development.ini
+++ b/docs/quick_tutorial/templating/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/unit_testing/development.ini b/docs/quick_tutorial/unit_testing/development.ini
index 52b2a3a41..c4b1b3c1d 100644
--- a/docs/quick_tutorial/unit_testing/development.ini
+++ b/docs/quick_tutorial/unit_testing/development.ini
@@ -5,5 +5,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/view_classes/development.ini b/docs/quick_tutorial/view_classes/development.ini
index 4d47e54a5..e2b176d9c 100644
--- a/docs/quick_tutorial/view_classes/development.ini
+++ b/docs/quick_tutorial/view_classes/development.ini
@@ -6,5 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/quick_tutorial/views/development.ini b/docs/quick_tutorial/views/development.ini
index 52b2a3a41..c4b1b3c1d 100644
--- a/docs/quick_tutorial/views/development.ini
+++ b/docs/quick_tutorial/views/development.ini
@@ -5,5 +5,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
diff --git a/docs/tutorials/wiki/src/authorization/development.ini b/docs/tutorials/wiki/src/authorization/development.ini
index 6bf4b198e..3679f2dcd 100644
--- a/docs/tutorials/wiki/src/authorization/development.ini
+++ b/docs/tutorials/wiki/src/authorization/development.ini
@@ -29,8 +29,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/authorization/production.ini b/docs/tutorials/wiki/src/authorization/production.ini
index 4e9892e7b..41a5f9907 100644
--- a/docs/tutorials/wiki/src/authorization/production.ini
+++ b/docs/tutorials/wiki/src/authorization/production.ini
@@ -24,8 +24,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/basiclayout/development.ini b/docs/tutorials/wiki/src/basiclayout/development.ini
index 6bf4b198e..3679f2dcd 100644
--- a/docs/tutorials/wiki/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
@@ -29,8 +29,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/basiclayout/production.ini b/docs/tutorials/wiki/src/basiclayout/production.ini
index 4e9892e7b..41a5f9907 100644
--- a/docs/tutorials/wiki/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki/src/basiclayout/production.ini
@@ -24,8 +24,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/installation/development.ini b/docs/tutorials/wiki/src/installation/development.ini
index 6bf4b198e..3679f2dcd 100644
--- a/docs/tutorials/wiki/src/installation/development.ini
+++ b/docs/tutorials/wiki/src/installation/development.ini
@@ -29,8 +29,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/installation/production.ini b/docs/tutorials/wiki/src/installation/production.ini
index 4e9892e7b..41a5f9907 100644
--- a/docs/tutorials/wiki/src/installation/production.ini
+++ b/docs/tutorials/wiki/src/installation/production.ini
@@ -24,8 +24,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/models/development.ini b/docs/tutorials/wiki/src/models/development.ini
index 6bf4b198e..3679f2dcd 100644
--- a/docs/tutorials/wiki/src/models/development.ini
+++ b/docs/tutorials/wiki/src/models/development.ini
@@ -29,8 +29,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/models/production.ini b/docs/tutorials/wiki/src/models/production.ini
index 4e9892e7b..41a5f9907 100644
--- a/docs/tutorials/wiki/src/models/production.ini
+++ b/docs/tutorials/wiki/src/models/production.ini
@@ -24,8 +24,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/tests/development.ini b/docs/tutorials/wiki/src/tests/development.ini
index 6bf4b198e..3679f2dcd 100644
--- a/docs/tutorials/wiki/src/tests/development.ini
+++ b/docs/tutorials/wiki/src/tests/development.ini
@@ -29,8 +29,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/tests/production.ini b/docs/tutorials/wiki/src/tests/production.ini
index 4e9892e7b..41a5f9907 100644
--- a/docs/tutorials/wiki/src/tests/production.ini
+++ b/docs/tutorials/wiki/src/tests/production.ini
@@ -24,8 +24,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index 6bf4b198e..3679f2dcd 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -29,8 +29,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki/src/views/production.ini b/docs/tutorials/wiki/src/views/production.ini
index 4e9892e7b..41a5f9907 100644
--- a/docs/tutorials/wiki/src/views/production.ini
+++ b/docs/tutorials/wiki/src/views/production.ini
@@ -24,8 +24,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/authentication/development.ini b/docs/tutorials/wiki2/src/authentication/development.ini
index 4a6c9325c..89ee6388b 100644
--- a/docs/tutorials/wiki2/src/authentication/development.ini
+++ b/docs/tutorials/wiki2/src/authentication/development.ini
@@ -29,8 +29,7 @@ auth.secret = seekrit
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+list = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/authentication/production.ini b/docs/tutorials/wiki2/src/authentication/production.ini
index a13a0ca19..4a5023c67 100644
--- a/docs/tutorials/wiki2/src/authentication/production.ini
+++ b/docs/tutorials/wiki2/src/authentication/production.ini
@@ -18,8 +18,7 @@ auth.secret = real-seekrit
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+list = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/authorization/development.ini b/docs/tutorials/wiki2/src/authorization/development.ini
index 4a6c9325c..62a7edd48 100644
--- a/docs/tutorials/wiki2/src/authorization/development.ini
+++ b/docs/tutorials/wiki2/src/authorization/development.ini
@@ -29,8 +29,7 @@ auth.secret = seekrit
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/authorization/production.ini b/docs/tutorials/wiki2/src/authorization/production.ini
index a13a0ca19..ac9672654 100644
--- a/docs/tutorials/wiki2/src/authorization/production.ini
+++ b/docs/tutorials/wiki2/src/authorization/production.ini
@@ -18,8 +18,7 @@ auth.secret = real-seekrit
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index 22b733e10..c15f0a483 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -27,8 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+list = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/basiclayout/production.ini b/docs/tutorials/wiki2/src/basiclayout/production.ini
index d2ecfe22a..215cafbcd 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -16,8 +16,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+list = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/installation/development.ini b/docs/tutorials/wiki2/src/installation/development.ini
index 22b733e10..c15f0a483 100644
--- a/docs/tutorials/wiki2/src/installation/development.ini
+++ b/docs/tutorials/wiki2/src/installation/development.ini
@@ -27,8 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+list = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/installation/production.ini b/docs/tutorials/wiki2/src/installation/production.ini
index d2ecfe22a..215cafbcd 100644
--- a/docs/tutorials/wiki2/src/installation/production.ini
+++ b/docs/tutorials/wiki2/src/installation/production.ini
@@ -16,8 +16,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+list = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/models/development.ini b/docs/tutorials/wiki2/src/models/development.ini
index 22b733e10..c15f0a483 100644
--- a/docs/tutorials/wiki2/src/models/development.ini
+++ b/docs/tutorials/wiki2/src/models/development.ini
@@ -27,8 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+list = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/models/production.ini b/docs/tutorials/wiki2/src/models/production.ini
index d2ecfe22a..215cafbcd 100644
--- a/docs/tutorials/wiki2/src/models/production.ini
+++ b/docs/tutorials/wiki2/src/models/production.ini
@@ -16,8 +16,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+list = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/tests/development.ini b/docs/tutorials/wiki2/src/tests/development.ini
index 4a6c9325c..89ee6388b 100644
--- a/docs/tutorials/wiki2/src/tests/development.ini
+++ b/docs/tutorials/wiki2/src/tests/development.ini
@@ -29,8 +29,7 @@ auth.secret = seekrit
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+list = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/tests/production.ini b/docs/tutorials/wiki2/src/tests/production.ini
index a13a0ca19..4a5023c67 100644
--- a/docs/tutorials/wiki2/src/tests/production.ini
+++ b/docs/tutorials/wiki2/src/tests/production.ini
@@ -18,8 +18,7 @@ auth.secret = real-seekrit
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+list = 0.0.0.0:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini
index 22b733e10..c15f0a483 100644
--- a/docs/tutorials/wiki2/src/views/development.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
@@ -27,8 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+list = 127.0.0.1:6543
###
# logging configuration
diff --git a/docs/tutorials/wiki2/src/views/production.ini b/docs/tutorials/wiki2/src/views/production.ini
index d2ecfe22a..215cafbcd 100644
--- a/docs/tutorials/wiki2/src/views/production.ini
+++ b/docs/tutorials/wiki2/src/views/production.ini
@@ -16,8 +16,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+list = 0.0.0.0:6543
###
# logging configuration
diff --git a/pyramid/scaffolds/alchemy/development.ini_tmpl b/pyramid/scaffolds/alchemy/development.ini_tmpl
index f8ee290be..fd16826cb 100644
--- a/pyramid/scaffolds/alchemy/development.ini_tmpl
+++ b/pyramid/scaffolds/alchemy/development.ini_tmpl
@@ -26,8 +26,7 @@ sqlalchemy.url = sqlite:///%(here)s/{{project}}.sqlite
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/pyramid/scaffolds/alchemy/production.ini_tmpl b/pyramid/scaffolds/alchemy/production.ini_tmpl
index 4d9f835d4..d6a7c5a7b 100644
--- a/pyramid/scaffolds/alchemy/production.ini_tmpl
+++ b/pyramid/scaffolds/alchemy/production.ini_tmpl
@@ -16,8 +16,7 @@ sqlalchemy.url = sqlite:///%(here)s/{{project}}.sqlite
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/pyramid/scaffolds/starter/development.ini_tmpl b/pyramid/scaffolds/starter/development.ini_tmpl
index ae9460b11..18b2d7a2a 100644
--- a/pyramid/scaffolds/starter/development.ini_tmpl
+++ b/pyramid/scaffolds/starter/development.ini_tmpl
@@ -24,8 +24,7 @@ pyramid.includes =
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/pyramid/scaffolds/starter/production.ini_tmpl b/pyramid/scaffolds/starter/production.ini_tmpl
index b2681c71d..a55b4d2e0 100644
--- a/pyramid/scaffolds/starter/production.ini_tmpl
+++ b/pyramid/scaffolds/starter/production.ini_tmpl
@@ -18,8 +18,7 @@ pyramid.default_locale_name = en
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/pyramid/scaffolds/zodb/development.ini_tmpl b/pyramid/scaffolds/zodb/development.ini_tmpl
index a44b61686..3f5c3710b 100644
--- a/pyramid/scaffolds/zodb/development.ini_tmpl
+++ b/pyramid/scaffolds/zodb/development.ini_tmpl
@@ -29,8 +29,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+listen = 127.0.0.1:6543
###
# logging configuration
diff --git a/pyramid/scaffolds/zodb/production.ini_tmpl b/pyramid/scaffolds/zodb/production.ini_tmpl
index 522ff7651..05be225ed 100644
--- a/pyramid/scaffolds/zodb/production.ini_tmpl
+++ b/pyramid/scaffolds/zodb/production.ini_tmpl
@@ -24,8 +24,7 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
[server:main]
use = egg:waitress#main
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
###
# logging configuration
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl b/pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl
index 4d3a80286..d9fd3dd33 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl
+++ b/pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl
@@ -11,8 +11,7 @@ pyramid.includes = pyramid_debugtoolbar
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
# Begin logging configuration
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl b/pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl
index 931cfa510..5406fca80 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl
+++ b/pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl
@@ -10,8 +10,7 @@ pyramid.default_locale_name = en
[server:main]
use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+listen = 0.0.0.0:6543
# Begin logging configuration