summaryrefslogtreecommitdiff
path: root/docs/narr/startup.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-01-10 14:45:12 -0500
committerChris McDonough <chrism@plope.com>2012-01-10 14:45:12 -0500
commit26484029f9d4d591e9541547f6d5e381ce3a0be2 (patch)
treeaba3132e660b320a6734adb0d93a3b6bbdcf5877 /docs/narr/startup.rst
parenta21278872884809cfec7d5de8c64518c404f2b02 (diff)
parentcf3a11e990adda800e284effb006f1c28335da4d (diff)
downloadpyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.tar.gz
pyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.tar.bz2
pyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.zip
Merge branch '1.3-branch'
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 a7fc5d33c..78b119687 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -133,8 +133,8 @@ Here's a high-level time-ordered overview of what happens when you press
far as ``pserve`` is concerned, it is "just another WSGI application".
#. ``pserve`` starts the WSGI *server* defined within the ``[server:main]``
- section. In our case, this is the ``egg:pyramid#wsgiref`` server (``use =
- egg:pyramid#wsgiref``), and it will listen on all interfaces (``host =
+ section. In our case, this is the Waitress server (``use =
+ egg:waitress#main``), and it will listen on all interfaces (``host =
0.0.0.0``), on port number 6543 (``port = 6543``). The server code itself
is what prints ``serving on 0.0.0.0:6543 view at http://127.0.0.1:6543``.
The server serves the application, and the application is running, waiting