Merge change 6221 into donut

* changes:
  Remove links to wikipedia; fix typo; remove .vsd file (bug 1918247).