summaryrefslogtreecommitdiff
path: root/docs/quick_tour.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-03-21 23:34:26 -0500
committerMichael Merickel <michael@merickel.org>2016-03-21 23:34:26 -0500
commit5238bb64abfebc085ca95df517535f61e27b7fc2 (patch)
treec4eb14e487f561d4c12824b0b03656e24efccfd1 /docs/quick_tour.rst
parent0b0f7e1a6d411bcc2af615da8e9dec7ea7519152 (diff)
parent530bad618c33d65ad071b0280ce56eb265195805 (diff)
downloadpyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.gz
pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.bz2
pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.zip
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/quick_tour.rst')
-rw-r--r--docs/quick_tour.rst17
1 files changed, 6 insertions, 11 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index a7c184776..65310bf4d 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -842,21 +842,16 @@ The ORM eases the mapping of database structures into a programming language.
SQLAlchemy uses "models" for this mapping. The scaffold generated a sample
model:
-.. literalinclude:: quick_tour/sqla_demo/sqla_demo/models.py
- :language: python
- :linenos:
- :lineno-start: 21
- :lines: 21-
+.. literalinclude:: quick_tour/sqla_demo/sqla_demo/models/mymodel.py
+ :start-after: Start Sphinx Include
+ :end-before: End Sphinx Include
View code, which mediates the logic between web requests and the rest of the
system, can then easily get at the data thanks to SQLAlchemy:
-.. literalinclude:: quick_tour/sqla_demo/sqla_demo/views.py
- :language: python
- :linenos:
- :lineno-start: 12
- :lines: 12-18
- :emphasize-lines: 4
+.. literalinclude:: quick_tour/sqla_demo/sqla_demo/views/default.py
+ :start-after: Start Sphinx Include
+ :end-before: End Sphinx Include
.. seealso:: See also:
:ref:`Quick Tutorial Databases <qtut_databases>`, `SQLAlchemy