Merge pull request #2847 from mfrlin/issue-2656

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

22 files changed, 22 insertions, 44 deletions

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..e2b176d9c 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
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