Steve Piercy
2017-05-13 d88727da438861da9f839e840d4fc532fe51032d
Merge pull request #3040 from stevepiercy/1.8-branch

backport #3039 from master to 1.8-branch
26 files modified
68 ■■■■ changed files
CONTRIBUTORS.txt 4 ●●● patch | view | raw | blame | history
docs/narr/myproject/development.ini 2 ●●● patch | view | raw | blame | history
docs/narr/project.rst 6 ●●●● patch | view | raw | blame | history
docs/narr/startup.rst 12 ●●●● patch | view | raw | blame | history
docs/quick_tour.rst 2 ●●● patch | view | raw | blame | history
docs/quick_tour/logging/development.ini 2 ●●● patch | view | raw | blame | history
docs/quick_tour/package/development.ini 2 ●●● patch | view | raw | blame | history
docs/quick_tour/sessions/development.ini 2 ●●● patch | view | raw | blame | history
docs/quick_tour/sqla_demo/development.ini 2 ●●● patch | view | raw | blame | history
docs/quick_tutorial/cookiecutters/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/authorization/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/installation/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/models/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/tests/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki/src/views/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/installation/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/tests/development.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/views/development.ini 2 ●●● patch | view | raw | blame | history
pyramid/scaffolds/alchemy/development.ini_tmpl 2 ●●● patch | view | raw | blame | history
pyramid/scaffolds/starter/development.ini_tmpl 2 ●●● patch | view | raw | blame | history
pyramid/scaffolds/zodb/development.ini_tmpl 2 ●●● patch | view | raw | blame | history
CONTRIBUTORS.txt
@@ -295,4 +295,6 @@
- Kirill Kuzminykh, 2017/03/01
- Jeremy(Ching-Rui) Chen, 2017/04/19
- Aleph Melo, 2017/04/16
- Jeremy(Ching-Rui) Chen, 2017/04/
docs/narr/myproject/development.ini
@@ -24,7 +24,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/narr/project.rst
@@ -332,7 +332,7 @@
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 @@
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).
docs/narr/startup.rst
@@ -10,12 +10,12 @@
    $ $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
@@ -132,8 +132,8 @@
#. ``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::
docs/quick_tour.rst
@@ -618,7 +618,7 @@
#. *Choice of web server:* ``use = egg:waitress#main`` tells ``pserve`` to
   use the ``waitress`` server.
#. *Interfaces:* ``listen = 127.0.0.1:6543 [::1]:6543`` tells ``waitress`` to listen on all interfaces on port 6543 for both IPv4 and IPv6.
#. *Interfaces:* ``listen = localhost:6543`` tells ``waitress`` to listen on all interfaces on port 6543 for both IPv4 and IPv6.
Additionally the ``development.ini`` generated by this cookiecutter wired up
Python's standard logging. We'll now see in the console, for example, a log on
docs/quick_tour/logging/development.ini
@@ -24,7 +24,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/quick_tour/package/development.ini
@@ -24,7 +24,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/quick_tour/sessions/development.ini
@@ -24,7 +24,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/quick_tour/sqla_demo/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/quick_tutorial/cookiecutters/development.ini
@@ -24,7 +24,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki/src/authorization/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki/src/basiclayout/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki/src/installation/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki/src/models/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki/src/tests/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki/src/views/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki2/src/authentication/development.ini
@@ -28,7 +28,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki2/src/authorization/development.ini
@@ -28,7 +28,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki2/src/installation/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki2/src/models/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki2/src/tests/development.ini
@@ -28,7 +28,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
docs/tutorials/wiki2/src/views/development.ini
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
pyramid/scaffolds/alchemy/development.ini_tmpl
@@ -26,7 +26,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
pyramid/scaffolds/starter/development.ini_tmpl
@@ -24,7 +24,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration
pyramid/scaffolds/zodb/development.ini_tmpl
@@ -29,7 +29,7 @@
[server:main]
use = egg:waitress#main
listen = 127.0.0.1:6543 [::1]:6543
listen = localhost:6543
###
# logging configuration