Merge pull request #3390 from jim-parry/userguide/fix-metadata

[ci skip] User Guide - consolidate table & field metadata pages