summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/definingviews.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-09-27 21:54:04 -0500
committerMichael Merickel <michael@merickel.org>2018-09-27 21:54:04 -0500
commit58d2a5f14bb787defefe7a2b1b36665c4991c0da (patch)
tree3eff83e38ad641e7285ce6788cad47a12fa14262 /docs/tutorials/wiki2/definingviews.rst
parentf081ae991a9107363fceeeeccd361c2f85bdd046 (diff)
parent279ee00fff1894b3451d84a8eeafae42e8638776 (diff)
downloadpyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.gz
pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.bz2
pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.zip
Merge branch 'master' into fix-deprecated-accept-predicate
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 700a105b1..fe539eca6 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