diff options
| author | Chris McDonough <chrism@plope.com> | 2013-04-03 17:37:21 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-04-03 17:37:21 -0400 |
| commit | d64fa6136d0dec6717b273362de548d8f3bf47e8 (patch) | |
| tree | 23c77ac62ab9d6c93131874f835ae3166d4af53b /docs/narr/renderers.rst | |
| parent | 2ca9bde9d2862655ddee276cd14a375e6a5adec6 (diff) | |
| parent | 84e455cf7c8d9cbfe6658548a61af2ecbbc1749e (diff) | |
| download | pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.tar.gz pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.tar.bz2 pyramid-d64fa6136d0dec6717b273362de548d8f3bf47e8.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/renderers.rst')
| -rw-r--r-- | docs/narr/renderers.rst | 4 |
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 |
