diff --git a/core/data/System/SkinTemplates.txt b/core/data/System/SkinTemplates.txt
index 6dd8b88e33..3e53355578 100644
--- a/core/data/System/SkinTemplates.txt
+++ b/core/data/System/SkinTemplates.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1490476899" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1506603718" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Skins"}%
 %STARTINCLUDE%
 ---+ Skin Templates
@@ -159,19 +159,20 @@ and then =* Set SKIN=crumbless,pattern=
 Remember: the template path contains the most specific template first.
 
 ---+++ Comments
-Comments delimited by =#{...}#= are removed from the templates as soon as
+Comments delimited by =%<nop>{...}%= are removed from the templates as soon as
 the file is read, before any other template macros are evaluated. 
 
-An alternative comment type =#{...}#= will automatically absorb whitespace
+An alternative comment type =#<nop>{...}#= will automatically absorb whitespace
 either side of the comment (newlines, spaces, tabs etc). This type of comment
 only works in templates.
 
-The alternative comment type becomes really useful when we have skin templates defined in topics, because we can now use it to delimit content that should be _displayed when the topic is viewed normally_, but _removed when the templates are instantiated_.
+The alternative comment type becomes really useful when we have skin templates defined in topics,
+because we can now use it to delimit content that should be _displayed when the topic is viewed normally_, but _removed when the templates are instantiated_.
 
 or example, we might have templates in a topic like this:
 <verbatim class="tml">
 %TMPL:DEF{"example"}%
-#{ This comment will always be removed }%
+#{ This comment will always be removed }#
 %{ This comment will be removed when the template is instantiated }%
 Example
 %TMPL:END%
@@ -179,11 +180,13 @@ Example
 
 When we view the topic, we'll see:
 
+<pre>
 %<nop>TMPL:DEF{"example"}%
-#{ This comment will always be removed }%
+#{ This comment will always be removed }#
 %{ This comment will be removed when the template is instantiated }%
 Example
 %<nop>TMPL:END%
+</pre>
 but all comments will be removed when the template is actually used.
 
 #FindingTemplates
@@ -375,12 +378,12 @@ see what PatternSkin defines.
 
 %STOPINCLUDE%
 
-%META:FILEATTACHMENT{name="oopsmore_diff_debug.gif" attr="h" comment="" date="1490476899" size="3205" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="default.css.gz" attr="h" comment="" date="1490476899" size="2072" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="base.css.gz" attr="h" comment="" date="1490476899" size="1331" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="oopsmore_diff_sidebyside.gif" attr="h" comment="" date="1490476899" size="1994" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="base_src.css" attr="h" comment="" date="1490476899" size="6780" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="base.css" attr="h" comment="" date="1490476899" size="5196" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="oopsmore_diff_sequential.gif" attr="h" comment="" date="1490476899" size="3464" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="default_src.css" attr="h" comment="" date="1490476899" size="11093" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="default.css" attr="h" comment="" date="1490476899" size="8209" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="oopsmore_diff_debug.gif" attr="h" comment="" date="1506603718" size="3205" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="default.css.gz" attr="h" comment="" date="1506603718" size="2072" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="base.css.gz" attr="h" comment="" date="1506603718" size="1331" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="oopsmore_diff_sidebyside.gif" attr="h" comment="" date="1506603718" size="1994" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="base_src.css" attr="h" comment="" date="1506603718" size="6780" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="base.css" attr="h" comment="" date="1506603718" size="5196" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="oopsmore_diff_sequential.gif" attr="h" comment="" date="1506603718" size="3464" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="default_src.css" attr="h" comment="" date="1506603718" size="11093" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="default.css" attr="h" comment="" date="1506603718" size="8209" user="ProjectContributor" version="1"}%