Merge pull request #2405 from stevepiercy/1.5-branch

Steve Piercy

2016-03-08 862c05eb99a112742b2703684f93815f025a827d

Merge pull request #2405 from stevepiercy/1.5-branch

rewrite renderer glossary entry to read more easily

 docs/glossary.rst

@@ -553,12 +553,11 @@
     A popular `Javascript library <http://jquery.org>`_.

   renderer
     A serializer that can be referred to via :term:`view
     configuration` which converts a non-:term:`Response` return
     values from a :term:`view` into a string (and ultimately a
     response).  Using a renderer can make writing views that require
     templating or other serialization less tedious.  See
     :ref:`views_which_use_a_renderer` for more information.
     A serializer which converts non-:term:`Response` return values from a
     :term:`view` into a string, and ultimately into a response, usually
     through :term:`view configuration`. Using a renderer can make writing
     views that require templating or other serialization, like JSON, less
     tedious. See :ref:`views_which_use_a_renderer` for more information.

   renderer factory
     A factory which creates a :term:`renderer`.  See