summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-09-03 22:06:08 -0400
committerChris McDonough <chrism@plope.com>2013-09-03 22:06:08 -0400
commitc5938d061c36d3e49decceb1f72ab7eef60fab98 (patch)
treea74fc26c4572900560d37eca17e2b80d4a074c30 /docs
parentaa7b06b946b4e8e66818da29e64e9cbccb6ccb10 (diff)
parentc41c76bf713b636a19e97b319294ecf98885d1b5 (diff)
downloadpyramid-c5938d061c36d3e49decceb1f72ab7eef60fab98.tar.gz
pyramid-c5938d061c36d3e49decceb1f72ab7eef60fab98.tar.bz2
pyramid-c5938d061c36d3e49decceb1f72ab7eef60fab98.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/quick_tour.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index f75533220..e55730a0d 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -476,7 +476,7 @@ Application Running with ``pserve``
===================================
Prior to scaffolds, our project mixed a number of operations details
-into our code. Why should my main code care with HTTP server I want and
+into our code. Why should my main code care which HTTP server I want and
what port number to run on?
``pserve`` is Pyramid's application runner, separating operational
@@ -857,4 +857,4 @@ Conclusion
This *Quick Tour* covered a little about a lot. We introduced a long list
of concepts in Pyramid, many of which are expanded on more fully in the
-Pyramid developer docs. \ No newline at end of file
+Pyramid developer docs.