From 3069eaf35e833ffe4a1c1c7829dd7e168ae27420 Mon Sep 17 00:00:00 2001
From: Ciro Mattia Gonano <ciromattia@gmail.com>
Date: Wed, 11 Sep 2013 15:56:48 +0200
Subject: Merge up to r3319

---
 demos/quickstart/protected/pages/Controls/Standard.page | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'demos/quickstart/protected/pages/Controls/Standard.page')

diff --git a/demos/quickstart/protected/pages/Controls/Standard.page b/demos/quickstart/protected/pages/Controls/Standard.page
index 188cdd19..463f90a5 100644
--- a/demos/quickstart/protected/pages/Controls/Standard.page
+++ b/demos/quickstart/protected/pages/Controls/Standard.page
@@ -59,6 +59,10 @@
   <a href="?page=Controls.HtmlArea">THtmlArea</a> represents a WYSIWYG text input field taking user input that are in HTML format.
   </li>
 
+  <li>
+  <a href="?page=Controls.HtmlArea4">THtmlArea4</a> is the counterpart of THtmlArea based on TinyMCE4.
+  </li>
+
   <li>
   <a href="?page=Controls.HyperLink">THyperLink</a> represents a hyperlink on a Web page.
   </li>
-- 
cgit v1.2.3