summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-10-27 00:11:03 -0700
committerSteve Piercy <web@stevepiercy.com>2015-10-27 00:11:03 -0700
commit8ed6c34cbcfe1a0abdec6e19f7082c87f703ed48 (patch)
treeb550b14215a484a10fb5ed809bd48513a033bab5 /docs
parentc373a6a02261e1f60cda166160a85a7be1b50349 (diff)
parent32dc9c07cfae125a7e00ffb5d71b7cafa63c1879 (diff)
downloadpyramid-8ed6c34cbcfe1a0abdec6e19f7082c87f703ed48.tar.gz
pyramid-8ed6c34cbcfe1a0abdec6e19f7082c87f703ed48.tar.bz2
pyramid-8ed6c34cbcfe1a0abdec6e19f7082c87f703ed48.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs')
-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