diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-12-25 14:57:54 -0800 |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-12-25 14:57:54 -0800 |
| commit | 32bbc1c396561bcfae07345cc297dd98fd640d10 (patch) | |
| tree | 8d81638f9516a49603c8789d40e4f46b6354ea70 /Doc/faq | |
| parent | 41dc9f3cd15e5184700e2d0fc67b9fef9241c7df (diff) | |
| parent | b43099464a72ae36733cb1993771cc2b825df269 (diff) | |
| download | cpython-git-32bbc1c396561bcfae07345cc297dd98fd640d10.tar.gz | |
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/faq')
| -rw-r--r-- | Doc/faq/programming.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 2d5d2b123a..aac8e81652 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -313,6 +313,10 @@ calling another function by using ``*`` and ``**``:: g(x, *args, **kwargs) +.. index:: + single: argument; difference from parameter + single: parameter; difference from argument + .. _faq-argument-vs-parameter: What is the difference between arguments and parameters? |