Fix a confusing typo in the Template user guide. Fixes #543
Merge branch 'live-docs' into dev-master