diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-12-25 22:57:54 (GMT) |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-12-25 22:57:54 (GMT) |
| commit | 32bbc1c396561bcfae07345cc297dd98fd640d10 (patch) | |
| tree | 8d81638f9516a49603c8789d40e4f46b6354ea70 /Doc/glossary.rst | |
| parent | 41dc9f3cd15e5184700e2d0fc67b9fef9241c7df (diff) | |
| parent | b43099464a72ae36733cb1993771cc2b825df269 (diff) | |
| download | cpython-32bbc1c396561bcfae07345cc297dd98fd640d10.zip cpython-32bbc1c396561bcfae07345cc297dd98fd640d10.tar.gz cpython-32bbc1c396561bcfae07345cc297dd98fd640d10.tar.bz2 | |
Merge from 3.2: add links and index entries for "argument" and "parameter."
This adds to the work done for issue #15990 (i.e. f44b8d69e5fc and the
commits referenced there).
Diffstat (limited to 'Doc/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 59075d5..a1f962e 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -240,8 +240,9 @@ Glossary function A series of statements which returns some value to a caller. It can also - be passed zero or more arguments which may be used in the execution of - the body. See also :term:`argument` and :term:`method`. + be passed zero or more :term:`arguments <argument>` which may be used in + the execution of the body. See also :term:`parameter`, :term:`method`, + and the :ref:`function` section. __future__ A pseudo-module which programmers can use to enable new language features |