diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-08 04:44:50 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-08 04:44:50 -0400 |
| commit | 6a28ee15243fa1a3ae918d176cc6629c1cacfb7e (patch) | |
| tree | 98576c6ad37cf7c6c0cfaf62b635723380cc2393 /docs/quick_tour.rst | |
| parent | fc477b2e4b20ae2788e468e45b2831e774be8ced (diff) | |
| parent | bd5a7ff20d9bdeaf36ef4154cbb0322696a46e2b (diff) | |
| download | pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.tar.gz pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.tar.bz2 pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.zip | |
fix merge conflict
Diffstat (limited to 'docs/quick_tour.rst')
| -rw-r--r-- | docs/quick_tour.rst | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst index e55730a0d..4b23f7858 100644 --- a/docs/quick_tour.rst +++ b/docs/quick_tour.rst @@ -18,7 +18,7 @@ snippets of code to illustrate major concepts. Python Setup ============ -First things first: we need our Python environment in ship-shape. +First thing's first: we need our Python environment in ship-shape. Pyramid encourages standard Python development practices (virtual environments, packaging tools, logging, etc.) so let's get our working area in place. For Python 3.3: @@ -250,8 +250,9 @@ Python, but instead, will use a templating language. Pyramid doesn't mandate a particular database system, form library, etc. It encourages replaceability. This applies equally to templating, which is fortunate: developers have strong views about template -languages. That said, Pyramid bundles Chameleon and Mako, -so in this step, let's use Chameleon as an example: +languages. That said, the Pylons Project officially supports bindings for +Chameleon, Jinja2 and Mako, so in this step, let's use Chameleon as an +example: .. literalinclude:: quick_tour/templating/views.py :start-after: Start View 1 @@ -271,7 +272,7 @@ we can use ``name`` as a variable in our template via .. seealso:: See Also: :doc:`../narr/templates`, :ref:`debugging_templates`, and - :ref:`mako_templates` + :ref:`available_template_system_bindings` Templating With ``jinja2`` ========================== |