Merge remote-tracking branch 'upstream/main' into guides-dir

srittau · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024 · a7458adbcf8eebacd4b1f6d7403f6828a089bb7d
commit a7458adbcf8eebacd4b1f6d7403f6828a089bb7d
diff --git a/docs/guides/annotations.rst b/docs/guides/annotations.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -2,14 +2,6 @@
 Static Typing with Python
 *************************
 
-.. Introduction
-.. ============
-..
-.. .. toctree::
-..    :maxdepth: 2
-..
-..    source/introduction
-
 Guides
 ======
 

diff --git a/docs/reference/index.rst b/docs/reference/index.rst
@@ -12,14 +12,3 @@ Type System Reference
    best_practices
    quality
    typing Module Documentation <https://docs.python.org/3/library/typing.html>
-
-.. The following pages are desired in a new TOC which will cover multiple
-.. topics. For now, they are not linked because the pages are empty.
-..
-..   basics
-..   type_system
-..   annotations
-..   inference
-..   type_compatibility
-..   dependencies
-..   faq
diff --git a/docs/source/basics.rst b/docs/source/basics.rst
diff --git a/docs/source/dependencies.rst b/docs/source/dependencies.rst
diff --git a/docs/source/faq.rst b/docs/source/faq.rst
diff --git a/docs/source/inference.rst b/docs/source/inference.rst
diff --git a/docs/source/introduction.rst b/docs/source/introduction.rst
diff --git a/docs/source/type_compatibility.rst b/docs/source/type_compatibility.rst
diff --git a/docs/source/type_system.rst b/docs/source/type_system.rst
diff --git a/docs/spec/glossary.rst b/docs/spec/glossary.rst
@@ -59,7 +59,7 @@ This section defines a few terms that may be used elsewhere in the specification
       :ref:`type-system-concepts`.
 
    gradual form
-      A gradual form is a :term:`type expression` which makes the type it is
+      A gradual form is an element of a :term:`type expression` which makes the type it is
       part of not a :term:`fully static type`, but rather a representation of a
       set of possible static types. See :ref:`type-system-concepts`. The
       primary gradual form is :ref:`Any`. The ellipsis (``...``) is a gradual