merge from 3.0 branch till 1451.

2 files changed, 4 insertions, 4 deletions

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample3.page b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample3.page
index 5fb19c6f..28b6288e 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample3.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample3.page
@@ -53,9 +53,9 @@
 	<com:TDropDownListColumn 

 		ID="RatingColumn"

 		HeaderText="Rating"

-		DataField="rating"

+		DataTextField="rating"

 		>

-		<prop:DataFormatString><img src="images/star%s.gif" alt="" /></prop:DataFormatString>

+		<prop:DataTextFormatString><img src="images/star%s.gif" alt="" /></prop:DataTextFormatString>

 		<com:TListItem Value="1" />

 		<com:TListItem Value="2" />

 		<com:TListItem Value="3" />

diff --git a/demos/quickstart/protected/pages/Controls/Validation.page b/demos/quickstart/protected/pages/Controls/Validation.page
index 119749db..2405fb45 100644
--- a/demos/quickstart/protected/pages/Controls/Validation.page
+++ b/demos/quickstart/protected/pages/Controls/Validation.page
@@ -151,7 +151,7 @@ The summary can be displayed as a list, a bulleted list, or a single paragraph b
 </p>

 <com:RunBar PagePath="Controls.Samples.TValidationSummary.Home" />

 

-<h2>Client and Server Side Conditional Validation</h2>

+<h2 id="5301">Client and Server Side Conditional Validation</h2>

 <p>

 	All validators contains the following events.

 	<ul>

@@ -180,7 +180,7 @@ function onErrorHandler(sender, parameter)
 Where <tt>sender</tt> is the current client-side validator and <tt>parameter</tt>

 is the control that invoked the validator.

 </p>

-<h3>Conditional Validation Example</h3>

+<h3 id="5302">Conditional Validation Example</h3>

 <p>

 The following example show the use of client-side and server side validator events. The example

 demonstrates conditional validation.