summaryrefslogtreecommitdiff
path: root/docs/narr/renderers.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-04-03 03:58:34 -0400
committerChris McDonough <chrism@plope.com>2013-04-03 03:58:34 -0400
commit2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (patch)
treef3a290b6e0a21549703050a33433dffef2acc87d /docs/narr/renderers.rst
parentdacbe656d8851580234214fb655b60d24f5800fb (diff)
parentf8afd1638456fc89bc3d17858f309686b40a40a4 (diff)
downloadpyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.gz
pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.bz2
pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.zip
Merge branch 'master' of github.com:Pylons/pyramid
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