diff --git a/IPython/core/display.py b/IPython/core/display.py
index 0ed70ec..75ca479 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -186,6 +186,8 @@ def display_latex(*objs, **kwargs):
 
 def display_json(*objs, **kwargs):
     """Display the JSON representation of an object.
+    
+    Note that not many frontends support displaying JSON.
 
     Parameters
     ----------
diff --git a/docs/source/config/integrating.txt b/docs/source/config/integrating.txt
index 0665da3..c2c4b58 100644
--- a/docs/source/config/integrating.txt
+++ b/docs/source/config/integrating.txt
@@ -20,7 +20,7 @@ these are surrounded by single, not double underscores.
 
 Both the notebook and the Qt console can display ``svg``, ``png`` and ``jpeg``
 representations. The notebook can also display ``html``, ``javascript``,
-``json`` and ``latex``. If the methods don't exist, or return ``None``, it falls
+and ``latex``. If the methods don't exist, or return ``None``, it falls
 back to a standard ``repr()``.
 
 For example::