merge from 3.0 branch till 995.

1 files changed, 5 insertions, 2 deletions

diff --git a/demos/quickstart/protected/pages/Configurations/Templates1.page b/demos/quickstart/protected/pages/Configurations/Templates1.page
index 39b2d75f..483ef1d1 100644
--- a/demos/quickstart/protected/pages/Configurations/Templates1.page
+++ b/demos/quickstart/protected/pages/Configurations/Templates1.page
@@ -71,15 +71,18 @@ Template control tag is optional in a template. Each template can contain at mos
 <h2>Comment Tags</h2>

 <p>

 Comment tags are used to put comments in the template or the ultimate rendering result. There are two types of comment tags. One is like that in HTML and will be displayed to the end-users. The other only appear in a template and will be stripped out when the template is instantiated and displayed to the end-users. The format of these two comment tags is as follows,

+</p>

 <com:TTextHighlighter Language="prado" CssClass="source">

 &lt;!--

 Comments VISIBLE to end-users

 --&gt;

 

-&lt;!

+&lt;!--

 Comments INVISIBLE to end-users

-!&gt;

+--!&gt;

 </com:TTextHighlighter>

+<p>

+Note, template comments (by &lt;!-- ... --!&gt;) cannot appear in a property value.

 </p>

 

 </com:TContent>
\ No newline at end of file