Index: /FCKeditor.Java/branches/2.4/build.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/build.xml	(revision 1493)
+++ /FCKeditor.Java/branches/2.4/build.xml	(revision 1494)
@@ -38,3 +38,13 @@
 	</target>
 
+	<target name="rewrite-links" description="rewrites plain links in real links">
+
+		<replaceregexp byline="true" flags="m" file="target/site/tagreference.html">
+
+			<regexp pattern="&amp;lt;a href=&amp;quot;(\p{Graph}+)&amp;quot;\s*&amp;gt;(\p{Graph}+)&amp;lt;/a&amp;gt;" />
+			<substitution expression="&lt;a href=&quot;\1&quot;&gt;\2&lt;/a&gt;" />
+
+		</replaceregexp>
+	</target>
+
 </project>
Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1493)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1494)
@@ -167,4 +167,28 @@
 					</filesets>
 				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>site</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo
+									message="Skipping link rewrite since it's broken"
+								/>
+								<!--
+									<replaceregexp byline="true" flags="m"
+									file="target/site/tagreference.html">
+									<regexp	pattern="&amp;lt;a href=&amp;quot;(\p{Graph}+)&amp;quot;\s*&amp;gt;(\p{Graph}+)&amp;lt;/a&amp;gt;" />
+									<substitution expression="&lt;a href=&quot;\1&quot;&gt;\2&lt;/a&gt;" />
+									</replaceregexp> -->
+							</tasks>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
@@ -317,5 +341,5 @@
 			<id>uni-space</id>
 			<url>
-				scp://duesseldorf.mi.fu-berlin.de/home/bude/ossipov/web-home/public_html/fckeditor-java
+				scp://duesseldorf.mi.fu-berlin.de/home/bude/ossipov/web-home/fckeditor-java
 			</url>
 		</site>
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/CheckTag.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/CheckTag.java	(revision 1494)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/CheckTag.java	(revision 1494)
@@ -0,0 +1,84 @@
+package net.fckeditor.tags;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import net.fckeditor.handlers.ConfigurationHandler;
+import net.fckeditor.tool.Compatibility;
+
+public class CheckTag extends TagSupport {
+
+	private static final long serialVersionUID = -6834095891675681686L;
+
+	private static final String FILE_UPLOAD = "FileUpload";
+	private static final String FILE_BROWSING = "FileBrowsing";
+	private static final String COMPATIBLE_BROWSER = "CompatibleBrowser";
+	private static Set<String> commands = new HashSet<String>(3);
+
+	static {
+		commands.add(FILE_UPLOAD);
+		commands.add(FILE_BROWSING);
+		commands.add(COMPATIBLE_BROWSER);
+	}
+
+	private String command;
+
+	public void setCommand(String command) throws JspTagException {
+		if (!commands.contains(command))
+			throw new JspTagException(
+					"You have to provide one of the following commands: "
+							+ commands);
+		this.command = command;
+	}
+
+	@Override
+	public int doStartTag() throws JspException {
+		JspWriter out = pageContext.getOut();
+
+		HttpServletRequest request = (HttpServletRequest) pageContext
+				.getRequest();
+		String response = new String();
+
+		if (command.equals(FILE_UPLOAD)) {
+			if (ConfigurationHandler.isEnabledForFileUpload(request))
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_UPLOAD_ENABLED);
+			else
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_UPLOAD_DISABLED);
+		}
+
+		if (command.equals(FILE_BROWSING)) {
+			if (ConfigurationHandler.isEnabledForFileBrowsing(request))
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_BROWSING_ENABLED);
+			else
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_BROWSING_DISABLED);
+		}
+		if (command.equals(COMPATIBLE_BROWSER)) {
+			if (Compatibility.isCompatibleBrowser(request))
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_COMPATIBLE_BROWSER);
+			else
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_NOT_COMPATIBLE_BROWSER);
+		}
+
+		try {
+			out.print(response);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		return SKIP_BODY;
+	}
+
+}
Index: Keditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/EnabledTag.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/EnabledTag.java	(revision 1493)
+++ 	(revision )
@@ -1,84 +1,0 @@
-package net.fckeditor.tags;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import net.fckeditor.handlers.ConfigurationHandler;
-import net.fckeditor.tool.Compatibility;
-
-public class EnabledTag extends TagSupport {
-
-	private static final long serialVersionUID = -6834095891675681686L;
-
-	private static final String FILE_UPLOAD = "FileUpload";
-	private static final String FILE_BROWSING = "FileBrowsing";
-	private static final String COMPATIBLE_BROWSER = "CompatibleBrowser";
-	private static Set<String> commands = new HashSet<String>(3);
-
-	static {
-		commands.add(FILE_UPLOAD);
-		commands.add(FILE_BROWSING);
-		commands.add(COMPATIBLE_BROWSER);
-	}
-
-	private String command;
-
-	public void setCommand(String command) throws JspTagException {
-		if (!commands.contains(command))
-			throw new JspTagException(
-					"You have to provide one of the following commands: "
-							+ commands);
-		this.command = command;
-	}
-
-	@Override
-	public int doStartTag() throws JspException {
-		JspWriter out = pageContext.getOut();
-
-		HttpServletRequest request = (HttpServletRequest) pageContext
-				.getRequest();
-		String response = new String();
-
-		if (command.equals(FILE_UPLOAD)) {
-			if (ConfigurationHandler.isEnabledForFileUpload(request))
-				response = ConfigurationHandler
-						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_UPLOAD_ENABLED);
-			else
-				response = ConfigurationHandler
-						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_UPLOAD_DISABLED);
-		}
-
-		if (command.equals(FILE_BROWSING)) {
-			if (ConfigurationHandler.isEnabledForFileBrowsing(request))
-				response = ConfigurationHandler
-						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_BROWSING_ENABLED);
-			else
-				response = ConfigurationHandler
-						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_BROWSING_DISABLED);
-		}
-		if (command.equals(COMPATIBLE_BROWSER)) {
-			if (Compatibility.isCompatibleBrowser(request))
-				response = ConfigurationHandler
-						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_COMPATIBLE_BROWSER);
-			else
-				response = ConfigurationHandler
-						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_NOT_COMPATIBLE_BROWSER);
-		}
-
-		try {
-			out.print(response);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		return SKIP_BODY;
-	}
-
-}
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 1493)
+++ /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld	(revision 1494)
@@ -6,12 +6,23 @@
 	version="2.0"
 >
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
 	<tlib-version>2.4</tlib-version>
