Revert "Changed 'host' and 'port' configuration to a new 'listen' style that …"

55 files changed, 114 insertions, 60 deletions

diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini
index 42c514794..94fece8ce 100644
--- a/docs/narr/MyProject/development.ini
+++ b/docs/narr/MyProject/development.ini
@@ -24,7 +24,8 @@ pyramid.includes =
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/narr/MyProject/production.ini b/docs/narr/MyProject/production.ini
index 3114b9d4d..1174b1cc7 100644
--- a/docs/narr/MyProject/production.ini
+++ b/docs/narr/MyProject/production.ini
@@ -18,7 +18,8 @@ pyramid.default_locale_name = en
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index ec26b880e..6c42881f4 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -295,15 +295,16 @@ 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 ``listen`` value in the
-``[server:main]`` section, changing it from ``127.0.0.1:6543`` to ``0.0.0.0:6543``.  For
+``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
 example:
 
 .. code-block:: ini
 
    [server:main]
    use = egg:waitress#main
-   listen = 0.0.0.0:6543
+   host = 0.0.0.0
+   port = 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
@@ -319,8 +320,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
-``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.
+``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.
 
 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 b71cff57d..3e168eaea 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 (``listen =
-   127.0.0.1:6543``), on port number 6543. The server code itself
+   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
    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 05571183d..20f9817a9 100644
--- a/docs/quick_tour/package/development.ini
+++ b/docs/quick_tour/package/development.ini
@@ -25,7 +25,8 @@ pyramid.includes =
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/quick_tour/sqla_demo/development.ini b/docs/quick_tour/sqla_demo/development.ini
index a14402769..0db0950a0 100644
--- a/docs/quick_tour/sqla_demo/development.ini
+++ b/docs/quick_tour/sqla_demo/development.ini
@@ -27,7 +27,8 @@ sqlalchemy.url = sqlite:///%(here)s/sqla_demo.sqlite
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/quick_tour/sqla_demo/production.ini b/docs/quick_tour/sqla_demo/production.ini
index e0bfd8ea0..38f3b6318 100644
--- a/docs/quick_tour/sqla_demo/production.ini
+++ b/docs/quick_tour/sqla_demo/production.ini
@@ -18,7 +18,8 @@ sqlalchemy.url = sqlite:///%(here)s/sqla_demo.sqlite
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/quick_tutorial/authentication/development.ini b/docs/quick_tutorial/authentication/development.ini
index cbf694b2c..8a39b2fe7 100644
--- a/docs/quick_tutorial/authentication/development.ini
+++ b/docs/quick_tutorial/authentication/development.ini
@@ -7,4 +7,5 @@ tutorial.secret = 98zd
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/authorization/development.ini b/docs/quick_tutorial/authorization/development.ini
index cbf694b2c..8a39b2fe7 100644
--- a/docs/quick_tutorial/authorization/development.ini
+++ b/docs/quick_tutorial/authorization/development.ini
@@ -7,4 +7,5 @@ tutorial.secret = 98zd
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/databases/development.ini b/docs/quick_tutorial/databases/development.ini
index 6145b5817..5da87d602 100644
--- a/docs/quick_tutorial/databases/development.ini
+++ b/docs/quick_tutorial/databases/development.ini
@@ -9,7 +9,8 @@ sqlalchemy.url = sqlite:///%(here)s/sqltutorial.sqlite
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 # Begin logging configuration
 
