Merge from 3.0 branch till 1264.

11 files changed, 55 insertions, 55 deletions

diff --git a/demos/quickstart/protected/pages/Controls/ClientScript.page b/demos/quickstart/protected/pages/Controls/ClientScript.page
index 5dab41d5..d5687fb1 100644
--- a/demos/quickstart/protected/pages/Controls/ClientScript.page
+++ b/demos/quickstart/protected/pages/Controls/ClientScript.page
@@ -1,23 +1,23 @@
 <com:TContent ID="body" >
 
-<h1>TClientScript</h1>
+<h1 id="2201">TClientScript</h1>
 <com:DocLink ClassPath="System.Web.UI.WebControls.TClientScript" />
-<h2>Including Bundled Javascript Libraries in Prado</h2>
+<h2 id="2202">Including Bundled Javascript Libraries in Prado</h2>
 <p>
-<tt>TClientScript</tt> allows javascript code to be insert or linked to the 
-page template. Prado is bundled with a large library of javascript functionality
-including effects, AJAX, basic event handlers, and many others. The bundled 
-javascript libraries can be linked to the current page template using the 
-<tt>UsingPradoScripts</tt> property. Multiple bundled javascript libraries
-can be specified using comma delimited string of the name of javascript library 
+<tt>TClientScript</tt> allows Javascript code to be insert or linked to the
+page template. PRADO is bundled with a large library of Javascript functionality
+including effects, AJAX, basic event handlers, and many others. The bundled
+Javascript libraries can be linked to the current page template using the
+<tt>PradoScripts</tt> property. Multiple bundled Javascript libraries
+can be specified using comma delimited string of the name of Javascript library
 to include on the page. For following example will include the "ajax" and "effects" library.
 </p>
 <com:TTextHighlighter Language="prado" CssClass="source">
-&lt;com:TClientScript UsingPradoScripts="ajax, effects" /&gt;
+&lt;com:TClientScript PradoScripts="ajax, effects" /&gt;
 </com:TTextHighlighter>
 
 <p>
-	The available bundled libraries included in Prado are 
+	The available bundled libraries included in Prado are
 	<ul>
 	    <li><tt>prado</tt> : basic prado javascript framework based on Prototype</li>
 	    <li><tt>effects</tt> : visual effects from script.aculo.us</li>
@@ -29,12 +29,12 @@ to include on the page. For following example will include the "ajax" and "effec
 	    <li><tt>colorpicker</tt> : colorpicker</li>
 	</ul>
 </p>
-<p>The dependencies for each library are automatically resolved. That is, 
+<p>The dependencies for each library are automatically resolved. That is,
 	specifying, say the "ajax", will also include the "prado" library.</p>
-	
-<h2>Including Custom Javascript Files</h2>
-<p>Custom javascript files can be register using the <tt>ScriptUrl</tt> property.
-The following example includes the javascript file "test.js" to the page. In this case, the file
+
+<h2 id="2203">Including Custom Javascript Files</h2>
+<p>Custom Javascript files can be register using the <tt>ScriptUrl</tt> property.
+The following example includes the Javascript file "test.js" to the page. In this case, the file
 "test.js" is relative the current template you are using. Since the property value is
 <a href="?page=Configurations.Templates3">dynamic asset tag</a>, the file "test.js" will be published
 automatically, that is, the file will be copied to the assets directory if necessary.
@@ -42,11 +42,11 @@ automatically, that is, the file will be copied to the assets directory if neces
 <com:TTextHighlighter Language="prado" CssClass="source">
 &lt;com:TClientScript ScriptUrl=&lt;%~ test.js %&gt; /&gt;
 </com:TTextHighlighter>
-<p>You can include javascript files from other servers by specifying the full URL string in
+<p>You can include Javascript files from other servers by specifying the full URL string in
 	the <tt>ScriptUrl</tt> property.</p>
 
