diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt index e9d6de5d74b3..80c8acf80b9b 100644 --- a/docs/ref/contrib/postgres/aggregates.txt +++ b/docs/ref/contrib/postgres/aggregates.txt @@ -51,11 +51,10 @@ General-purpose aggregation functions Examples:: - "some_field" - "-some_field" from django.db.models import F - F("some_field").desc() + ArrayAgg("a_field", order_by="-some_field") + ArrayAgg("a_field", order_by=F("some_field").desc()) .. deprecated:: 5.2 diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt index d98fad2c6623..8a4e9be161b8 100644 --- a/docs/releases/1.10.txt +++ b/docs/releases/1.10.txt @@ -687,13 +687,13 @@ If you have an old Django project with MD5 or SHA1 (even salted) encoded passwords, be aware that these can be cracked fairly easily with today's hardware. To make Django users acknowledge continued use of weak hashers, the following hashers are removed from the default :setting:`PASSWORD_HASHERS` -setting:: +setting: - "django.contrib.auth.hashers.SHA1PasswordHasher" - "django.contrib.auth.hashers.MD5PasswordHasher" - "django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher" - "django.contrib.auth.hashers.UnsaltedMD5PasswordHasher" - "django.contrib.auth.hashers.CryptPasswordHasher" +* ``"django.contrib.auth.hashers.SHA1PasswordHasher"`` +* ``"django.contrib.auth.hashers.MD5PasswordHasher"`` +* ``"django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher"`` +* ``"django.contrib.auth.hashers.UnsaltedMD5PasswordHasher"`` +* ``"django.contrib.auth.hashers.CryptPasswordHasher"`` Consider using a :ref:`wrapped password hasher ` to strengthen the hashes in your database. If that's not feasible, add the