diff options
| author | Steve Piercy <web@stevepiercy.com> | 2013-03-21 13:32:14 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2013-03-21 13:32:14 -0700 |
| commit | a17c712f7f836b3506be069f60ee9ed8a8edb42b (patch) | |
| tree | d42a28e8b692fd6da1289c2ca8f99a18a8a3e59f /docs/tutorials/wiki2/basiclayout.rst | |
| parent | 124daa3f3de2350ee4079d684736acd10b415046 (diff) | |
| parent | f38126c3214c936f022e68a1cac88c3cd8644879 (diff) | |
| download | pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.tar.gz pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.tar.bz2 pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
docs/tutorials/wiki2/installation.rst
Diffstat (limited to 'docs/tutorials/wiki2/basiclayout.rst')
| -rw-r--r-- | docs/tutorials/wiki2/basiclayout.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst index 86fe97956..eb2445864 100644 --- a/docs/tutorials/wiki2/basiclayout.rst +++ b/docs/tutorials/wiki2/basiclayout.rst @@ -43,9 +43,9 @@ above is executed. It accepts some settings and returns a :term:`WSGI` application. (See :ref:`startup_chapter` for more about ``pserve``.) The main function first creates a :term:`SQLAlchemy` database engine using -``engine_from_config`` from the ``sqlalchemy.`` prefixed settings in the -``development.ini`` file's ``[app:main]`` section. This will be a URI -(something like ``sqlite://``): +:func:`sqlalchemy.engine_from_config` from the ``sqlalchemy.`` prefixed +settings in the ``development.ini`` file's ``[app:main]`` section. +This will be a URI (something like ``sqlite://``): .. literalinclude:: src/basiclayout/tutorial/__init__.py :lines: 13 |