From 787aa3b1354a0611983fec04737ad63cedc28e59 Mon Sep 17 00:00:00 2001
From: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
Date: Sun, 4 Apr 2021 23:14:44 +0800
Subject: [PATCH] bpo-41370: Add note about ForwardRefs and PEP585 generic
 types in docs (GH-25183) (cherry picked from commit
 2b5913b4ee5852a28ca1509478f5582beb3aff7b)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
---
 Doc/library/typing.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index 688564f1d24f51..b136da00a070ad 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -1710,10 +1710,15 @@ Introspection helpers
 .. class:: ForwardRef
 
    A class used for internal typing representation of string forward references.
-   For example, ``list["SomeClass"]`` is implicitly transformed into
-   ``list[ForwardRef("SomeClass")]``.  This class should not be instantiated by
+   For example, ``List["SomeClass"]`` is implicitly transformed into
+   ``List[ForwardRef("SomeClass")]``.  This class should not be instantiated by
    a user, but may be used by introspection tools.
 
+   .. note::
+      :pep:`585` generic types such as ``list["SomeClass"]`` will not be
+      implicitly transformed into ``list[ForwardRef("SomeClass")]`` and thus
+      will not automatically resolve to ``list[SomeClass]``.
+
    .. versionadded:: 3.7.4
 
 Constant