merge 3.3 (#20110)

12 years ago · 8ec15f7a92
1 changed files with 1 additions and 1 deletions
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@ -495,7 +495,7 @@ Callable types
      | :attr:`__annotations__` | A dict containing annotations | Writable  |
      |                         | of parameters.  The keys of   |           |
      |                         | the dict are the parameter    |           |
-      |                         | names, or ``'return'`` for    |           |
+      |                         | names, and ``'return'`` for   |           |
      |                         | the return annotation, if     |           |
      |                         | provided.                     |           |
      +-------------------------+-------------------------------+-----------+