-	<short-name>FCKeditor</short-name>
+	<short-name>FCK</short-name>
 	<uri>http://www.fckeditor.net/tags</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
 		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
 		<body-content>JSP</body-content>
 		<attribute>
+		<description></description>
 			<name>instanceName</name>
 			<required>true</required>
@@ -19,24 +30,42 @@
 		</attribute>
 		<attribute>
+		<description></description>
 			<name>width</name>
 			<type>java.lang.String</type>
 		</attribute>
 		<attribute>
+		<description></description>
 			<name>height</name>
 			<type>java.lang.String</type>
 		</attribute>
 		<attribute>
+		<description></description>
 			<name>toolbarSet</name>
 			<type>java.lang.String</type>
 		</attribute>
 		<attribute>
+		<description></description>
 			<name>basePath</name>
 			<type>java.lang.String</type>
 		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
 	</tag>
 	<tag>
+		<description>
+			Passes any content to the FCKeditor document. This tag can
+			only be nested within an editor tag.
+		</description>
+		<display-name>content</display-name>
 		<name>content</name>
 		<tag-class>net.fckeditor.tags.ContentTag</tag-class>
 		<body-content>JSP</body-content>
+		<example><![CDATA[
+<FCK:content>
+	This is some <strong>sample text</strong>. You are 
+	using <a href="http://www.fredck.com/fckeditor/">FCKeditor</a>.
+</FCK:content>]]>
+		</example>
 	</tag>
 	<tag>
@@ -44,5 +73,8 @@
 			Sets a config property of the editor to the supplied value.
 			You may provide any attribute you want for the Editor. Set
-			one attribute per tag or several attributes with one tag.
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within a editor tag.
+			For all configuration options see
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
 		</description>
 		<display-name>config</display-name>
@@ -57,12 +89,26 @@
 	</tag>
 	<tag>
-		<name>enabled</name>
-		<tag-class>net.fckeditor.tags.EnabledTag</tag-class>
+		<description>
+			Displays session-dependend and compatibility-related
+			information.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
 		<body-content>empty</body-content>
 		<attribute>
+			<description>
+				Provide the feature name you want to check. Valid
+				features for now are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
 			<name>command</name>
 			<required>true</required>
 			<type>java.lang.String</type>
 		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
 </taglib>
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample01.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample01.jsp	(revision 1493)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample01.jsp	(revision 1494)
@@ -46,7 +46,7 @@
 		<p>Basic FCKeditor informations:</p>
 		<ul>
-			<li><FCK:enabled command="CompatibleBrowser" /></li>
-			<li><FCK:enabled command="FileBrowsing" /></li>
-			<li><FCK:enabled command="FileUpload" /></li>
+			<li><FCK:check command="CompatibleBrowser" /></li>
+			<li><FCK:check command="FileBrowsing" /></li>
+			<li><FCK:check command="FileUpload" /></li>
 		</ul>
 		<hr />