diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-07-30 00:11:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-30 00:11:46 -0700 |
| commit | a69db3dc7c57f318308434905ee96e23d0c0d3df (patch) | |
| tree | aa453f1b72bf2427e8af9c05f2d1bf77217c6151 | |
| parent | f219514190bb44dcf378e2e072d4338bbf749516 (diff) | |
| parent | 3caa9dab20789a4d8cce58a9dec9e4ff25be6127 (diff) | |
| download | pyramid-a69db3dc7c57f318308434905ee96e23d0c0d3df.tar.gz pyramid-a69db3dc7c57f318308434905ee96e23d0c0d3df.tar.bz2 pyramid-a69db3dc7c57f318308434905ee96e23d0c0d3df.zip | |
Merge pull request #2730 from stevepiercy/master
forward port docs fixes from 1.7-branch
| -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): |