Merge remote-tracking branch 'upstream/main'

docs/howto/custom-model-fields.txt

@@ -431,9 +431,7 @@ Django when the framework constructs the ``CREATE TABLE`` statements for your
 application -- that is, when you first create your tables. The methods are also
 called when constructing a ``WHERE`` clause that includes the model field --
 that is, when you retrieve data using QuerySet methods like ``get()``,
-``filter()``, and ``exclude()`` and have the model field as an argument. They
-are not called at any other time, so it can afford to execute slightly complex
-code, such as the ``connection.settings_dict`` check in the above example.
+``filter()``, and ``exclude()`` and have the model field as an argument.
 
 Some database column types accept parameters, such as ``CHAR(25)``, where the
 parameter ``25`` represents the maximum column length. In cases like these,

docs/ref/contrib/admin/index.txt

@@ -2803,7 +2803,7 @@ template override to your project:
 
     {% block extrastyle %}{{ block.super }}
     <style>
-    :root {
+    html[data-theme="light"], :root {
       --primary: #9774d5;
       --secondary: #785cab;
       --link-fg: #7c449b;