From c3434f65bd4858d94d570345c1f49773597a860b Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Mon, 30 Oct 2023 12:47:37 +0200
Subject: [PATCH] Update changelog

---
 README.rst         |  2 +-
 docs/changelog.rst | 30 ++++++++++++++++++++++++++----
 docs/faq.rst       |  9 +++++++++
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 58dce26d..2283ec7d 100644
--- a/README.rst
+++ b/README.rst
@@ -32,7 +32,7 @@ pytest-django allows you to test your Django project/applications with the
   <https://pytest-django.readthedocs.io/en/latest/contributing.html>`_
 * Version compatibility:
 
-  * Django: 3.2, 4.0, 4.1, 4.2 and latest main branch (compatible at the time of
+  * Django: 3.2, 4.1, 4.2 and latest main branch (compatible at the time of
     each release)
   * Python: CPython>=3.8 or PyPy 3
   * pytest: >=7.0
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c32768e7..65b858cb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,18 +4,40 @@ Changelog
 Pending
 -------
 
-Improvements
-^^^^^^^^^^^^
+Compatibility
+^^^^^^^^^^^^^
 
 * Official Django 4.1 & 4.2 support.
 
 * Official Python 3.11 support.
 
-* Drop support for Python version 3.6.
+* Drop support for Python version 3.5, 3.6 & 3.7.
 
 * Drop official support for Django 4.0.
 
-* Add precise `pytest_django.asserts.assertQuerySetEqual` typing.
+* Drop support for pytest < 7.
+
+Improvements
+^^^^^^^^^^^^
+
+* Add support for setting :py:attr:`available_apps
+  <django.test.TransactionTestCase.available_apps>` in the :func:`django_db
+  <pytest.mark.django_db>` marker.
+
+* Convert Django :ref:`test tags <django:topics-tagging-tests>` to :ref:`Pytest
+  markers <pytest:mark examples>`.
+
+* Show Django's version in the pytest ``django`` report header.
+
+* Add precise ``pytest_django.asserts.assertQuerySetEqual`` typing.
+
+Bugfixes
+^^^^^^^^
+
+* Fix bug where the effect of :func:`@pytest.mark.ignore_template_errors
+  <pytest.mark.ignore_template_errors>` was not reset when using
+  ``--fail-on-template-vars``.
+
 
 v4.5.2 (2021-12-07)
 -------------------
diff --git a/docs/faq.rst b/docs/faq.rst
index 0c292ced..3489ce05 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -13,6 +13,15 @@ If this for some reason fails for you, you have to manage your Python paths
 explicitly. See the documentation on :ref:`managing_the_python_path_explicitly`
 for more information.
 
+.. _faq-test-tags:
+
+Are Django test tags supported?
+-------------------------------
+
+Yes, Django :ref:`test tagging <django:topics-tagging-tests>` is supported.
+The Django test tags are automatically converted to :ref:`Pytest markers
+<pytest:mark examples>`.
+
 How can I make sure that all my tests run with a specific locale?
 -----------------------------------------------------------------