Update <template> article with changes. Fixes #850