summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authornessita <124304+nessita@users.noreply.github.com>2025-01-30 10:37:14 -0300
committerGitHub <noreply@github.com>2025-01-30 10:37:14 -0300
commitfd3cfd80bebad292d639a03e58632e494369eb92 (patch)
tree11164a41c5f36a56fd9ed73e6eb7592e1280d09e /docs
parentcbb0812683cf3236e4a4003bf7f74b119d3cde0c (diff)
Tweaked docs to avoid reformatting given new black version.
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 e9d6de5d74..80c8acf80b 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 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