Merge from 3.2: link to mapping glossary entry in docs.