summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authornessita <124304+nessita@users.noreply.github.com>2025-01-30 10:37:14 -0300
committerNatalia <124304+nessita@users.noreply.github.com>2025-01-30 10:39:08 -0300
commit4f0169e94f6d3afd991f386567330a5497757262 (patch)
tree14c63e1bfd9735993e0c73fcd489daf3349da13e /docs
parent9d1945df8fe8bec6cec8d6e4c69216655262d985 (diff)
[5.1.x] Tweaked docs to avoid reformatting given new black version.
Backport of fd3cfd80bebad292d639a03e58632e494369eb92 from main.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/postgres/aggregates.txt5
-rw-r--r--docs/releases/1.10.txt12
2 files changed, 8 insertions, 9 deletions
diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt
index 2675a90af2..edaf032ffa 100644
--- a/docs/ref/contrib/postgres/aggregates.txt
+++ b/docs/ref/contrib/postgres/aggregates.txt
@@ -49,11 +49,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())
.. versionchanged:: 5.0
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index d98fad2c66..8a4e9be161 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 <wrapping-password-hashers>` to
strengthen the hashes in your database. If that's not feasible, add the