summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/definingmodels.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:39:48 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:39:48 -0500
commitcf7c15a6ceb0b96a7950daef2a33ee2464c655cb (patch)
treec792a3bf12b2b2615fbb306e354c85b10983d63b /docs/tutorials/wiki/definingmodels.rst
parent1b5c1c3df5eadf02b0e8818e32ee45e69b2c051f (diff)
parentc5d01d4667d678782898b7d6859d60c617e30a9e (diff)
downloadpyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.gz
pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.bz2
pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki/definingmodels.rst')
-rw-r--r--docs/tutorials/wiki/definingmodels.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorials/wiki/definingmodels.rst b/docs/tutorials/wiki/definingmodels.rst
index 1a5d38b10..2cbe691fa 100644
--- a/docs/tutorials/wiki/definingmodels.rst
+++ b/docs/tutorials/wiki/definingmodels.rst
@@ -63,7 +63,7 @@ contain the :term:`ReStructuredText` body representing the wiki page content.
Note that ``Page`` objects don't have an initial ``__name__`` or
``__parent__`` attribute. All objects in a traversal graph must have a
``__name__`` and a ``__parent__`` attribute. We don't specify these here
-because both ``__name__`` and ``__parent__`` will be set by by a :term:`view`
+because both ``__name__`` and ``__parent__`` will be set by a :term:`view`
function when a Page is added to our Wiki mapping.
As a last step, we want to change the ``appmaker`` function in our