diff --git a/docs/quick_tutorial/debugtoolbar/development.ini b/docs/quick_tutorial/debugtoolbar/development.ini
index c4b1b3c1d..52b2a3a41 100644
--- a/docs/quick_tutorial/debugtoolbar/development.ini
+++ b/docs/quick_tutorial/debugtoolbar/development.ini
@@ -5,4 +5,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/forms/development.ini b/docs/quick_tutorial/forms/development.ini
index 7114a48bb..4d47e54a5 100644
--- a/docs/quick_tutorial/forms/development.ini
+++ b/docs/quick_tutorial/forms/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
\ No newline at end of file
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/functional_testing/development.ini b/docs/quick_tutorial/functional_testing/development.ini
index c4b1b3c1d..52b2a3a41 100644
--- a/docs/quick_tutorial/functional_testing/development.ini
+++ b/docs/quick_tutorial/functional_testing/development.ini
@@ -5,4 +5,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/ini/development.ini b/docs/quick_tutorial/ini/development.ini
index 14dfcd36d..8853e2c2b 100644
--- a/docs/quick_tutorial/ini/development.ini
+++ b/docs/quick_tutorial/ini/development.ini
@@ -3,4 +3,5 @@ use = egg:tutorial
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/jinja2/development.ini b/docs/quick_tutorial/jinja2/development.ini
index e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/jinja2/development.ini
+++ b/docs/quick_tutorial/jinja2/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/json/development.ini b/docs/quick_tutorial/json/development.ini
index e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/json/development.ini
+++ b/docs/quick_tutorial/json/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/logging/development.ini b/docs/quick_tutorial/logging/development.ini
index fa22c0c51..62e0c5123 100644
--- a/docs/quick_tutorial/logging/development.ini
+++ b/docs/quick_tutorial/logging/development.ini
@@ -6,7 +6,8 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 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 e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/more_view_classes/development.ini
+++ b/docs/quick_tutorial/more_view_classes/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/request_response/development.ini b/docs/quick_tutorial/request_response/development.ini
index e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/request_response/development.ini
+++ b/docs/quick_tutorial/request_response/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/retail_forms/development.ini b/docs/quick_tutorial/retail_forms/development.ini
index e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/retail_forms/development.ini
+++ b/docs/quick_tutorial/retail_forms/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/routing/development.ini b/docs/quick_tutorial/routing/development.ini
index e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/routing/development.ini
+++ b/docs/quick_tutorial/routing/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/scaffolds/development.ini b/docs/quick_tutorial/scaffolds/development.ini
index a9ad1e60d..b31d06194 100644
--- a/docs/quick_tutorial/scaffolds/development.ini
+++ b/docs/quick_tutorial/scaffolds/development.ini
@@ -24,7 +24,8 @@ pyramid.includes =
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/quick_tutorial/scaffolds/production.ini b/docs/quick_tutorial/scaffolds/production.ini
index 64f04dbec..1418e6bf6 100644
--- a/docs/quick_tutorial/scaffolds/production.ini
+++ b/docs/quick_tutorial/scaffolds/production.ini
@@ -18,7 +18,8 @@ pyramid.default_locale_name = en
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/quick_tutorial/sessions/development.ini b/docs/quick_tutorial/sessions/development.ini
index e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/sessions/development.ini
+++ b/docs/quick_tutorial/sessions/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/static_assets/development.ini b/docs/quick_tutorial/static_assets/development.ini
index e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/static_assets/development.ini
+++ b/docs/quick_tutorial/static_assets/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/templating/development.ini b/docs/quick_tutorial/templating/development.ini
index e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/templating/development.ini
+++ b/docs/quick_tutorial/templating/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/unit_testing/development.ini b/docs/quick_tutorial/unit_testing/development.ini
index c4b1b3c1d..52b2a3a41 100644
--- a/docs/quick_tutorial/unit_testing/development.ini
+++ b/docs/quick_tutorial/unit_testing/development.ini
@@ -5,4 +5,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/view_classes/development.ini b/docs/quick_tutorial/view_classes/development.ini
index e2b176d9c..4d47e54a5 100644
--- a/docs/quick_tutorial/view_classes/development.ini
+++ b/docs/quick_tutorial/view_classes/development.ini
@@ -6,4 +6,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/quick_tutorial/views/development.ini b/docs/quick_tutorial/views/development.ini
index c4b1b3c1d..52b2a3a41 100644
--- a/docs/quick_tutorial/views/development.ini
+++ b/docs/quick_tutorial/views/development.ini
@@ -5,4 +5,5 @@ pyramid.includes =
 
 [server:main]
 use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
