summaryrefslogtreecommitdiff
path: root/docs/narr/renderers.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-04-01 11:42:28 -0500
committerMichael Merickel <michael@merickel.org>2013-04-01 11:42:28 -0500
commit5f3eee1d89b52458e372875bbf71efb0cc5e3fcf (patch)
tree6d6b61cc0799bc3c68da24e86691e8b985bdc821 /docs/narr/renderers.rst
parent75a3d11316fa2ab98afd1d8ac68d2f672b7ac871 (diff)
parenta9cdf8f67a59e051233dae1a8e21e3b60037c608 (diff)
downloadpyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.tar.gz
pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.tar.bz2
pyramid-5f3eee1d89b52458e372875bbf71efb0cc5e3fcf.zip
Merge branch 'pull.963'
Diffstat (limited to 'docs/narr/renderers.rst')
-rw-r--r--docs/narr/renderers.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst
index 08ebd881e..b4eb95186 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -362,7 +362,7 @@ For example (Javascript):
jqhxr = $.getJSON(api_url);
The string ``callback=?`` above in the ``url`` param to the JQuery
-``getAjax`` function indicates to jQuery that the query should be made as
+``getJSON`` function indicates to jQuery that the query should be made as
a JSONP request; the ``callback`` parameter will be automatically filled
in for you and used.
@@ -720,7 +720,7 @@ factory, which expects to be passed a filesystem path:
Adding the above code to your application startup will allow you to use the
``my.package.MyJinja2Renderer`` renderer factory implementation in view
-configurations by referring to any ``renderer`` which *ends in* ``.jinja`` in
+configurations by referring to any ``renderer`` which *ends in* ``.jinja2`` in
the ``renderer`` attribute of a :term:`view configuration`:
.. code-block:: python