diff options
| author | Michael Merickel <michael@merickel.org> | 2017-01-02 19:22:28 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-02 19:22:28 -0600 |
| commit | f01e74d21e7cadd052c1853d7fe482bd7b9970fa (patch) | |
| tree | abcec287bda4b706bfa3e6bc40601d0883206122 /docs/quick_tour.rst | |
| parent | fc163d411bd57b232f68ed6554aff3a3ef8f2339 (diff) | |
| parent | a36d33bf7872575fb79cdc0e5959a62b30df5742 (diff) | |
| download | pyramid-f01e74d21e7cadd052c1853d7fe482bd7b9970fa.tar.gz pyramid-f01e74d21e7cadd052c1853d7fe482bd7b9970fa.tar.bz2 pyramid-f01e74d21e7cadd052c1853d7fe482bd7b9970fa.zip | |
Merge pull request #2889 from stevepiercy/docs-cookiecutter-changes-only
Docs cookiecutter changes only - Quick Tutorial and all other files
Diffstat (limited to 'docs/quick_tour.rst')
| -rw-r--r-- | docs/quick_tour.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst index 186cab29e..053846276 100644 --- a/docs/quick_tour.rst +++ b/docs/quick_tour.rst @@ -116,7 +116,7 @@ part of a web application, web developers need a robust, mature set of software for web requests. Pyramid has always fit nicely into the existing world of Python web development -(virtual environments, packaging, scaffolding, one of the first to embrace +(virtual environments, packaging, cookiecutters, one of the first to embrace Python 3, etc.). Pyramid turned to the well-regarded :term:`WebOb` Python library for request and response handling. In our example above, Pyramid hands ``hello_world`` a ``request`` that is :ref:`based on WebOb <webob_chapter>`. @@ -547,7 +547,7 @@ Let's look at ``pserve`` and configuration in more depth. .. seealso:: See also: :ref:`Quick Tutorial Cookiecutters <qtut_cookiecutters>`, :ref:`project_narr`, and - :doc:`../narr/scaffolding` + :doc:`../narr/cookiecutters` Application running with ``pserve`` =================================== @@ -613,7 +613,7 @@ We have a few decisions made for us in this configuration: #. *Interfaces:* ``listen = 127.0.0.1:6543 [::1]:6543`` tells ``waitress`` to listen on all interfaces on port 6543 for both IPv4 and IPv6. -Additionally the ``development.ini`` generated by this scaffold wired up +Additionally the ``development.ini`` generated by this cookiecutter wired up Python's standard logging. We'll now see in the console, for example, a log on every request that comes in, as well as traceback information. @@ -893,7 +893,7 @@ database with tables. Let's run it, then start the application: $ $VENV/bin/pserve development.ini The ORM eases the mapping of database structures into a programming language. -SQLAlchemy uses "models" for this mapping. The scaffold generated a sample +SQLAlchemy uses "models" for this mapping. The cookiecutter generated a sample model: .. literalinclude:: quick_tour/sqla_demo/sqla_demo/models/mymodel.py |