-<h2>Including Custom Javascript Code Blocks</h2>
+<h2 id="2204">Including Custom Javascript Code Blocks</h2>
 <p> Any content within the <tt>TClientScript</tt> control tag will be considered as
-	javascript code and will be rendered where it is declared.</p>
+	Javascript code and will be rendered where it is declared.</p>
 
 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/DataGrid.page b/demos/quickstart/protected/pages/Controls/DataGrid.page
index ed1ad32b..392b78ab 100644
--- a/demos/quickstart/protected/pages/Controls/DataGrid.page
+++ b/demos/quickstart/protected/pages/Controls/DataGrid.page
@@ -6,15 +6,15 @@
 TDatagrid is an important control in building complex Web applications. It displays data in a tabular format with rows (also called items) and columns. A row is composed by cells, while columns govern how cells should be displayed according to their association with the columns. Data specified via <tt>DataSource</tt> or <tt>DataSourceID</tt> are bound to the rows and feed contents to cells.

 </p>

 <p>

-TDataGrid is highly interactive. Users can sort the data along specified columns, navigate through different pages of the data, and perform actions, such as editting and deleting, on rows of the data.

+TDataGrid is highly interactive. Users can sort the data along specified columns, navigate through different pages of the data, and perform actions, such as editing and deleting, on rows of the data.

 </p>

 <p>

-Rows of TDataGrid can be accessed via its <tt>Items</tt> property. A row (item) can be in one of several modes: browsing, editting and selecting, which affects how cells in the row are displayed. To change an item's mode, modify <tt>EditItemIndex</tt> or <tt>SelectedItemIndex</tt>. Note, if an item is in edit mode, then selecting this item will have no effect.

+Rows of TDataGrid can be accessed via its <tt>Items</tt> property. A row (item) can be in one of several modes: browsing, editing and selecting, which affects how cells in the row are displayed. To change an item's mode, modify <tt>EditItemIndex</tt> or <tt>SelectedItemIndex</tt>. Note, if an item is in edit mode, then selecting this item will have no effect.

 </p>

 

 <h2 id="5202">Columns</h2>

 <p>

-Columns of a data grid determine how the associated cells are displayed. For example, cells associated with a <tt>TBoundColumn</tt> are displayed differently according to their modes. A cell is displayed as a static text if the cell is in browsing mode, a text box if it is in editting mode, and so on.

+Columns of a data grid determine how the associated cells are displayed. For example, cells associated with a <tt>TBoundColumn</tt> are displayed differently according to their modes. A cell is displayed as a static text if the cell is in browsing mode, a text box if it is in editing mode, and so on.

 </p>

 <p>

 PRADO provides five types of columns:

@@ -103,7 +103,7 @@ The following example uses manually specified columns to show a list of book inf
   <li>Publisher - displayed as a piece of text using <tt>TBoundColumn</tt>.</li>

   <li>Price - displayed as a piece of text using <tt>TBoundColumn</tt> with output formatting string and customized styles.</li>

   <li>In-stock or not - displayed as a checkbox using <tt>TCheckBoxColumn</tt>.</li>

-  <li>Rating - displayed as an image using <tt>TTemplateColumn</tt> which allows maximum freedom in specifiying cell contents.</li>

+  <li>Rating - displayed as an image using <tt>TTemplateColumn</tt> which allows maximum freedom in specifying cell contents.</li>

 </ul>

 <p>Pay attention to how item (row) styles and column styles cooperate together to affect the appearance of the cells in the datagrid.</p>

 <com:RunBar PagePath="Controls.Samples.TDataGrid.Sample2" />

@@ -111,7 +111,7 @@ The following example uses manually specified columns to show a list of book inf
 

 <h2 id="5206">Interacting with TDataGrid</h2>

 <p>

