diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-01-02 22:48:24 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-01-02 22:48:24 (GMT) |
| commit | 8ec15f7a924ad65e2fbda7bbb86f90c56ea633ea (patch) | |
| tree | 893ee682e9827a99c88553543cf9b1f130176a21 /Doc | |
| parent | 9025f1c5c4435da265cbe1524d803d04d9f2c4d2 (diff) | |
| parent | 002033ed6396ef9062a925b34c889ccd6b16c1ec (diff) | |
| download | cpython-8ec15f7a924ad65e2fbda7bbb86f90c56ea633ea.zip cpython-8ec15f7a924ad65e2fbda7bbb86f90c56ea633ea.tar.gz cpython-8ec15f7a924ad65e2fbda7bbb86f90c56ea633ea.tar.bz2 | |
merge 3.3 (#20110)
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/reference/datamodel.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index c09a578..26d93a6 100644 --- 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. | | +-------------------------+-------------------------------+-----------+ |