Fixes #2899: added more details about canonical URLs to the guide
Fixes #2621: improved theming docs with better wording and module example