summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES.txt3
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--docs/quick_tutorial/forms/development.ini2
-rw-r--r--docs/quick_tutorial/retail_forms/development.ini2
-rw-r--r--docs/tutorials/wiki2/src/authentication/development.ini2
-rw-r--r--docs/tutorials/wiki2/src/authentication/production.ini2
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/development.ini2
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/production.ini2
-rw-r--r--docs/tutorials/wiki2/src/installation/development.ini2
-rw-r--r--docs/tutorials/wiki2/src/installation/production.ini2
-rw-r--r--docs/tutorials/wiki2/src/models/development.ini2
-rw-r--r--docs/tutorials/wiki2/src/models/production.ini2
-rw-r--r--docs/tutorials/wiki2/src/tests/development.ini2
-rw-r--r--docs/tutorials/wiki2/src/tests/production.ini2
-rw-r--r--docs/tutorials/wiki2/src/views/development.ini2
-rw-r--r--docs/tutorials/wiki2/src/views/production.ini2
16 files changed, 19 insertions, 14 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 65a1f15cd..65df2c7c5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -39,6 +39,9 @@ Backward Incompatibilities
(e.g. ``request.registry.settings.foo``). This was deprecated in Pyramid 1.2.
See https://github.com/Pylons/pyramid/pull/2823
+- Scaffolds, documentation and tutorials now use ``listen`` option instead
+ of ``host`` and ``port`` to configure Waitress server.
+
Features
--------
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index b4e30e085..90da9e074 100644
--- 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/7
diff --git a/docs/quick_tutorial/forms/development.ini b/docs/quick_tutorial/forms/development.ini
index 7114a48bb..e2b176d9c 100644
--- a/docs/quick_tutorial/forms/development.ini
+++ b/docs/quick_tutorial/forms/development.ini
@@ -6,4 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543 \ No newline at end of file
+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 7114a48bb..e2b176d9c 100644
--- a/docs/quick_tutorial/retail_forms/development.ini
+++ b/docs/quick_tutorial/retail_forms/development.ini
@@ -6,4 +6,4 @@ pyramid.includes =
[server:main]
use = egg:pyramid#wsgiref
-listen = 0.0.0.0:6543 \ No newline at end of file
+listen = 0.0.0.0:6543
diff --git a/docs/tutorials/wiki2/src/authentication/development.ini b/docs/tutorials/wiki2/src/authentication/development.ini
index 89ee6388b..62a7edd48 100644
--- a/docs/tutorials/wiki2/src/authentication/development.ini
+++ b/docs/tutorials/wiki2/src/authentication/development.ini
@@ -29,7 +29,7 @@ auth.secret = seekrit
[server:main]
use = egg:waitress#main
-list = 127.0.0.1:6543
+listen = 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 4a5023c67..ac9672654 100644
--- a/docs/tutorials/wiki2/src/authentication/production.ini
+++ b/docs/tutorials/wiki2/src/authentication/production.ini
@@ -18,7 +18,7 @@ auth.secret = real-seekrit
[server:main]
use = egg:waitress#main
-list = 0.0.0.0: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 c15f0a483..c30a31988 100644
--- a/docs/tutorials/wiki2/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -27,7 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-list = 127.0.0.1:6543
+listen = 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 215cafbcd..86d2db46f 100644
--- a/docs/tutorials/wiki2/src/basiclayout/production.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -16,7 +16,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-list = 0.0.0.0:6543
+listen = 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 c15f0a483..c30a31988 100644
--- a/docs/tutorials/wiki2/src/installation/development.ini
+++ b/docs/tutorials/wiki2/src/installation/development.ini
@@ -27,7 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-list = 127.0.0.1:6543
+listen = 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 215cafbcd..86d2db46f 100644
--- a/docs/tutorials/wiki2/src/installation/production.ini
+++ b/docs/tutorials/wiki2/src/installation/production.ini
@@ -16,7 +16,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-list = 0.0.0.0:6543
+listen = 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 c15f0a483..c30a31988 100644
--- a/docs/tutorials/wiki2/src/models/development.ini
+++ b/docs/tutorials/wiki2/src/models/development.ini
@@ -27,7 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-list = 127.0.0.1:6543
+listen = 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 215cafbcd..86d2db46f 100644
--- a/docs/tutorials/wiki2/src/models/production.ini
+++ b/docs/tutorials/wiki2/src/models/production.ini
@@ -16,7 +16,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-list = 0.0.0.0:6543
+listen = 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 89ee6388b..62a7edd48 100644
--- a/docs/tutorials/wiki2/src/tests/development.ini
+++ b/docs/tutorials/wiki2/src/tests/development.ini
@@ -29,7 +29,7 @@ auth.secret = seekrit
[server:main]
use = egg:waitress#main
-list = 127.0.0.1:6543
+listen = 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 4a5023c67..ac9672654 100644
--- a/docs/tutorials/wiki2/src/tests/production.ini
+++ b/docs/tutorials/wiki2/src/tests/production.ini
@@ -18,7 +18,7 @@ auth.secret = real-seekrit
[server:main]
use = egg:waitress#main
-list = 0.0.0.0:6543
+listen = 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 c15f0a483..c30a31988 100644
--- a/docs/tutorials/wiki2/src/views/development.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
@@ -27,7 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-list = 127.0.0.1:6543
+listen = 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 215cafbcd..86d2db46f 100644
--- a/docs/tutorials/wiki2/src/views/production.ini
+++ b/docs/tutorials/wiki2/src/views/production.ini
@@ -16,7 +16,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite
[server:main]
use = egg:waitress#main
-list = 0.0.0.0:6543
+listen = 0.0.0.0:6543
###
# logging configuration
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-10 21:15:37 +0000