diff options
| author | Dariusz Górecki <darek.krk@gmail.com> | 2016-08-10 11:10:49 +0100 |
|---|---|---|
| committer | Dariusz Górecki <darek.krk@gmail.com> | 2016-08-10 11:10:49 +0100 |
| commit | f2f196db97462d5d19253d261cb2167fd19c1108 (patch) | |
| tree | 8f14e42096c343b57d4ccae486dea0309bad4b49 /docs/tutorials/wiki2 | |
| parent | c0ddbc37530042119539b60245e2e2a4fccc83c0 (diff) | |
| parent | a69db3dc7c57f318308434905ee96e23d0c0d3df (diff) | |
| download | pyramid-f2f196db97462d5d19253d261cb2167fd19c1108.tar.gz pyramid-f2f196db97462d5d19253d261cb2167fd19c1108.tar.bz2 pyramid-f2f196db97462d5d19253d261cb2167fd19c1108.zip | |
Merge branch 'master' into extract_http_basic
Diffstat (limited to 'docs/tutorials/wiki2')
| -rw-r--r-- | docs/tutorials/wiki2/basiclayout.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/installation.rst | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst index ce67bb9e3..98a14c644 100644 --- a/docs/tutorials/wiki2/basiclayout.rst +++ b/docs/tutorials/wiki2/basiclayout.rst @@ -114,7 +114,7 @@ Finally ``main`` is finished configuring things, so it uses the Route declarations ------------------ -Open the ``tutorials/routes.py`` file. It should already contain the following: +Open the ``tutorial/routes.py`` file. It should already contain the following: .. literalinclude:: src/basiclayout/tutorial/routes.py :linenos: diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst index a214b1306..0440c2d1d 100644 --- a/docs/tutorials/wiki2/installation.rst +++ b/docs/tutorials/wiki2/installation.rst @@ -402,13 +402,6 @@ initialize our database. already have a database, you should delete it before running ``initialize_tutorial_db`` again. -.. note:: - - The ``initialize_tutorial_db`` command is not performing a migration but - rather simply creating missing tables and adding some dummy data. If you - already have a database, you should delete it before running - ``initialize_tutorial_db`` again. - Type the following command, making sure you are still in the ``tutorial`` directory (the directory with a ``development.ini`` in it): |