Added configuration for ipv6 in .ini files.

4 files changed, 16 insertions, 11 deletions

diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini
index 42c514794..3a83dcfac 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
+listen = 127.0.0.1:6543 [::1]:6543
 
 ###
 # logging configuration
diff --git a/docs/narr/MyProject/production.ini b/docs/narr/MyProject/production.ini
index 3114b9d4d..c48ca6d9b 100644
--- a/docs/narr/MyProject/production.ini
+++ b/docs/narr/MyProject/production.ini
@@ -18,7 +18,7 @@ pyramid.default_locale_name = en
 
 [server:main]
 use = egg:waitress#main
-listen = 0.0.0.0:6543
+listen = *:6543
 
 ###
 # logging configuration
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index ec26b880e..e2e0f6411 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -290,20 +290,22 @@ Here's sample output from a run of ``pserve`` on UNIX:
 
    $ $VENV/bin/pserve development.ini
    Starting server in PID 16208.
-   serving on http://127.0.0.1:6543
+   Serving on http://127.0.0.1:6543
+   Serving on http://[::1]:6543
+
 
 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`` to ``0.0.0.0:6543``.  For
-example:
+``[server:main]`` section, changing it from ``127.0.0.1:6543 [::1]:6543`` to ``*:6543``
+(this is equivalent to ``0.0.0.0:6543 [::]:6543``).  For example:
 
 .. code-block:: ini
 
    [server:main]
    use = egg:waitress#main
-   listen = 0.0.0.0:6543
+   listen = *:6543
 
 Now when you use ``pserve`` to start the application, it will respond to
 requests on *all* IP addresses possessed by your system, not just requests to
@@ -315,12 +317,13 @@ the case, if you use a browser running on the same system as Pyramid, it will
 be able to access the application via ``http://127.0.0.1:6543/`` as well as via
 ``http://192.168.1.50:6543/``. However, *other people* on other computers on
 the same network will also be able to visit your Pyramid application in their
-browser by visiting ``http://192.168.1.50:6543/``.
+browser by visiting ``http://192.168.1.50:6543/``. Same holds true if you use
+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`` line in the ``development.ini`` file's ``[server:main]``
-section to ``listen = 127:0.0.1:8080`` to run the server on port 8080 instead of port 6543.
+``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.
 
 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 b71cff57d..691a56da6 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -10,7 +10,8 @@ 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://127.0.0.1:6543
+    Serving on http://[::1]: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
@@ -131,7 +132,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
+   127.0.0.1:6543 [::1]:6543``, means that it will listen on ipv4 and ipv6),
+   on port number 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.