summaryrefslogtreecommitdiff
path: root/docs/quick_tour.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-05-19 10:14:13 -0400
committerChris McDonough <chrism@plope.com>2015-05-19 10:14:13 -0400
commit61889c275a2f80d36ac903503185942c5573446f (patch)
treec5a11fe6d7b908b6557f1799516ead3355c56ef6 /docs/quick_tour.rst
parentd2c49d66399e8caa0509822cab189c04d3f7ec35 (diff)
parentd43ebd35f288edddb6df9bef3d671735e1dfb124 (diff)
downloadpyramid-61889c275a2f80d36ac903503185942c5573446f.tar.gz
pyramid-61889c275a2f80d36ac903503185942c5573446f.tar.bz2
pyramid-61889c275a2f80d36ac903503185942c5573446f.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/quick_tour.rst')
-rw-r--r--docs/quick_tour.rst13
1 files changed, 6 insertions, 7 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 41a0dc8c0..1b8c82b0a 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -14,11 +14,10 @@ Installation
Once you have a standard Python environment setup, getting started with
Pyramid is a breeze. Unfortunately "standard" is not so simple in Python.
-For this Quick Tour, it means:
-`Python <http://www.python.org/download/releases/>`_, a
-`virtual environment <http://docs.python.org/dev/library/venv.html>`_
-(or `virtualenv for Python 2.7 <https://pypi.python.org/pypi/virtualenv>`_),
-and `setuptools <https://pypi.python.org/pypi/setuptools/>`_.
+For this Quick Tour, it means: `Python <https://www.python.org/downloads/>`_,
+a `virtual environment <http://docs.python.org/dev/library/venv.html>`_ (or
+`virtualenv for Python 2.7 <https://pypi.python.org/pypi/virtualenv>`_), and
+`setuptools <https://pypi.python.org/pypi/setuptools/>`_.
As an example, for Python 3.3+ on Linux:
@@ -505,7 +504,7 @@ Let's look at ``pserve`` and configuration in more depth.
Application Running with ``pserve``
===================================
-Prior to scaffolds, our project mixed a number of operations details
+Prior to scaffolds, our project mixed a number of operational details
into our code. Why should my main code care which HTTP server I want and
what port number to run on?
@@ -627,7 +626,7 @@ You'll now see an attractive (and
collapsible) menu in the right of your browser, providing introspective
access to debugging information. Even better, if your web application
generates an error, you will see a nice traceback on the screen. When
-you want to disable this toolbar, no need to change code: you can
+you want to disable this toolbar, there's no need to change code: you can
remove it from ``pyramid.includes`` in the relevant ``.ini``
configuration file.