summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Shenton <chris@v-studios.com>2017-10-21 19:26:06 +0200
committerChris Shenton <chris@v-studios.com>2017-10-21 19:26:06 +0200
commit30bf7300404c1259d6558d58713933a5a067eeee (patch)
treea845275b4aea27a4182e049f51ed07f285bb1c44
parent088013637dfb4623bc3ea6588b6f08e827fecdd7 (diff)
downloadpyramid-30bf7300404c1259d6558d58713933a5a067eeee.tar.gz
pyramid-30bf7300404c1259d6558d58713933a5a067eeee.tar.bz2
pyramid-30bf7300404c1259d6558d58713933a5a067eeee.zip
Changes per stevepiercy review, thanks!
-rw-r--r--docs/quick_tutorial/authentication.rst2
-rw-r--r--docs/quick_tutorial/forms.rst2
-rw-r--r--docs/quick_tutorial/ini.rst5
-rw-r--r--docs/quick_tutorial/requirements.rst4
4 files changed, 7 insertions, 6 deletions
diff --git a/docs/quick_tutorial/authentication.rst b/docs/quick_tutorial/authentication.rst
index b940f1086..684cce6a6 100644
--- a/docs/quick_tutorial/authentication.rst
+++ b/docs/quick_tutorial/authentication.rst
@@ -39,7 +39,7 @@ Steps
.. literalinclude:: authentication/setup.py
:language: python
- :emphasize-lines: 6-7
+ :emphasize-lines: 7
:linenos:
#. We can now install our project in development mode:
diff --git a/docs/quick_tutorial/forms.rst b/docs/quick_tutorial/forms.rst
index 74cce75c1..3c865ad09 100644
--- a/docs/quick_tutorial/forms.rst
+++ b/docs/quick_tutorial/forms.rst
@@ -41,7 +41,7 @@ Steps
pulls in Colander as a dependency:
.. literalinclude:: forms/setup.py
- :emphasize-lines: 6-7
+ :emphasize-lines: 7
:linenos:
#. We can now install our project in development mode:
diff --git a/docs/quick_tutorial/ini.rst b/docs/quick_tutorial/ini.rst
index c478d6784..f6d64eeda 100644
--- a/docs/quick_tutorial/ini.rst
+++ b/docs/quick_tutorial/ini.rst
@@ -102,8 +102,9 @@ The ``.ini`` file is also used for two other functions:
- *Configuring the WSGI server*. ``[server:main]`` wires up the choice
of which WSGI *server* for your WSGI *application*. In this case, we
are using ``waitress`` which was specified in
- ``tutorial/setup.py``. It also wires up the *port number*: ``listen
- = localhost:6543`` tells ``waitress`` to listen on port 6543.
+ ``tutorial/setup.py``. It also wires up the *port number*:
+ ``listen = localhost:6543`` tells ``waitress`` to listen on host
+ ``localhost`` at port ``6543``.
- *Configuring Python logging*. Pyramid uses Python standard logging, which
needs a number of configuration values. The ``.ini`` serves this function.
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index ad7ad1af1..a65cfe6d2 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -189,7 +189,7 @@ Install Pyramid
---------------
We have our Python standard prerequisites out of the way. The Pyramid
-part is pretty easy.
+part is pretty easy. We'll also install a WSGI server, Waitress.
.. parsed-literal::
@@ -200,7 +200,7 @@ part is pretty easy.
c:\\> %VENV%\\Scripts\\pip install "pyramid==\ |release|\ " waitress
Our Python virtual environment now has the Pyramid software available
-as well as the ``waitress`` server.
+as well as the ``waitress`` package.
You can optionally install some of the extra Python packages used in this
tutorial.