From 75f28186a995aa930f6db9f05ec7b63bbd2cd284 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 30 May 2006 03:30:14 +0000
Subject: Merge from 3.0 branch till 1103

---
 demos/blog/protected/Data/Options.xml  |  8 --------
 demos/blog/protected/Data/Settings.xml | 12 ++++++++++++
 2 files changed, 12 insertions(+), 8 deletions(-)
 delete mode 100644 demos/blog/protected/Data/Options.xml
 create mode 100644 demos/blog/protected/Data/Settings.xml

(limited to 'demos/blog/protected/Data')

diff --git a/demos/blog/protected/Data/Options.xml b/demos/blog/protected/Data/Options.xml
deleted file mode 100644
index 02e51a98..00000000
--- a/demos/blog/protected/Data/Options.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<parameters>
-	<parameter id="SiteTitle" value="Qiang's Blog" />
-	<parameter id="SiteSubtitle" value="A PRADO-driven weblog" />
-	<parameter id="SiteOwner" value="Qiang Xue" />
-	<parameter id="AdminEmail" value="admin@example.com" />
-</parameters>
\ No newline at end of file
diff --git a/demos/blog/protected/Data/Settings.xml b/demos/blog/protected/Data/Settings.xml
new file mode 100644
index 00000000..b097f22f
--- /dev/null
+++ b/demos/blog/protected/Data/Settings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<parameters>
+    <parameter id="SiteTitle" value="My Blog" />
+    <parameter id="SiteSubtitle" value="A Prado-driven weblog" />
+    <parameter id="SiteOwner" value="Prado User" />
+    <parameter id="AdminEmail" value="admin@example.com" />
+    <parameter id="MultipleUser" value="false" />
+    <parameter id="AccountApproval" value="false" />
+    <parameter id="PostPerPage" value="6" />
+    <parameter id="PostApproval" value="false" />
+    <parameter id="ThemeName" value="Winter" />
+</parameters>
\ No newline at end of file
-- 
cgit v1.2.3