-Besides the rich data presentation functionalities as demonstrated in previous section, TDataGrid is also highly user interactive. An import usage of TDataGrid is editting or deleting rows of data. The <tt>TBoundColumn</tt> can adjust the associated cell presentation according to the mode of datagrid items. When an item is in browsing mode, the cell is displayed with a static text; when the item is in editting mode, a textbox is displayed to collect user inputs. TDataGrid provides <tt>TEditCommandColumn</tt> for switching item modes. In addition, <tt>TButtonColumn</tt> offers developers the flexibility of creating arbitrary buttons for various user interactions.

+Besides the rich data presentation functionalities as demonstrated in previous section, TDataGrid is also highly user interactive. An import usage of TDataGrid is editing or deleting rows of data. The <tt>TBoundColumn</tt> can adjust the associated cell presentation according to the mode of datagrid items. When an item is in browsing mode, the cell is displayed with a static text; when the item is in editing mode, a textbox is displayed to collect user inputs. TDataGrid provides <tt>TEditCommandColumn</tt> for switching item modes. In addition, <tt>TButtonColumn</tt> offers developers the flexibility of creating arbitrary buttons for various user interactions.

 </p>

 <p>

 The following example shows how to make the previous book information table an interactive one. It allows users to edit and delete book items from the table. Two additional columns are used in the example to allow users interact with the datagrid: <tt>TEditCommandColumn</tt> and <tt>TButtonColumn</tt>.

diff --git a/demos/quickstart/protected/pages/Controls/DataList.page b/demos/quickstart/protected/pages/Controls/DataList.page
index c1ff1147..75541564 100644
--- a/demos/quickstart/protected/pages/Controls/DataList.page
+++ b/demos/quickstart/protected/pages/Controls/DataList.page
@@ -50,7 +50,7 @@ The following example shows how to use TDataList to display tabular data, with d
 </p>

 <com:RunBar PagePath="Controls.Samples.TDataList.Sample1" />

 <p>

-A common use of TDataList is for maintaining tabular data, including browsing, editting, deleting data items. This is enabled by the command events and various item templates of TDataList.

+A common use of TDataList is for maintaining tabular data, including browsing, editing, deleting data items. This is enabled by the command events and various item templates of TDataList.

 </p>

 <p>

 The following example displays a computer product information. Users can add new products, modify or delete existing ones. In order to locate the data item for updating or deleting, <tt>DataKeys</tt> property is used.

diff --git a/demos/quickstart/protected/pages/Controls/DatePicker.page b/demos/quickstart/protected/pages/Controls/DatePicker.page
index a37ff048..36d2f435 100644
--- a/demos/quickstart/protected/pages/Controls/DatePicker.page
+++ b/demos/quickstart/protected/pages/Controls/DatePicker.page
@@ -3,14 +3,14 @@
 <h1 id="2301">TDatePicker</h1>

 <com:DocLink ClassPath="System.Web.UI.WebControls.TDatePicker" />

 

-<p><tt>TDatePicker</tt> displays a text box for date input purpose. 

+<p><tt>TDatePicker</tt> displays a text box for date input purpose.

 When the text box receives focus, a calendar will pop up and users can

 pick up from it a date that will be automatically entered into the text box.

 The format of the date string displayed in the text box is determined by

 the <tt>DateFormat</tt> property. Valid formats are the combination of the

 following tokens:

- 

-<com:TTextHighlighter Language="text" CssClass="source"> 

+

+<com:TTextHighlighter Language="text" CssClass="source">

 Character      Format Pattern (en-US)

 ---------------------------------------------------------------------

  d              day digit

@@ -32,7 +32,7 @@ only accepts integers such as the Unix timestamp.
 </p>

 

 <p>

-TDatePicker has three <tt>Mode</tt> to show the date picker popup. 

+TDatePicker has three <tt>Mode</tt> to show the date picker popup.

  <ul>

  	<li><tt>Basic</tt> - Only shows a text input, focusing on the input shows the date picker.</li>

 	<li><tt>Button</tt> - Shows a button next to the text input, clicking on the button shows the date, button text can be by the <tt>ButtonText</tt> property.</li>

