summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/installation.rst
diff options
context:
space:
mode:
authorgoodwillcoding <goodwillcoding@webhippo.net>2013-01-22 09:57:51 -0800
committergoodwillcoding <goodwillcoding@webhippo.net>2013-01-22 09:57:51 -0800
commitf9bb5acdef3322e549512ad721b2c351c0064e71 (patch)
tree8da2fd079e9f601aa33c8b9ba79e73095cf3f7ac /docs/tutorials/wiki/installation.rst
parent10f6c5a129cab1cb9f067ed7e0287585af2fc329 (diff)
parentf1134866e8ca96e1309dca930bd5345233748659 (diff)
downloadpyramid-f9bb5acdef3322e549512ad721b2c351c0064e71.tar.gz
pyramid-f9bb5acdef3322e549512ad721b2c351c0064e71.tar.bz2
pyramid-f9bb5acdef3322e549512ad721b2c351c0064e71.zip
Merge pull request #812 from stevepiercy/master
etc. is an abbreviation thank you
Diffstat (limited to 'docs/tutorials/wiki/installation.rst')
-rw-r--r--docs/tutorials/wiki/installation.rst9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 488ab1883..b545cdba0 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -193,8 +193,7 @@ assumptions:
.. note::
- :app:`Pyramid` supports any persistent storage mechanism (e.g. a SQL
- database or filesystem files, etc). :app:`Pyramid` also supports an
- additional mechanism to map URLs to code (:term:`URL dispatch`). However,
- for the purposes of this tutorial, we'll only be using traversal and ZODB.
-
+ :app:`Pyramid` supports any persistent storage mechanism (e.g., a SQL
+ database or filesystem files). :app:`Pyramid` also supports an additional
+ mechanism to map URLs to code (:term:`URL dispatch`). However, for the
+ purposes of this tutorial, we'll only be using traversal and ZODB.