summaryrefslogtreecommitdiff
path: root/docs/narr/renderers.rst
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-01-03 02:03:24 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-01-03 02:03:24 -0700
commit30ae71b4a7ad97a649165374a75a70f4b64ae25c (patch)
treeb8a2cd06ff0130fd31b702862db2e46d39cd4e71 /docs/narr/renderers.rst
parent504027873ab0e1b15601e2d1900ef8a4469f6a43 (diff)
parent5558386fd1a6181b2e8ad06659049c055a7ed023 (diff)
downloadpyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.gz
pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.bz2
pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.zip
Merge branch 'master' into feature/configurable-view-deriver
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 cc5baf05e..50e85813a 100644
--- a/docs/narr/renderers.rst
+++ b/docs/narr/renderers.rst
@@ -609,8 +609,8 @@ Pyramid supports overriding almost every aspect of its setup through its
:ref:`Conflict Resolution <automatic_conflict_resolution>` mechanism. This
means that, in most cases, overriding a renderer is as simple as using the
:meth:`pyramid.config.Configurator.add_renderer` method to redefine the
-template extension. For example, if you would like to override the ``.txt``
-extension to specify a new renderer, you could do the following:
+template extension. For example, if you would like to override the ``json``
+renderer to specify a new renderer, you could do the following:
.. code-block:: python