From aa2cb4c622dfd5709ba89ac3cace959202318987 Mon Sep 17 00:00:00 2001
From: Mads Jensen <mje@inducks.org>
Date: Sat, 12 Nov 2016 21:42:20 +0100
Subject: Refs #26327 -- Renamed JsonAgg to JSONBAgg.

Thanks to Christian von Roques for the report.
---
 docs/ref/contrib/postgres/aggregates.txt | 8 ++++----
 docs/releases/1.11.txt                   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs')

diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt
index 6b5e827ab2..3939023e26 100644
--- a/docs/ref/contrib/postgres/aggregates.txt
+++ b/docs/ref/contrib/postgres/aggregates.txt
@@ -58,14 +58,14 @@ General-purpose aggregation functions
     Returns ``True`` if at least one input value is true, ``None`` if all
     values are null or if there are no values, otherwise ``False``.
 
-``JsonAgg``
------------
+``JSONBAgg``
+------------
 
-.. class:: JsonAgg(expressions, **extra)
+.. class:: JSONBAgg(expressions, **extra)
 
     .. versionadded:: 1.11
 
-    Returns the input values as a ``JSON`` array.
+    Returns the input values as a ``JSON`` array. Requires PostgreSQL ≥ 9.5.
 
 ``StringAgg``
 -------------
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index 1b301078f1..486362fe43 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -183,7 +183,7 @@ Minor features
   operation allow using PostgreSQL's ``citext`` extension for case-insensitive
   lookups.
 
-* The new :class:`~django.contrib.postgres.aggregates.JsonAgg` allows
+* The new :class:`~django.contrib.postgres.aggregates.JSONBAgg` allows
   aggregating values as a JSON array.
 
 :mod:`django.contrib.redirects`
-- 
cgit v1.3