From 99ab4bd124df9cd69f990a2deba2bcfa9905851e Mon Sep 17 00:00:00 2001 From: SnippyCodes Date: Sat, 18 Jul 2026 09:34:57 +0530 Subject: [PATCH 1/2] Refs #37217 -- Updated version references to 6.2 in contributing docs. --- docs/intro/contributing.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt index b4d81584f4f0..74002c7554a8 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -411,13 +411,13 @@ file: .. function:: make_toast() - .. versionadded:: 2.2 + .. versionadded:: 6.2 Returns ``'toast'``. Since this new feature will be in an upcoming release it is also added to the release notes for the next version of Django. Open the release notes for the -latest version in ``docs/releases/``, which at time of writing is ``2.2.txt``. +latest version in ``docs/releases/``, which at time of writing is ``6.2.txt``. Add a note under the "Minor Features" header: .. code-block:: rst @@ -467,11 +467,11 @@ Use the arrow keys to move up and down. + +def make_toast(): + return 'toast' - diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt + diff --git a/docs/releases/6.2.txt b/docs/releases/6.2.txt index 7d85d30c4a..81518187b3 100644 - --- a/docs/releases/2.2.txt - +++ b/docs/releases/2.2.txt - @@ -40,6 +40,11 @@ database constraints. Constraints are added to models using the + --- a/docs/releases/6.2.txt + +++ b/docs/releases/6.2.txt + @@ -34,6 +34,11 @@ Minor features -------------- @@ -497,7 +497,7 @@ Use the arrow keys to move up and down. + +.. function:: make_toast() + - +.. versionadded:: 2.2 + +.. versionadded:: 6.2 + +Returns ``'toast'``. diff --git a/tests/shortcuts/test_make_toast.py b/tests/shortcuts/test_make_toast.py From 957d0cee7167757ae221ffde59d2cf0a322e89c7 Mon Sep 17 00:00:00 2001 From: Natalia <124304+nessita@users.noreply.github.com> Date: Fri, 24 Jul 2026 12:40:28 -0300 Subject: [PATCH 2/2] Removed outdated Python 2 references from contributing docs. --- docs/internals/contributing/writing-code/coding-style.txt | 2 +- docs/intro/contributing.txt | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt index a792e137aa53..b418d91b8ef5 100644 --- a/docs/internals/contributing/writing-code/coding-style.txt +++ b/docs/internals/contributing/writing-code/coding-style.txt @@ -170,7 +170,7 @@ Imports :caption: ``django/contrib/admin/example.py`` # future - from __future__ import unicode_literals + from __future__ import annotations # standard library import json diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt index 74002c7554a8..f2714fed6e82 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -71,12 +71,6 @@ It contains lots of great information and is a must-read for anyone who'd like to become a regular contributor to Django. If you've got questions, it's probably got the answers. -.. admonition:: Python 3 required! - - The current version of Django doesn't support Python 2.7. Get Python 3 at - `Python's download page `_ or with your - operating system's package manager. - .. admonition:: For Windows users See :ref:`install_python_windows` on Windows docs for additional guidance.