Merge pull request #2231 from asilversempirical/patch-1

Update out of date jsonify documentation

flask/json.py

@@ -236,11 +236,10 @@ def jsonify(*args, **kwargs):
        Added support for serializing top-level arrays. This introduces a
        security risk in ancient browsers. See :ref:`json-security` for details.
 
-    This function's response will be pretty printed if it was not requested
+    This function's response will be pretty printed if the
-    with ``X-Requested-With: XMLHttpRequest`` to simplify debugging unless
+    ``JSONIFY_PRETTYPRINT_REGULAR`` config parameter is set to True or the
-    the ``JSONIFY_PRETTYPRINT_REGULAR`` config parameter is set to false.
+    Flask app is running in debug mode. Compressed (not pretty) formatting
-    Compressed (not pretty) formatting currently means no indents and no
+    currently means no indents and no spaces after separators.
-    spaces after separators.
 
     .. versionadded:: 0.2
     """