upported recent documentation changes from branch/3.1 to trunk/

1 files changed, 29 insertions, 0 deletions

diff --git a/.gitattributes b/.gitattributes
index 716d26e5..0d0b1761 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1290,7 +1290,15 @@ demos/quickstart/protected/pages/ActiveControls/ActiveButton.page -text
 demos/quickstart/protected/pages/ActiveControls/ActiveCheckBox.page -text
 demos/quickstart/protected/pages/ActiveControls/ActiveCustomValidator.page -text
 demos/quickstart/protected/pages/ActiveControls/ActiveHyperLink.page -text
+demos/quickstart/protected/pages/ActiveControls/ActiveImage.page -text
+demos/quickstart/protected/pages/ActiveControls/ActiveImageButton.page -text
+demos/quickstart/protected/pages/ActiveControls/ActiveLabel.page -text
+demos/quickstart/protected/pages/ActiveControls/ActiveLinkButton.page -text
+demos/quickstart/protected/pages/ActiveControls/ActiveMultiView.page -text
 demos/quickstart/protected/pages/ActiveControls/ActivePager.page -text
+demos/quickstart/protected/pages/ActiveControls/ActivePanel.page -text
+demos/quickstart/protected/pages/ActiveControls/ActiveRadioButton.page -text
+demos/quickstart/protected/pages/ActiveControls/ActiveTextBox.page -text
 demos/quickstart/protected/pages/ActiveControls/AutoComplete.page -text
 demos/quickstart/protected/pages/ActiveControls/DragDrop.page -text
 demos/quickstart/protected/pages/ActiveControls/Home.page -text
@@ -1320,7 +1328,25 @@ demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample6.
 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveHyperLink/Home.page -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveHyperLink/Home.php -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveHyperLink/hello_world.gif -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveImage/HelloWorld.html -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveImage/Home.page -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveImage/Home.php -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveImage/hello_world.gif -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveImage/hello_world2.gif -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveImageButton/Home.page -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveImageButton/Home.php -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveImageButton/hello_world.gif -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLabel/Home.page -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLabel/Home.php -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLinkButton/Home.page -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLinkButton/Home.php -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveMultiView/Home.page -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveMultiView/Home.php -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TActivePager/Home.page -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActivePanel/Home.page -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActivePanel/Home.php -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRadioButton/Home.page -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRadioButton/Home.php -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/RegionDisplay.php -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/RegionDisplay.tpl -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample1.page -text
@@ -1335,6 +1361,8 @@ demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample5.
 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample5.php -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTableRow/Home.page -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTableRow/Home.php -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTextBox/Home.page -text
+demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTextBox/Home.php -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.page -text
 demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.php -text
 demos/quickstart/protected/pages/ActiveControls/Samples/config.xml -text
@@ -1512,6 +1540,7 @@ demos/quickstart/protected/pages/Controls/Samples/TCheckBoxList/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TCheckBoxList/Home.php -text
 demos/quickstart/protected/pages/Controls/Samples/TClientSideValidator/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TClientSideValidator/Home.php -text
+demos/quickstart/protected/pages/Controls/Samples/TColorPicker/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TCompareValidator/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TCompareValidator/Home.php -text
 demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page -text