merge from 3.0 branch till 1387

2 files changed, 2 insertions, 2 deletions

diff --git a/demos/quickstart/protected/pages/Controls/Pager.page b/demos/quickstart/protected/pages/Controls/Pager.page
index 821eab71..20b33b95 100644
--- a/demos/quickstart/protected/pages/Controls/Pager.page
+++ b/demos/quickstart/protected/pages/Controls/Pager.page
@@ -17,7 +17,7 @@ Note, the target data-bound control must have its <tt>AllowPaging</tt> set to tr
 <ul>

 <li><tt>NextPrev</tt> - a next page and a previous page button are rendered on each page.</li>

 <li><tt>Numeric</tt> - a list of page index buttons are rendered.</li>

-<li><tt>List</tt> - a dropdown list of page indices is rendered.</li>

+<li><tt>DropDownList</tt> - a dropdown list of page indices is rendered.</li>

 </ul>

 <p>

 These user interfaces may be further customized by configuring the following properties

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TPager/Sample1.page b/demos/quickstart/protected/pages/Controls/Samples/TPager/Sample1.page
index 0d61f580..fc0783f5 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TPager/Sample1.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TPager/Sample1.page
@@ -70,7 +70,7 @@ Total <%# $this->Parent->PageCount %> pages.
 Choose page:

 <com:TPager ID="Pager3" 

 	ControlToPaginate="DataList" 

-	Mode="List"

+	Mode="DropDownList"

 	OnPageIndexChanged="pageChanged"

 	/>