summaryrefslogtreecommitdiff
path: root/docs/narr/startup.rst
diff options
context:
space:
mode:
authorBert JW Regeer <xistence@0x58.com>2016-12-06 16:04:31 -0800
committerGitHub <noreply@github.com>2016-12-06 16:04:31 -0800
commit8bc0f9a68c4f19533ccdf4486656f2a106a81827 (patch)
tree818259ca5e25cfb7593589301eb8e2d32755e99a /docs/narr/startup.rst
parent7ab666e3e2539662ff3324a4bdedbca3c8f8040a (diff)
parent988c1f789faf9662abead1e1be40969be37867a8 (diff)
downloadpyramid-8bc0f9a68c4f19533ccdf4486656f2a106a81827.tar.gz
pyramid-8bc0f9a68c4f19533ccdf4486656f2a106a81827.tar.bz2
pyramid-8bc0f9a68c4f19533ccdf4486656f2a106a81827.zip
Merge pull request #2851 from Pylons/revert-2847-issue-2656
Revert "Changed 'host' and 'port' configuration to a new 'listen' style that …"
Diffstat (limited to 'docs/narr/startup.rst')
-rw-r--r--docs/narr/startup.rst4
1 files changed, 2 insertions, 2 deletions
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.