@@ -40,8 +40,8 @@ TDatePicker has three <tt>Mode</tt> to show the date picker popup.
  </ul>

 </p>

 

-<p>The <tt>CssClass</tt> property can be used to override the css class name 

-for the date picker panel. The <tt>CalendarStyle</tt> property changes the overall calendar style. 

+<p>The <tt>CssClass</tt> property can be used to override the CSS class name

+for the date picker panel. The <tt>CalendarStyle</tt> property changes the overall calendar style.

 The following <tt>CalendarStyle</tt> values are available:

 	<ul>

 		<li><tt>default</tt> - The default calendar style.</li>

@@ -50,9 +50,9 @@ The following <tt>CalendarStyle</tt> values are available:
 

 <p>The <tt>InputMode</tt> property can be set to "TextBox" or "DropDownList" with

 default as "TextBox". In <tt>DropDownList</tt> mode, in addition to the popup date picker, three

-drop down list (day, month and year) are presented to select the date . 

+drop down list (day, month and year) are presented to select the date .

 When <tt>InputMode</tt> equals "DropDownList", the order and appearance of the date, month, and year

-will depend on the pattern specified in <tt>DateFormat</tt> property. 

+will depend on the pattern specified in <tt>DateFormat</tt> property.

 </p>

 

 <p>The popup date picker can be hidden by specifying <tt>ShowCalendar</tt> as false. Much of the

@@ -64,20 +64,20 @@ where <tt>FromYear</tt> is the starting year and <tt>UpToYear</tt> is the last y
 The starting day of the week can be changed by the <tt>FirstDayOfWeek</tt> property, with 0 as Sunday, 1 as Monday, etc.

 </p>

 

-<p><b>Note 1:</b> If the <tt>InputMode</tt> is "TextBox", the <tt>DateFormat</tt> should 

-only <b>NOT</b> contain <code>MMM</code> or <code>MMMM</code> patterns. The 

+<p><b>Note 1:</b> If the <tt>InputMode</tt> is "TextBox", the <tt>DateFormat</tt> should

+only <b>NOT</b> contain <code>MMM</code> or <code>MMMM</code> patterns. The

 server side date parser will not be able to determine the correct date if <code>MMM</code> or

 <code>MMMM</code> are used. When <tt>InputMode</tt> equals "DropDownList", all patterns can be used.</p>

- 

+

 <p><b>Note 2:</b> When the <tt>TDatePicker</tt> is used together

-with a validator, the <tt>DateFormat</tt> property of the validator must be equal to 

-the <tt>DateFormat</tt> of the <tt>TDatePicker</tt> <b>AND</b> must set <tt>DataType</tt>="Date" 

-on the validator to ensure correct validation. See 

+with a validator, the <tt>DateFormat</tt> property of the validator must be equal to

+the <tt>DateFormat</tt> of the <tt>TDatePicker</tt> <b>AND</b> must set <tt>DataType</tt>="Date"

+on the validator to ensure correct validation. See

 <a href="?page=Controls.Validation#TCompareValidator">TCompareValidator</a>,

-<a href="?page=Controls.Validation#TDataTypeValidator">TDataTypeValidator</a> and  

-<a href="?page=Controls.Validation#TRangeValidator">TRangeValidator</a> 

+<a href="?page=Controls.Validation#TDataTypeValidator">TDataTypeValidator</a> and

+<a href="?page=Controls.Validation#TRangeValidator">TRangeValidator</a>

 for details.</p>

- 

+

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

 

 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/HtmlArea.page b/demos/quickstart/protected/pages/Controls/HtmlArea.page
index 00a65573..e40a4444 100644
--- a/demos/quickstart/protected/pages/Controls/HtmlArea.page
+++ b/demos/quickstart/protected/pages/Controls/HtmlArea.page
@@ -24,7 +24,7 @@ The default editor gives only the basic tool bar. To change or add additional to
 </com:TTextHighlighter>

 

 <p>

