I have changed the User Manual Text Tokens page to just Tokens and adjusted hopefully all the references to it, as well as the glossary.
I have not changed the contents of the Tokens page in the manual appreciably, because I have not yet got around to harmonising that with the Tokens page on the wiki-proper.