Merge pull request #472 from audreyr/master

Clarified instructions in wiki2 tutorial

2 files changed, 9 insertions, 3 deletions

diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 29e272081..888ae0bf3 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -16,8 +16,10 @@ Application Configuration with ``__init__.py``
 A directory on disk can be turned into a Python :term:`package` by containing
 an ``__init__.py`` file.  Even if empty, this marks a directory as a Python
 package.  We use ``__init__.py`` both as a marker indicating the directory
-it's contained within is a package, and to contain configuration code.  Our
-``__init__.py`` file will look like this:
+it's contained within is a package, and to contain configuration code.
+
+Open the ``tutorial/tutorial/__init__.py`` file.  It should already contain
+the following:
 
    .. literalinclude:: src/basiclayout/tutorial/__init__.py
       :linenos:
diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
index 66106ffee..ca0493f32 100644
--- a/docs/tutorials/wiki2/definingmodels.rst
+++ b/docs/tutorials/wiki2/definingmodels.rst
@@ -21,11 +21,15 @@ Making Edits to ``models.py``
   (or they may live in a Python subpackage of your application package named
   ``models``) , but this is only by convention.
 
-Here's what our ``models.py`` file should look like after this step:
+Open ``tutorial/tutorial/models.py`` file and edit it to look like the 
+following:
 
 .. literalinclude:: src/models/tutorial/models.py
    :linenos:
    :language: py
+   :emphasize-lines: 19-21,24,26,28
+
+(The highlighted lines are the ones that need to be changed.)
 
 The first thing we've done is to do is remove the stock ``MyModel`` class
 from the generated ``models.py`` file.  The ``MyModel`` class is only a