-The client-side visual editting capability is supported by Internet Explorer 5.0+ for Windows and Gecko-based browser. If the browser does not support the visual editting, a traditional textarea will be displayed.

+The client-side visual editing capability is supported by Internet Explorer 5.0+ for Windows and Gecko-based browser. If the browser does not support the visual editing, a traditional textarea will be displayed.

 </p>

 

 <pre>

@@ -39,7 +39,7 @@ Firefox 1.5b2           OK              OK
 Safari 2.0 (412)                        OK(1)

 Opera 9 Preview 1       OK(1)           OK(1)

 ----------------------------------------------------

-(1) - Partialy working

+(1) - Partially working

 ----------------------------------------------------

 </pre>

 

diff --git a/demos/quickstart/protected/pages/Controls/JavascriptLogger.page b/demos/quickstart/protected/pages/Controls/JavascriptLogger.page
index ccb4a27b..2c0032f8 100644
--- a/demos/quickstart/protected/pages/Controls/JavascriptLogger.page
+++ b/demos/quickstart/protected/pages/Controls/JavascriptLogger.page
@@ -4,7 +4,7 @@
 <com:DocLink ClassPath="System.Web.UI.WebControls.TJavascriptLogger" />

 

 <p>

-<tt>TJavascriptLogger</tt> provides logging for client-side javascript. It is mainly a wrapper of the javascript developed at <a href="http://gleepglop.com/javascripts/logger/">http://gleepglop.com/javascripts/logger/</a>.

+<tt>TJavascriptLogger</tt> provides logging for client-side javascript. It is mainly a wrapper of the Javascript developed at <a href="http://gleepglop.com/javascripts/logger/">http://gleepglop.com/javascripts/logger/</a>.

 </p>

 

 <p>

@@ -15,7 +15,7 @@ To use <tt>TJavascriptLogger</tt>, simply place the following component tag in a
 </com:TTextHighlighter>

 

 <p>

-Then, the client-side javascript may contain the following statements. When they are executed, they will appear in the logger window.

+Then, the client-side Javascript may contain the following statements. When they are executed, they will appear in the logger window.

 </p>

 <com:TTextHighlighter Language="js" CssClass="source">

 Logger.info('something happend');

diff --git a/demos/quickstart/protected/pages/Controls/NewControl.page b/demos/quickstart/protected/pages/Controls/NewControl.page
index 54465ff7..5662f848 100644
--- a/demos/quickstart/protected/pages/Controls/NewControl.page
+++ b/demos/quickstart/protected/pages/Controls/NewControl.page
@@ -13,7 +13,7 @@ In general, there are two ways of writing new controls: composition of existing
 Composition is the easiest way of creating new controls. It mainly involves instantiating existing controls, configuring them and making them the constituent components. The properties of the constituent components are exposed through <a href="?page=Fundamentals.Components">subproperties</a>.

 </p>

 <p>

-One can compose a new control in two ways. One is to extend <tt>TCompositeControl</tt> and override the <tt>TControl::createChildControls()</tt> method. The other is to extend <tt>TTemplateControl</tt> (or its child classes) and write a control template. The latter is easier to use and can organize the layout constituent compoents more intuitively, while the former is more efficient because it does not require parsing of the template.

+One can compose a new control in two ways. One is to extend <tt>TCompositeControl</tt> and override the <tt>TControl::createChildControls()</tt> method. The other is to extend <tt>TTemplateControl</tt> (or its child classes) and write a control template. The latter is easier to use and can organize the layout constituent components more intuitively, while the former is more efficient because it does not require parsing of the template.

 </p>

 <p>

 As an example, we show how to create a labeled textbox called <tt>LabeledTextBox</tt> using the above two approaches. A labeled textbox displays a label besides a textbox. We want reuse the PRADO provided <tt>TLabel</tt> and <tt>TTextBox</tt> to accomplish this task.

