[Bug 691780] New: Apply proposed Trademark Guidelines changes to the wiki page