diff --git a/docs/tutorials/wiki/src/authorization/development.ini b/docs/tutorials/wiki/src/authorization/development.ini
index 3679f2dcd..6bf4b198e 100644
--- a/docs/tutorials/wiki/src/authorization/development.ini
+++ b/docs/tutorials/wiki/src/authorization/development.ini
@@ -29,7 +29,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/authorization/production.ini b/docs/tutorials/wiki/src/authorization/production.ini
index 41a5f9907..4e9892e7b 100644
--- a/docs/tutorials/wiki/src/authorization/production.ini
+++ b/docs/tutorials/wiki/src/authorization/production.ini
@@ -24,7 +24,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/basiclayout/development.ini b/docs/tutorials/wiki/src/basiclayout/development.ini
index 3679f2dcd..6bf4b198e 100644
--- a/docs/tutorials/wiki/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
@@ -29,7 +29,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/basiclayout/production.ini b/docs/tutorials/wiki/src/basiclayout/production.ini
index 41a5f9907..4e9892e7b 100644
--- a/docs/tutorials/wiki/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki/src/basiclayout/production.ini
@@ -24,7 +24,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/installation/development.ini b/docs/tutorials/wiki/src/installation/development.ini
index 3679f2dcd..6bf4b198e 100644
--- a/docs/tutorials/wiki/src/installation/development.ini
+++ b/docs/tutorials/wiki/src/installation/development.ini
@@ -29,7 +29,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/installation/production.ini b/docs/tutorials/wiki/src/installation/production.ini
index 41a5f9907..4e9892e7b 100644
--- a/docs/tutorials/wiki/src/installation/production.ini
+++ b/docs/tutorials/wiki/src/installation/production.ini
@@ -24,7 +24,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/models/development.ini b/docs/tutorials/wiki/src/models/development.ini
index 3679f2dcd..6bf4b198e 100644
--- a/docs/tutorials/wiki/src/models/development.ini
+++ b/docs/tutorials/wiki/src/models/development.ini
@@ -29,7 +29,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/models/production.ini b/docs/tutorials/wiki/src/models/production.ini
index 41a5f9907..4e9892e7b 100644
--- a/docs/tutorials/wiki/src/models/production.ini
+++ b/docs/tutorials/wiki/src/models/production.ini
@@ -24,7 +24,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/tests/development.ini b/docs/tutorials/wiki/src/tests/development.ini
index 3679f2dcd..6bf4b198e 100644
--- a/docs/tutorials/wiki/src/tests/development.ini
+++ b/docs/tutorials/wiki/src/tests/development.ini
@@ -29,7 +29,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/tests/production.ini b/docs/tutorials/wiki/src/tests/production.ini
index 41a5f9907..4e9892e7b 100644
--- a/docs/tutorials/wiki/src/tests/production.ini
+++ b/docs/tutorials/wiki/src/tests/production.ini
@@ -24,7 +24,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index 3679f2dcd..6bf4b198e 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -29,7 +29,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki/src/views/production.ini b/docs/tutorials/wiki/src/views/production.ini
index 41a5f9907..4e9892e7b 100644
--- a/docs/tutorials/wiki/src/views/production.ini
+++ b/docs/tutorials/wiki/src/views/production.ini
@@ -24,7 +24,8 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/authentication/development.ini b/docs/tutorials/wiki2/src/authentication/development.ini
index 89ee6388b..4a6c9325c 100644
--- a/docs/tutorials/wiki2/src/authentication/development.ini
+++ b/docs/tutorials/wiki2/src/authentication/development.ini
@@ -29,7 +29,8 @@ auth.secret = seekrit
 
 [server:main]
 use = egg:waitress#main
-list = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/authentication/production.ini b/docs/tutorials/wiki2/src/authentication/production.ini
index 4a5023c67..a13a0ca19 100644
--- a/docs/tutorials/wiki2/src/authentication/production.ini
+++ b/docs/tutorials/wiki2/src/authentication/production.ini
@@ -18,7 +18,8 @@ auth.secret = real-seekrit
 
 [server:main]
 use = egg:waitress#main
