Index: /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld	(revision 1527)
+++ /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld	(revision 1528)
@@ -29,4 +29,5 @@
 			<name>instanceName</name>
 			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
 			<type>java.lang.String</type>
 		</attribute>
@@ -36,4 +37,5 @@
 			</description>
 			<name>width</name>
+			<rtexprvalue>true</rtexprvalue>
 			<type>java.lang.String</type>
 		</attribute>
@@ -43,4 +45,5 @@
 			</description>
 			<name>height</name>
+			<rtexprvalue>rue</rtexprvalue>
 			<type>java.lang.String</type>
 		</attribute>
@@ -50,4 +53,5 @@
 			</description>
 			<name>toolbarSet</name>
+			<rtexprvalue>true</rtexprvalue>
 			<type>java.lang.String</type>
 		</attribute>
@@ -56,9 +60,8 @@
 				The path/folder in which the editor is deployed under
 				the given context. The context path will be
-				automatically attached. For example, your context path
-				is '/myapp', supplying basePath="/fckeditor/" (note
-				trailing slashes!) results in '/myapp/fckeditor/'.
+				automatically attached. (E.g. '/fckeditor')
 			</description>
 			<name>basePath</name>
+			<rtexprvalue>true</rtexprvalue>
 			<type>java.lang.String</type>
 		</attribute>
@@ -69,4 +72,5 @@
 			</description>
 			<name>value</name>
+			<rtexprvalue>true</rtexprvalue>
 			<type>java.lang.String</type>
 		</attribute>
Index: /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties	(revision 1527)
+++ /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties	(revision 1528)
@@ -5,17 +5,18 @@
 
 # default extensions settings
-connector.extensions.file.denied   = php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi
-connector.extensions.flash.allowed  = swf|fla
+connector.extensions.file.denied = php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi
+connector.extensions.flash.allowed = swf|fla
 connector.extensions.image.allowed = jpg|gif|jpeg|png|bmp
 connector.extensions.link.allowed = 7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip
 
-# Due to security issues with Apache modules, it is recommended to leave this setting enabled.
+# Due to security issues with Apache modules, it is recommended to leave this 
+# setting enabled.
 connector.forceSingleExtension = true
 
-# base directory for the user files relative to the context root (starting / and no ending /)
+# base directory for the user files relative to the context root
 connector.userFilesPath = /userfiles
 
-# directory of the editor relative to the context root according to fckeditor.js (trailing slashes!)
-fckeditor.basePath = /fckeditor/
+# directory of the editor relative to the context root
+fckeditor.basePath = /fckeditor
 
 # default height of the editor
@@ -29,8 +30,8 @@
 
 # some messages
-message.enabled_tag.compatible_browser.no            = Your browser is not compatible
-message.enabled_tag.compatible_browser.yes           = Your browser is fully compatible
+message.enabled_tag.compatible_browser.no = Your browser is not compatible
+message.enabled_tag.compatible_browser.yes = Your browser is fully compatible
 message.enabled_tag.connector.file_browsing.disabled = The Connector is disabled for FileBrowsing
-message.enabled_tag.connector.file_browsing.enabled  = The Connector is enabled for FileBrowsing
-message.enabled_tag.connector.file_upload.disabled   = The Connector is disabled for FileUpload
-message.enabled_tag.connector.file_upload.enabled    = The Connector is enabled for FileUpload
+message.enabled_tag.connector.file_browsing.enabled = The Connector is enabled for FileBrowsing
+message.enabled_tag.connector.file_upload.disabled = The Connector is disabled for FileUpload
+message.enabled_tag.connector.file_upload.enabled = The Connector is enabled for FileUpload
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample02.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample02.jsp	(revision 1527)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample02.jsp	(revision 1528)
@@ -47,7 +47,8 @@
 		<form action="sampleposteddata.jsp" method="get" target="_blank">
 			<FCK:editor instanceName="EditorDefault">
