From 1c32172efb18e8d08ea483e2460813670ebfe1a5 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 30 Sep 2006 18:40:40 +0000
Subject: merge from 3.0 branch till 1451.
---
demos/quickstart/protected/pages/Advanced/Error.page | 6 +++---
demos/quickstart/protected/pages/Advanced/MasterContent.page | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'demos/quickstart/protected/pages/Advanced')
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
Again, if the preferred language is not found, PRADO will try to use exception.html, instead.
-
-CAUTION: When saving a template file, please make sure the file is saved using UTF-8 encoding. On Windows, you may use Notepad.exe to accomplish such saving.
-
+
+CAUTION: When saving a template file, please make sure the file is saved using UTF-8 encoding. On Windows, you may use Notepad.exe to accomplish such saving.
+
\ 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
alt="Master and Content" />
alt="Parent-child relationship between master and content" />
-Master vs. External Template
+Master vs. External Template
Master is very similar to external templates which are introduced since version 3.0.5. A special include tag is used to include an external template file into a base template.
--
cgit v1.2.3