summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-01-19 03:24:04 -0500
committerChris McDonough <chrism@plope.com>2012-01-19 03:24:04 -0500
commit077f3d1d0b28d9f565cc07a3ad11f4a8bb359054 (patch)
tree09ac1c9fb803fc89a557eb7283452e526614232e /docs/tutorials
parent4ef8a99d3260d99fa5522a0d26f1e7c1487c0265 (diff)
parent520676451b8b89177ad95cfcaa3f90484f5a6a18 (diff)
downloadpyramid-077f3d1d0b28d9f565cc07a3ad11f4a8bb359054.tar.gz
pyramid-077f3d1d0b28d9f565cc07a3ad11f4a8bb359054.tar.bz2
pyramid-077f3d1d0b28d9f565cc07a3ad11f4a8bb359054.zip
Merge branch '1.3-branch'
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki2/definingmodels.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
index cd295e993..2b8932a98 100644
--- a/docs/tutorials/wiki2/definingmodels.rst
+++ b/docs/tutorials/wiki2/definingmodels.rst
@@ -63,10 +63,10 @@ script. In particular, we'll replace our import of ``MyModel`` with one of
``Page`` and we'll change the very end of the script to create a ``Page``
rather than a ``MyModel`` and add it to our ``DBSession``.
-The result of all of our edits to ``models.py`` will end up looking
+The result of all of our edits to ``populate.py`` will end up looking
something like this:
-.. literalinclude:: src/models/tutorial/models.py
+.. literalinclude:: src/models/tutorial/scripts/populate.py
:linenos:
:language: python