summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/basiclayout.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-11 13:40:44 -0500
committerChris McDonough <chrism@plope.com>2010-11-11 13:40:44 -0500
commit40eb89e594ec6aefaeffb3db67493bdf0f9b6224 (patch)
treeb6e4049d428c3e148f8197baee3570c6d3f14245 /docs/tutorials/wiki2/basiclayout.rst
parent560fe3ae45077020c54edf52bd33dbc8f2973e69 (diff)
downloadpyramid-40eb89e594ec6aefaeffb3db67493bdf0f9b6224.tar.gz
pyramid-40eb89e594ec6aefaeffb3db67493bdf0f9b6224.tar.bz2
pyramid-40eb89e594ec6aefaeffb3db67493bdf0f9b6224.zip
- SQLAlchemy+urldispach wiki (``wiki2``) tutorial updated due to changes to
``pyramid_routesalchemy`` paster template.
Diffstat (limited to 'docs/tutorials/wiki2/basiclayout.rst')
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst18
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 30e9b5b3c..9aca94fe5 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -32,30 +32,30 @@ entry point happens to be the ``app`` function within the file named
#. *Lines 1-4*. Imports to support later code.
-#. *Lines 12-14*. Get the database configuration string from the
+#. *Lines 9-11*. Get the database configuration string from the
``development.ini`` file's ``[app:sqlalchemy]`` section. This will be a
URI (something like ``sqlite://``).
-#. *Line 15*. Get the database echo setting from ``development.ini``
+#. *Line 12*. Get the database echo setting from ``development.ini``
file's ``[app:sqlalchemy]`` section. This will either be ``true``
or ``false``. If ``true``, the application will print SQL to the
console as it is generated and run by SQLAlchemy. By default, it
is false.
-#. Line *16*. We initialize our SQL database using SQLAlchemy, passing
+#. Line *13*. We initialize our SQL database using SQLAlchemy, passing
it the db string and a variant of the db_echo value.
-#. *Line 17*. We construct a :term:`Configurator`. ``settings`` is
+#. *Line 14*. We construct a :term:`Configurator`. ``settings`` is
passed as a keyword argument with the dictionary values passed by
PasteDeploy as the ``settings`` argument. This will be a
dictionary of settings parsed by PasteDeploy, which contains
deployment-related values such as ``reload_templates``,
``db_string``, etc.
-#. *Line 18*. We call :meth:`pyramid.configuration.Configurator.begin` which
+#. *Line 15*. We call :meth:`pyramid.configuration.Configurator.begin` which
tells the configuration machinery we are starting configuration.
-#. *Line 19*. We call
+#. *Line 16*. We call
:meth:`pyramid.configuration.Configurator.add_static_view` with the
arguments ``static`` (the name), and ``tutorial:static`` (the path). This
registers a static resource view which will match any URL that starts with
@@ -67,7 +67,7 @@ entry point happens to be the ``app`` function within the file named
``/static/foo``) will be used to compose a path to a static file resource,
such as a CSS file.
-#. *Lines 20-21*. Register a :term:`route configuration` via the
+#. *Lines 17-18*. Register a :term:`route configuration` via the
:meth:`pyramid.configuration.Configurator.add_route` method that will be
used when the URL is ``/``. Since this route has an ``pattern`` equalling
``/`` it is the "default" route. The argument named ``view`` with the
@@ -81,10 +81,10 @@ entry point happens to be the ``app`` function within the file named
``tutorial.views.my_view`` view returns a dictionary, a :term:`renderer`
will use this template to create a response.
-#. *Line 22*. We call :meth:`pyramid.configuration.Configurator.end` which
+#. *Line 19*. We call :meth:`pyramid.configuration.Configurator.end` which
tells the configuration machinery we are ending configuration.
-#. *Line 23*. We use the
+#. *Line 20*. We use the
:meth:`pyramid.configuration.Configurator.make_wsgi_app` method to return
a :term:`WSGI` application.