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).