@@ -130,8 +130,8 @@ Other important properties and methods include:
 <tt>TWebControl</tt> is mainly used as a base class for controls representing HTML elements. It provides a set of properties that are common among HTML elements. It breaks the <tt>TControl::render()</tt> into the following methods that are more suitable for rendering an HTML element:

 </p>

 <ul>

-  <li><tt>addAttributesToRender()</tt> - adds attributes for the HTML element to be rendered. This method is often overriden by derived classes as they usually have different attributes to be rendered.</li>

-  <li><tt>renderBeginTag()</tt> - renders the openning HTML tag.</li>

+  <li><tt>addAttributesToRender()</tt> - adds attributes for the HTML element to be rendered. This method is often overridden by derived classes as they usually have different attributes to be rendered.</li>

+  <li><tt>renderBeginTag()</tt> - renders the opening HTML tag.</li>

   <li><tt>renderContents()</tt> - renders the content enclosed within the HTML element. By default, it displays the items in the <tt>Controls</tt> collection of the control. Derived classes may override this method to render customized contents.</li>

   <li><tt>renderEndTag()</tt> - renders the closing HTML tag.</li>

 </ul>

diff --git a/demos/quickstart/protected/pages/Controls/Panel.page b/demos/quickstart/protected/pages/Controls/Panel.page
index d507da36..be36095b 100644
--- a/demos/quickstart/protected/pages/Controls/Panel.page
+++ b/demos/quickstart/protected/pages/Controls/Panel.page
@@ -4,7 +4,7 @@
 <com:DocLink ClassPath="System.Web.UI.WebControls.TPanel" />

 

 <p>

-<tt>TPanel</tt> acts as a presentational container for other control. It displays a &lt;div&gt; element on a page. The property <tt>Wrap</tt> specifies whether the panel's body content should wrap or not, while <tt>HorizontalAlign</tt> governs how the content is aligned horizontally and <tt>Direction</tt> indicates the content direction (left to right or right to left). You can set <tt>BackImageUrl</tt> to give a background image to the panel, and you can ste <tt>GroupingText</tt> so that the panel is displayed as a field set with a legend text. Finally, you can specify a default button to be fired when users press 'return' key within the panel by setting the <tt>DefaultButton</tt> property.

+<tt>TPanel</tt> acts as a presentational container for other control. It displays a &lt;div&gt; element on a page. The property <tt>Wrap</tt> specifies whether the panel's body content should wrap or not, while <tt>HorizontalAlign</tt> governs how the content is aligned horizontally and <tt>Direction</tt> indicates the content direction (left to right or right to left). You can set <tt>BackImageUrl</tt> to give a background image to the panel, and you can set <tt>GroupingText</tt> so that the panel is displayed as a field set with a legend text. Finally, you can specify a default button to be fired when users press 'return' key within the panel by setting the <tt>DefaultButton</tt> property.

 </p>

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

 

diff --git a/demos/quickstart/protected/pages/Controls/Repeater.page b/demos/quickstart/protected/pages/Controls/Repeater.page
index 795e27aa..d8f3fd0a 100644
--- a/demos/quickstart/protected/pages/Controls/Repeater.page
+++ b/demos/quickstart/protected/pages/Controls/Repeater.page
@@ -5,7 +5,7 @@
 TRepeater displays its content defined in templates repeatedly based on the given data specified by the <tt>DataSource</tt> or <tt>DataSourceID</tt> property. The repeated contents can be retrieved from the <tt>Items</tt> property. Each item is created by instantiating a template and each is a child control of the repeater.

 </p>

 <p>

-Like normal control templates, the repeater templates can contain static text, controls and special tags, which after instantiation, become child contents of the corresponding item. TRepeater defiens five templates for different purposes,

+Like normal control templates, the repeater templates can contain static text, controls and special tags, which after instantiation, become child contents of the corresponding item. TRepeater defines five templates for different purposes,

 </p>

 <ul>

   <li><tt>HeaderTemplate</tt> - the template used for displaying content at the beginning of a repeater;</li>

