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