diff options
| author | Tres Seaver <tseaver@palladion.com> | 2015-11-12 08:47:16 -0500 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2015-11-12 08:47:16 -0500 |
| commit | b4c96d2892d8271b300b1920e3ce5d2c0eae588b (patch) | |
| tree | 7c0bd810af0d239f0513653eb29eba6e1a08f6a2 /docs/narr/renderers.rst | |
| parent | e99cd355140258b7cd4cd9c1a83fd3ada1eb2b04 (diff) | |
| parent | 47162533af84bb8d26db6d1c9ba1e63d70e9070f (diff) | |
| download | pyramid-b4c96d2892d8271b300b1920e3ce5d2c0eae588b.tar.gz pyramid-b4c96d2892d8271b300b1920e3ce5d2c0eae588b.tar.bz2 pyramid-b4c96d2892d8271b300b1920e3ce5d2c0eae588b.zip | |
Merge branch 'master' into feature/alchemy-scaffold-update
Conflicts:
docs/tutorials/wiki2/basiclayout.rst
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 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 |