diff --git a/demos/quickstart/protected/pages/Controls/Validation.page b/demos/quickstart/protected/pages/Controls/Validation.page
index a28c8faf..12836b8c 100644
--- a/demos/quickstart/protected/pages/Controls/Validation.page
+++ b/demos/quickstart/protected/pages/Controls/Validation.page
@@ -26,7 +26,7 @@ Validators share a common set of properties, which are defined in the base class
     <li><tt>Dynamic</tt> - the space for displaying the error message is NOT reserved. Therefore, showing up the error message will shift the layout of your page around (usually down).</li>

     </ul>

 </li>

-<li><tt>ControlCssClass</tt> - the Css class that is applied to the control being validated in case the validation fails.</li>

+<li><tt>ControlCssClass</tt> - the CSS class that is applied to the control being validated in case the validation fails.</li>

 <li><tt>FocusOnError</tt> - set focus at the validating place if the validation fails. Defaults to false.</li>

 <li><tt>FocusElementID</tt> - the ID of the HTML element that will receive focus if validation fails and <tt>FocusOnError</tt> is true.</li>

 </ul>

@@ -71,7 +71,7 @@ TEmailAddressValidator verifies that the user input is a valid email address. Th
 Note, if the input being validated is empty, TEmailAddressValidator will not do validation. Use a TRequiredFieldValidator to ensure the value is not empty.

 </p>

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

-	

+

 <a name="TCompareValidator"></a>

 <h2 id="4904">TCompareValidator</h2>

 <p>

diff --git a/demos/quickstart/protected/pages/Controls/Wizard.page b/demos/quickstart/protected/pages/Controls/Wizard.page
index ce8bc774..fe910aa7 100644
--- a/demos/quickstart/protected/pages/Controls/Wizard.page
+++ b/demos/quickstart/protected/pages/Controls/Wizard.page
@@ -74,15 +74,15 @@ In this sample, we use wizard to collect user's preference of color. In the firs
 Given a set of wizard steps, <tt>TWizard</tt> supports three different ways of navigation among them:

 </p>

 <ul>

-  <li>Bidirectional - Users can navigate forward and backward along a sequence of wizard steps. User input data is usally collected at the last step. This is also known as commit-at-the-end model. It is the default navigation way that <tt>TWizard</tt> supports.</li>

-  <li>Unidirectional - Users can navigate forward along a sequence of wizard steps. Backward move is not allowed. User input data is usally collected step by step. This is also known as command-as-you-go model. To disallow backward move to a specific step, set its <tt>AllowReturn</tt> property to false.</li>

+  <li>Bidirectional - Users can navigate forward and backward along a sequence of wizard steps. User input data is usually collected at the last step. This is also known as commit-at-the-end model. It is the default navigation way that <tt>TWizard</tt> supports.</li>

+  <li>Unidirectional - Users can navigate forward along a sequence of wizard steps. Backward move is not allowed. User input data is usually collected step by step. This is also known as command-as-you-go model. To disallow backward move to a specific step, set its <tt>AllowReturn</tt> property to false.</li>

   <li>Nonlinear - User input in a step determines which step to go next. To do so, set <tt>ActiveStepIndex</tt> to the step that you want the user to go to. In this case, when a user clicks on the previous button in the navigation panel, the previous step that they visited (not the previous step in the sequential order) will become visible.</li>

 </ul>

 <com:RunBar PagePath="Controls.Samples.TWizard.Sample3" />

 

 <h3 id="4707">Using Templates in Wizard</h3>

 <p>

-<tt>TWizard</tt> supports more concrete control of its outlook through templating. In particular, it provides the following template properties that allow complete customization of the wizard's header, navigation and side bar.

+<tt>TWizard</tt> supports more concrete control of its outlook through templates. In particular, it provides the following template properties that allow complete customization of the wizard's header, navigation and side bar.

 </p>

 <ul>

   <li>Header - <tt>HeaderTemplate</tt>.</li>