summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMartin <martin.frlin@gmail.com>2016-12-09 14:21:23 +0100
committerMartin <martin.frlin@gmail.com>2016-12-09 14:21:23 +0100
commit3c5731a1cac958e05093df56263d52433fc683a9 (patch)
tree043a8bfd44b2a7ed36af96e2a0219032133d24a4 /docs
parent7c777964bd2991e2940be2c3be63263b9d4ee2d8 (diff)
downloadpyramid-3c5731a1cac958e05093df56263d52433fc683a9.tar.gz
pyramid-3c5731a1cac958e05093df56263d52433fc683a9.tar.bz2
pyramid-3c5731a1cac958e05093df56263d52433fc683a9.zip
grammar fixes
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/project.rst4
-rw-r--r--docs/narr/startup.rst9
2 files changed, 6 insertions, 7 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index e2e0f6411..9b0d54ec7 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -317,8 +317,8 @@ 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/``. Same holds true if you use
-ipv6. ``[::]`` means the same as ``0.0.0.0`` but for ipv6 protocol.
+browser by visiting ``http://192.168.1.50:6543/``. The 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
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst
index 691a56da6..1be8037a3 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -131,11 +131,10 @@ 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 [::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.
+ 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
+ serves the application, and the application is running, waiting to receive requests.
.. seealso::
Logging configuration is described in the :ref:`logging_chapter` chapter.