Merge remote-tracking branch 'upstream/main'

Author: dan-mm

docs/faq/general.txt

@@ -218,3 +218,14 @@ If you need a publication date, use the year of release of the version you're
 referencing (e.g., 2013 for v1.5)
 
 .. _APA style: https://apastyle.apa.org/
+
+Where can I find more Django resources?
+=======================================
+
+The Steering Council maintains a collection of Django third-party packages,
+organizations and resources at
+https://www.djangoproject.com/community/ecosystem/.
+
+That page will be updated to contain links to various Django content such as
+podcasts, videos, conferences, blogs, books, and learning resources. It also
+features popular, robust, community-maintained packages.

docs/internals/contributing/index.txt

@@ -110,7 +110,9 @@ encounter or assist in triaging existing tickets to ensure a smooth development
 workflow.
 
 Django also has a :ref:`process for suggesting ideas <requesting-features>`
-where you can join the community in discussing ideas for new features.
+where you can join the community in discussing ideas for new features. Beyond
+the Django codebase, there's a `vibrant ecosystem`_ that is maintained by the
+community that you can contribute to.
 
 Explore the ways you can make a difference below, and join us in making Django
 better for everyone.
@@ -122,5 +124,6 @@ better for everyone.
    triaging-tickets
 
 .. _ticket tracker: https://code.djangoproject.com/
+.. _vibrant ecosystem: https://www.djangoproject.com/community/ecosystem/
 
 We're looking forward to working with you. Welcome aboard!

docs/intro/whatsnext.txt

@@ -11,7 +11,9 @@ So what's next?
 
 Well, we've always been big fans of learning by doing. At this point you should
 know enough to start a project of your own and start fooling around. As you need
-to learn new tricks, come back to the documentation.
+to learn new tricks, come back to the documentation. There's also a bigger
+`Django ecosystem`_ out there for you to explore that the community has
+created.
 
 We've put a lot of effort into making Django's documentation useful, clear and
 as complete as possible. The rest of this document explains more about how the
@@ -20,6 +22,8 @@ documentation works so that you can get the most out of it.
 (Yes, this is documentation about documentation. Rest assured we have no plans
 to write a document about how to read the document about documentation.)
 
+.. _Django ecosystem: https://www.djangoproject.com/community/ecosystem/
+
 Finding documentation
 =====================
 

docs/ref/utils.txt

@@ -741,7 +741,7 @@ escaping HTML.
     is anything contained within ``<>``.
 
     Absolutely NO guarantee is provided about the resulting string being
-    HTML safe. So NEVER mark safe the result of a ``strip_tag`` call without
+    HTML safe. So NEVER mark safe the result of a ``strip_tags`` call without
     escaping it first, for example with :func:`~django.utils.html.escape`.
 
     For example::

tests/backends/base/test_base.py

@@ -9,6 +9,7 @@
     TransactionTestCase,
     skipUnlessDBFeature,
 )
+from django.test.runner import DebugSQLTextTestResult
 from django.test.utils import CaptureQueriesContext, override_settings
 
 from ..models import Person, Square
@@ -134,6 +135,8 @@ def test_rollback_debug_log(self):
                 )
 
     def test_no_logs_without_debug(self):
+        if isinstance(self._outcome.result, DebugSQLTextTestResult):
+            self.skipTest("--debug-sql interferes with this test")
         with self.assertNoLogs("django.db.backends", "DEBUG"):
             with self.assertRaises(Exception), transaction.atomic():
                 Person.objects.create(first_name="first", last_name="last")