merge from 3.0 branch till 1451.

2 files changed, 4 insertions, 4 deletions

diff --git a/demos/quickstart/protected/pages/Advanced/Error.page b/demos/quickstart/protected/pages/Advanced/Error.page
index a0765c10..9d2cf9ec 100644
--- a/demos/quickstart/protected/pages/Advanced/Error.page
+++ b/demos/quickstart/protected/pages/Advanced/Error.page
@@ -70,8 +70,8 @@ The naming convention for the template files used for all other exceptions is as
 <p>

 Again, if the preferred language is not found, PRADO will try to use <tt>exception.html</tt>, instead.

 </p>

-<p>

-CAUTION: When saving a template file, please make sure the file is saved using UTF-8 encoding. On Windows, you may use <tt>Notepad.exe</tt> to accomplish such saving.

-</p>

+<div class="note">

+<b class="tip">CAUTION:</b> When saving a template file, please make sure the file is saved using UTF-8 encoding. On Windows, you may use <tt>Notepad.exe</tt> to accomplish such saving.

+</div>

 

 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Advanced/MasterContent.page b/demos/quickstart/protected/pages/Advanced/MasterContent.page
index b7bcc9bb..b0836393 100644
--- a/demos/quickstart/protected/pages/Advanced/MasterContent.page
+++ b/demos/quickstart/protected/pages/Advanced/MasterContent.page
@@ -40,7 +40,7 @@ Then, the contents are inserted into the master control according to the followi
 <img src=<%~ mastercontent.gif %> alt="Master and Content" />

 <img src=<%~ pcrelation.gif %> alt="Parent-child relationship between master and content" />

 

-<h2>Master vs. External Template</h2>

+<h2 id="6301">Master vs. External Template</h2>

 <p>

 Master is very similar to external templates which are introduced since version 3.0.5. A special <a href="?page=Configurations.Templates1">include tag</a> is used to include an external template file into a base template.

 </p>