-				<FCK:content>This is some <strong>sample text</strong>. You are 
-				using <a href="http://www.fckeditor.net">FCKeditor</a>.
-				</FCK:content>
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
 			</FCK:editor>
 			<br />
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample03.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample03.jsp	(revision 1527)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample03.jsp	(revision 1528)
@@ -77,9 +77,12 @@
 		<form action="sampleposteddata.jsp" method="get" target="_blank">
 			<FCK:editor instanceName="EditorDefault">
-				<FCK:config AutoDetectLanguage="${empty param.code ? true : false}"
-					DefaultLanguage="${empty param.code ? 'en' : param.code}" />
-				<FCK:content>This is some <strong>sample text</strong>. You are 
-				using <a href="http://www.fckeditor.net">FCKeditor</a>.
-				</FCK:content>
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
+				<jsp:body>
+					<FCK:config AutoDetectLanguage="${empty param.code ? true : false}"
+						DefaultLanguage="${empty param.code ? 'en' : param.code}" />
+				</jsp:body>
 			</FCK:editor>
 			<br />
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample04.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample04.jsp	(revision 1527)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample04.jsp	(revision 1528)
@@ -63,7 +63,8 @@
 		<form action="sampleposteddata.jsp" method="get" target="_blank">
 			<FCK:editor instanceName="EditorDefault" toolbarSet="${param.toolbar}">
-				<FCK:content>This is some <strong>sample text</strong>. You are 
-				using <a href="http://www.fckeditor.net">FCKeditor</a>.
-				</FCK:content>
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
 			</FCK:editor>
 			<br />
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample05.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample05.jsp	(revision 1527)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample05.jsp	(revision 1528)
@@ -75,8 +75,11 @@
 		<form action="sampleposteddata.jsp" method="get" target="_blank">
 			<FCK:editor instanceName="EditorDefault">
-				<FCK:config SkinPath="${skin}"/>
-				<FCK:content>This is some <strong>sample text</strong>. You are 
-				using <a href="http://www.fckeditor.net">FCKeditor</a>.
-				</FCK:content>
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
+				<jsp:body>
+					<FCK:config SkinPath="${skin}"/>
+				</jsp:body>
 			</FCK:editor>
 			<br />
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample06.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample06.jsp	(revision 1527)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample06.jsp	(revision 1528)
@@ -49,8 +49,11 @@
 		<form action="sampleposteddata.jsp" method="post" target="_blank">
 			<FCK:editor instanceName="EditorDefault" toolbarSet="PluginTest">
-				<FCK:config CustomConfigurationsPath="${pageContext.request.contextPath}/jsp/sample06.config.js" />
-				<FCK:content>This is some <strong>sample text</strong>. You are 
-				using <a href="http://www.fckeditor.net">FCKeditor</a>.
-				</FCK:content>
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
+				<jsp:body>
+					<FCK:config CustomConfigurationsPath="${pageContext.request.contextPath}/jsp/sample06.config.js" />
+				</jsp:body>
 			</FCK:editor>
 			<br />
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample07.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample07.jsp	(revision 1527)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample07.jsp	(revision 1528)
@@ -43,12 +43,21 @@
 		<form action="sampleposteddata.jsp" method="post" target="_blank">
 			<FCK:editor instanceName="EditorDefault">
-			<FCK:config FullPage="true"/>
-			<FCK:content>
-				<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-				<html><head><title>Full Page Test</title>
-				<meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-				</head><body>This is some <strong>sample text</strong>. You are 
-				using <a href="http://www.fckeditor.net/">FCKeditor</a>.</body></html>
-				</FCK:content>
+				<jsp:attribute name="value">
+					<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+						<html>
+							<head>
+								<title>Full Page Test</title>
+								<meta content="text/html; charset=utf-8" 
+									http-equiv="Content-Type"/>
+							</head>
+							<body>This is some <strong>sample text</strong>. You are 
+								using <a href="http://www.fckeditor.net/">FCKeditor
+								</a>.
+							</body>
+						</html>
+				</jsp:attribute>
+				<jsp:body>
+					<FCK:config FullPage="true"/>
+				</jsp:body>
 			</FCK:editor>
 			<br />