-list = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/authorization/development.ini b/docs/tutorials/wiki2/src/authorization/development.ini
index 62a7edd48..4a6c9325c 100644
--- a/docs/tutorials/wiki2/src/authorization/development.ini
+++ b/docs/tutorials/wiki2/src/authorization/development.ini
@@ -29,7 +29,8 @@ auth.secret = seekrit
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/authorization/production.ini b/docs/tutorials/wiki2/src/authorization/production.ini
index ac9672654..a13a0ca19 100644
--- a/docs/tutorials/wiki2/src/authorization/production.ini
+++ b/docs/tutorials/wiki2/src/authorization/production.ini
@@ -18,7 +18,8 @@ auth.secret = real-seekrit
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index c15f0a483..22b733e10 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -27,7 +27,8 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
 [server:main]
 use = egg:waitress#main
-list = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/basiclayout/production.ini b/docs/tutorials/wiki2/src/basiclayout/production.ini
index 215cafbcd..d2ecfe22a 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -16,7 +16,8 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
 [server:main]
 use = egg:waitress#main
-list = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/installation/development.ini b/docs/tutorials/wiki2/src/installation/development.ini
index c15f0a483..22b733e10 100644
--- a/docs/tutorials/wiki2/src/installation/development.ini
+++ b/docs/tutorials/wiki2/src/installation/development.ini
@@ -27,7 +27,8 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
 [server:main]
 use = egg:waitress#main
-list = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/installation/production.ini b/docs/tutorials/wiki2/src/installation/production.ini
index 215cafbcd..d2ecfe22a 100644
--- a/docs/tutorials/wiki2/src/installation/production.ini
+++ b/docs/tutorials/wiki2/src/installation/production.ini
@@ -16,7 +16,8 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
 [server:main]
 use = egg:waitress#main
-list = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/models/development.ini b/docs/tutorials/wiki2/src/models/development.ini
index c15f0a483..22b733e10 100644
--- a/docs/tutorials/wiki2/src/models/development.ini
+++ b/docs/tutorials/wiki2/src/models/development.ini
@@ -27,7 +27,8 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
 [server:main]
 use = egg:waitress#main
-list = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/models/production.ini b/docs/tutorials/wiki2/src/models/production.ini
index 215cafbcd..d2ecfe22a 100644
--- a/docs/tutorials/wiki2/src/models/production.ini
+++ b/docs/tutorials/wiki2/src/models/production.ini
@@ -16,7 +16,8 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
 [server:main]
 use = egg:waitress#main
-list = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/tests/development.ini b/docs/tutorials/wiki2/src/tests/development.ini
index 89ee6388b..4a6c9325c 100644
--- a/docs/tutorials/wiki2/src/tests/development.ini
+++ b/docs/tutorials/wiki2/src/tests/development.ini
@@ -29,7 +29,8 @@ auth.secret = seekrit
 
 [server:main]
 use = egg:waitress#main
-list = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/tests/production.ini b/docs/tutorials/wiki2/src/tests/production.ini
index 4a5023c67..a13a0ca19 100644
--- a/docs/tutorials/wiki2/src/tests/production.ini
+++ b/docs/tutorials/wiki2/src/tests/production.ini
@@ -18,7 +18,8 @@ auth.secret = real-seekrit
 
 [server:main]
 use = egg:waitress#main
-list = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini
index c15f0a483..22b733e10 100644
--- a/docs/tutorials/wiki2/src/views/development.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
@@ -27,7 +27,8 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
 [server:main]
 use = egg:waitress#main
-list = 127.0.0.1:6543
+host = 127.0.0.1
+port = 6543
 
 ###
 # logging configuration
diff --git a/docs/tutorials/wiki2/src/views/production.ini b/docs/tutorials/wiki2/src/views/production.ini
index 215cafbcd..d2ecfe22a 100644
--- a/docs/tutorials/wiki2/src/views/production.ini
+++ b/docs/tutorials/wiki2/src/views/production.ini
@@ -16,7 +16,8 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
 
 [server:main]
 use = egg:waitress#main
-list = 0.0.0.0:6543
+host = 0.0.0.0
+port = 6543
 
 ###
 # logging configuration