diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-05-12 21:06:08 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2017-05-12 21:06:08 -0700 |
| commit | b57460e673b4837f9bb587ecb9b6deb1761dcfe6 (patch) | |
| tree | 9b4a742c29d5a4dd83165de65b487d061878d45b /docs | |
| parent | 6dbdeb344579522829007c64cfbe535d2f2ece1b (diff) | |
| download | pyramid-b57460e673b4837f9bb587ecb9b6deb1761dcfe6.tar.gz pyramid-b57460e673b4837f9bb587ecb9b6deb1761dcfe6.tar.bz2 pyramid-b57460e673b4837f9bb587ecb9b6deb1761dcfe6.zip | |
update narrative docs to align with source code
- per https://github.com/Pylons/pyramid/pull/3000#issuecomment-294565854
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/project.rst | 6 | ||||
| -rw-r--r-- | docs/narr/startup.rst | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst index ce7e90793..ad27290f3 100644 --- a/docs/narr/project.rst +++ b/docs/narr/project.rst @@ -332,7 +332,7 @@ 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 ``listen`` value in the -``[server:main]`` section, changing it from ``127.0.0.1:6543 [::1]:6543`` to ``*:6543`` +``[server:main]`` section, changing it from ``localhost:6543`` to ``*:6543`` (this is equivalent to ``0.0.0.0:6543 [::]:6543``). For example: .. code-block:: ini @@ -356,8 +356,8 @@ IPv6. ``[::]`` means the same as ``0.0.0.0`` but for IPv6 protocol. 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 -``listen = 127.0.0.1:6543 [::1]:6543`` line in the ``development.ini`` file's ``[server:main]`` -section to ``listen = 127:0.0.1:8080 [::1]:8080`` to run the server on port 8080 instead of port 6543. +``listen = localhost:6543`` line in the ``development.ini`` file's ``[server:main]`` +section to ``listen = localhost: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 index 08747fa89..27a2f1919 100644 --- a/docs/narr/startup.rst +++ b/docs/narr/startup.rst @@ -10,12 +10,12 @@ you'll see something much like this show up on the console: $ $VENV/bin/pserve development.ini Starting server in PID 16305. - Serving on http://127.0.0.1:6543 - Serving on http://[::1]:6543 + Serving on http://localhost:6543 + Serving on http://localhost:6543 This chapter explains what happens between the time you press the "Return" key -on your keyboard after typing ``pserve development.ini`` and the time the line -``serving on http://127.0.0.1:6543`` is output to your console. +on your keyboard after typing ``pserve development.ini`` and the time the lines +``Serving on http://localhost:6543`` are output to your console. .. index:: single: startup process @@ -133,7 +133,7 @@ Here's a high-level time-ordered overview of what happens when you press section. In our case, this is the Waitress server (``use = egg:waitress#main``), and it will listen on all interfaces on port 6543 for both IPv4 and IPv6 (``listen = localhost:6543``). The server - code itself is what prints ``serving on http://127.0.0.1:6543``. The server + code itself is what prints ``Serving on http://localhost:6543``. The server serves the application, and the application is running, waiting to receive requests. .. seealso:: |
