summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2017-05-12 21:46:14 -0700
committerGitHub <noreply@github.com>2017-05-12 21:46:14 -0700
commitc74cc428d941e60904b9899463a517207c0cf6b2 (patch)
treec69983404d7b9b8db62640809e6b81c5e46677b4 /docs/narr
parenta7d60de001ba14023d20d701d9697ad7d8de1dd4 (diff)
parent5f3b95cf3e1b3005007e739d0e008b21cff2babf (diff)
downloadpyramid-c74cc428d941e60904b9899463a517207c0cf6b2.tar.gz
pyramid-c74cc428d941e60904b9899463a517207c0cf6b2.tar.bz2
pyramid-c74cc428d941e60904b9899463a517207c0cf6b2.zip
Merge pull request #3039 from stevepiercy/change-to-localhost
Change to localhost
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/myproject/development.ini2
-rw-r--r--docs/narr/project.rst6
-rw-r--r--docs/narr/startup.rst12
3 files changed, 10 insertions, 10 deletions
diff --git a/docs/narr/myproject/development.ini b/docs/narr/myproject/development.ini
index 5d110805a..20a8a4868 100644
--- a/docs/narr/myproject/development.ini
+++ b/docs/narr/myproject/development.ini
@@ -24,7 +24,7 @@ pyramid.includes =
[server:main]
use = egg:waitress#main
-listen = 127.0.0.1:6543 [::1]:6543
+listen = localhost:6543
###
# logging configuration
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 9c44d4f16..a150afc6b 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 29a75cba2..5e7c7c871 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
@@ -139,8 +139,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 on port 6543
- for both IPv4 and IPv6 (``listen = 127.0.0.1:6543 [::1]:6543``). The server
- code itself is what prints ``serving on http://127.0.0.1:6543``. The server
+ for both IPv4 and IPv6 (``listen = localhost: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::