Index: /FCKeditor.Java/branches/2.4/src/site/apt/connector.apt
===================================================================
--- /FCKeditor.Java/branches/2.4/src/site/apt/connector.apt	(revision 1934)
+++ /FCKeditor.Java/branches/2.4/src/site/apt/connector.apt	(revision 1934)
@@ -0,0 +1,104 @@
+~~ FCKeditor - The text editor for Internet - http://www.fckeditor.net
+~~ Copyright (C) 2003-2008 Frederico Caldeira Knabben
+~~ 
+~~ == BEGIN LICENSE ==
+~~ 
+~~ Licensed under the terms of any of the following licenses at your
+~~ choice:
+~~ 
+~~  - GNU General Public License Version 2 or later (the "GPL")
+~~    http://www.gnu.org/licenses/gpl.html
+~~ 
+~~  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+~~    http://www.gnu.org/licenses/lgpl.html
+~~ 
+~~  - Mozilla Public License Version 1.1 or later (the "MPL")
+~~    http://www.mozilla.org/MPL/MPL-1.1.html
+~~ 
+~~ == END LICENSE ==
+~~ @version $Id$
+                        ------------------------------
+                           File Browser Connector
+                        ------------------------------
+
+Connector activation
+
+  The Connector is not mandatory. If you do <not> plan to provide userfile
+  interaction, you can skip this section.
+
+    [Hint:] The Connector by default is not present and disabled for security 
+            reasons!
+
+  It takes two steps do enable it:
+
+  [[1]]  Declare the ConnectorServlet in your <<<web.xml>>>
+
++-------------------------------------------------------------------+
+  <web-app version="2.4">
+    ...
+    <servlet>
+      <servlet-name>Connector</servlet-name>
+        <servlet-class>
+          net.fckeditor.connector.ConnectorServlet
+      </servlet-class>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+    ...
+    <servlet-mapping>
+      <servlet-name>Connector</servlet-name>
+      <url-pattern>
+        /fckeditor/editor/filemanager/connectors/*
+      </url-pattern>
+    </servlet-mapping>
+    ...
+  </web-app>
++-------------------------------------------------------------------+
+
+  Assuming you installed the editor in the <<</fckeditor>>> folder in your webapp.\
+  The Connector is now declared but <still> disabled. The response is going to 
+  be an error message.
+
+  [[2]] Create a <<<fckeditor.properties>>> file in your classpath and add:
+
++-------------------------------------------------------------------+
+  connector.userActionImpl=net.fckeditor.requestcycle.impl.UserActionImpl
++-------------------------------------------------------------------+
+
+  []
+
+  The Connector is now enabled.
+
+Extending the Connector
+
+    [Hint:]  Skip this section if you are not interested in extending the 
+             Connector.
+
+  The basic idea of extending the Connector is to provide some interfaces for special user depended interactions,
+  which can be implemented by the developer of a webapp. All methods get the <<<HttpServletRequest>>>-object,
+  so the developer could identify the user with a session attribute for example and return a user 
+  specific value. We intentionally make no suggestions how to do this, so you have the free of choice to 
+  implement whatever and however you like.
+   
+  The fully-qualified class name of the implemented classes can now be set as described in 
+  {{{../properties.html}Configuration settings}}.
+  
+  At the moment, the integration pack provides two interfaces to extend the connector:
+  
+  [[1]] {{{../java-core/apidocs/net/fckeditor/requestcycle/UserPathBuilder.html}<<<net.fckeditor.requestcycle.UserPathBuilder>>>}}
+  
+  In this interface there is only one method <<<getUserFilesPath(final HttpServletRequest request)>>>, 
+  return value is a string. There you can implement a user dependent construction of the 'BaseDir' path, 
+  the path for all resource files. 
+  
+  [[2]] {{{../java-core/apidocs/net/fckeditor/requestcycle/UserAction.html}<<<net.fckeditor.requestcycle.UserAction>>>}}
+  
+  There are two methods to authorize users to do file based actions:
+  
+  * <<<#isEnabledForFileUpload(HttpServletRequest)>>> Enables/disables the user for uploading files.
+  
+  * <<<#isEnabledForFileBrowsing(HttpServletRequest)>>> Enables/disables the user for browsing files.
+  
+  []
+  
+  For those who wants to enable all users for browsing and uploading files, there is an implementation
+  of <<<UserAction>>> you can use: {{{../java-core/apidocs/net/fckeditor/requestcycle/impl/UserActionImpl.html}UserActionImpl}}
Index: /FCKeditor.Java/branches/2.4/src/site/apt/overview.apt
===================================================================
--- /FCKeditor.Java/branches/2.4/src/site/apt/overview.apt	(revision 1934)
+++ /FCKeditor.Java/branches/2.4/src/site/apt/overview.apt	(revision 1934)
@@ -0,0 +1,52 @@
+~~ FCKeditor - The text editor for Internet - http://www.fckeditor.net
+~~ Copyright (C) 2003-2008 Frederico Caldeira Knabben
+~~ 
+~~ == BEGIN LICENSE ==
+~~ 
+~~ Licensed under the terms of any of the following licenses at your
+~~ choice:
+~~ 
+~~  - GNU General Public License Version 2 or later (the "GPL")
+~~    http://www.gnu.org/licenses/gpl.html
+~~ 
+~~  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+~~    http://www.gnu.org/licenses/lgpl.html
+~~ 
+~~  - Mozilla Public License Version 1.1 or later (the "MPL")
+~~    http://www.mozilla.org/MPL/MPL-1.1.html
+~~ 
+~~ == END LICENSE ==
+~~ @version $Id$
+				---------------
+					Overview
+				---------------
+
+Overview
+
+  The Java integration pack is composed of two main components:
+  
+  * The JSP-Tag-Library, for an easy integration of the FCKeditor in your JSP-pages.
+    
+  * The Connector, a servlet to manage the handling with resource files like images.
+  
+  []
+  
+  To use the JSP-Tag-Library you just have to put the main jar and dependent libraries
+  in your classpath. If you want to use the Connector 1.) you have to add some entries in
+  your <<<web.xml>>> and 2.) you have to make sure that some special properties are set.
+  For details have a look at {{{connector.html}Connector}} and 
+  {{{../installation.html}Installation}}.
+  
+  We introduced a new properties handling (in comparison to 2.3). You have two ways to set 
+  the default properties of the integration pack:
+  
+  * Using a common Java properties file or
+  
+  * using some static setters.
+  
+  []
+  
+  For a closer look see {{{connector.html}Connector}}.
+  
+  This new properties handling will give you the most flexibility to integrate FCKeditor 
+  in your Java-based web-application.
Index: /FCKeditor.Java/branches/2.4/src/site/apt/taglibrary.apt
===================================================================
--- /FCKeditor.Java/branches/2.4/src/site/apt/taglibrary.apt	(revision 1934)
+++ /FCKeditor.Java/branches/2.4/src/site/apt/taglibrary.apt	(revision 1934)
@@ -0,0 +1,51 @@
+~~ FCKeditor - The text editor for Internet - http://www.fckeditor.net
+~~ Copyright (C) 2003-2008 Frederico Caldeira Knabben
+~~ 
+~~ == BEGIN LICENSE ==
+~~ 
+~~ Licensed under the terms of any of the following licenses at your
+~~ choice:
+~~ 
+~~  - GNU General Public License Version 2 or later (the "GPL")
+~~    http://www.gnu.org/licenses/gpl.html
+~~ 
+~~  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+~~    http://www.gnu.org/licenses/lgpl.html
+~~ 
+~~  - Mozilla Public License Version 1.1 or later (the "MPL")
+~~    http://www.mozilla.org/MPL/MPL-1.1.html
+~~ 
+~~ == END LICENSE ==
+~~ @version $Id$
+                    ---------------------
+                         Tag Library
+                    ---------------------
+
+Tag library
+
+  Declare the tag extension in each JSP page that uses the FCKeditor.Java taglib.
+  The uri directive must match the uri defined in the {{{../java-core/tagreference.html}tag reference}}.
+  The prefix identifies the tags in the tag library within the JSP page.
+
++--------------------------------------------------------------------+
+  <%@ taglib uri="http://www.fckeditor.net/java/tags" prefix="FCK" %>
++--------------------------------------------------------------------+
+
+  The declaration, if you are using a JSP XML syntax, looks like:
+
++--------------------------------------------------------------------+
+  <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+     xmlns:FCK="http://www.fckeditor.net/java/tags">
++--------------------------------------------------------------------+
+
+  Now you are set to use the taglib. A brief declaration would be:
+
++--------------------------------------------------------------------+
+  <FCK:editor instanceName="EditorDefault">
+    <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>
++--------------------------------------------------------------------+
+
+  For a more complete overview, take a look at the {{{../java-core/tagreference.html}tag reference}}.
Index: /FCKeditor.Java/branches/2.4/src/site/site.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/src/site/site.xml	(revision 1933)
+++ /FCKeditor.Java/branches/2.4/src/site/site.xml	(revision 1934)
@@ -13,5 +13,5 @@
 	<body>
 		<head>
-			<link rel="shortcut icon" href="/images/favicon.ico"
+			<link rel="shortcut icon" href="images/favicon.ico"
 				type="image/x-icon"
 			/>
@@ -24,9 +24,9 @@
 		</menu>
 		<menu name="Integration">
-			<item name="Overview" href="/integration/overview.html" />
+			<item name="Overview" href="/overview.html" />
 			<item name="Tag library"
-				href="/integration/taglibrary.html"
+				href="/taglibrary.html"
 			/>
-			<item name="Connector" href="/integration/connector.html" />
+			<item name="Connector" href="/connector.html" />
 		</menu>
 		<menu name="Reference">