Pylons · stevepiercy · Dec 6, 2016 · Dec 6, 2016 · Dec 6, 2016 · Dec 6, 2016
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -119,6 +119,9 @@ Features
 
   See https://github.com/Pylons/pyramid/pull/2805
 
+- Scaffolds, documentation and tutorials now use ``listen`` option instead
+  of ``host`` and ``port`` to configure Waitress server.
+
 Bug Fixes
 ---------
 

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -288,3 +288,5 @@ Contributors
 - Moriyoshi Koizumi, 2016/11/20
 
 - Mikko Ohtamaa, 2016/12/6
+
+- Martin Frlin, 2016/12/6
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -288,3 +288,5 @@ Contributors
		- Moriyoshi Koizumi, 2016/11/20

		- Mikko Ohtamaa, 2016/12/6

		- Martin Frlin, 2016/12/6