summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/definingviews.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-10-05 02:33:18 -0700
committerGitHub <noreply@github.com>2018-10-05 02:33:18 -0700
commit086198b5db7dcb86c2b4edbc5d3610dcade0332a (patch)
tree1af84e37e9ad7bdb445786a0345822dcdfd851f0 /docs/tutorials/wiki2/definingviews.rst
parent2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a (diff)
parentf6becd23966248fb7fc4db218258be4364902f8f (diff)
downloadpyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.gz
pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.bz2
pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.zip
Merge branch 'master' into one_cc
Diffstat (limited to 'docs/tutorials/wiki2/definingviews.rst')
-rw-r--r--docs/tutorials/wiki2/definingviews.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index b73338f52..d10d862f5 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -149,7 +149,7 @@ We'll describe each one briefly in the following sections.
.. note::
- There is nothing special about the filename ``default.py`` exept that it is a
+ There is nothing special about the filename ``default.py`` except that it is a
Python module. A project may have many view callables throughout its codebase
in arbitrarily named modules. Modules implementing view callables often have
``view`` in their name (or may live in a Python subpackage of your