diff options
author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-12-25 22:59:46 (GMT) |
---|---|---|
committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-12-25 22:59:46 (GMT) |
commit | c475278a947f00d984a239d8caf33223a27ad650 (patch) | |
tree | 70d2094b8c07bc7867685c4fc31114cec50d2e69 /Doc/faq | |
parent | 4fbbf8c0a3c4b06853befc9f43e2fc5e80ccc197 (diff) | |
parent | 32bbc1c396561bcfae07345cc297dd98fd640d10 (diff) | |
download | cpython-c475278a947f00d984a239d8caf33223a27ad650.zip cpython-c475278a947f00d984a239d8caf33223a27ad650.tar.gz cpython-c475278a947f00d984a239d8caf33223a27ad650.tar.bz2 |
Merge from 3.3: 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 2d5d2b1..aac8e81 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? |